diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue
index e350dbbb..a0b94a83 100644
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -219,7 +219,6 @@ watch(userResource, () => {
 })
 
 const toggleSidebar = () => {
-	console.log(sidebarStore.isSidebarCollapsed)
 	sidebarStore.isSidebarCollapsed = !sidebarStore.isSidebarCollapsed
 }
 </script>
diff --git a/frontend/src/components/Modals/ChapterModal.vue b/frontend/src/components/Modals/ChapterModal.vue
index 6a9f9146..3d041e84 100644
--- a/frontend/src/components/Modals/ChapterModal.vue
+++ b/frontend/src/components/Modals/ChapterModal.vue
@@ -16,12 +16,7 @@
 	>
 		<template #body-content>
 			<div class="space-y-4 text-base">
-				<FormControl
-					ref="chapterInput"
-					label="Title"
-					v-model="chapter.title"
-					:required="true"
-				/>
+				<FormControl label="Title" v-model="chapter.title" :required="true" />
 				<FormControl
 					:label="__('Is SCORM Package')"
 					v-model="chapter.is_scorm_package"
@@ -83,7 +78,6 @@ import { FileText, X } from 'lucide-vue-next'
 
 const show = defineModel()
 const outline = defineModel('outline')
-const chapterInput = ref(null)
 
 const props = defineProps({
 	course: {
@@ -209,14 +203,6 @@ watch(
 	}
 )
 
-/* watch(show, () => {
-	if (show.value) {
-		setTimeout(() => {
-			chapterInput.value.$el.querySelector('input').focus()
-		}, 100)
-	}
-}) */
-
 const validateFile = (file) => {
 	let extension = file.name.split('.').pop().toLowerCase()
 	if (extension !== 'zip') {
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
index abbfad65..53400227 100644
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -12,9 +12,9 @@
 							id="existing"
 							value="existing"
 							v-model="questionType"
-							class="w-3 h-3 accent-gray-900"
+							class="w-3 h-3 cursor-pointer"
 						/>
-						<label for="existing">
+						<label for="existing" class="cursor-pointer">
 							{{ __('Add an existing question') }}
 						</label>
 					</div>
@@ -25,9 +25,9 @@
 							id="new"
 							value="new"
 							v-model="questionType"
-							class="w-3 h-3"
+							class="w-3 h-3 cursor-pointer"
 						/>
-						<label for="new">
+						<label for="new" class="cursor-pointer">
 							{{ __('Create a new question') }}
 						</label>
 					</div>
@@ -127,7 +127,7 @@ const populateFields = () => {
 	let counter = 1
 	fields.forEach((field) => {
 		while (counter <= 4) {
-			question[`${field}_${counter}`] = field === 'is_correct' ? false : ''
+			question[`${field}_${counter}`] = field === 'is_correct' ? false : null
 			counter++
 		}
 	})
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index b177570b..114a3c4c 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -30,6 +30,7 @@
 					</FormControl>
 				</div>
 				<router-link
+					v-if="user.data?.is_moderator || user.data?.is_instructor"
 					:to="{
 						name: 'CourseForm',
 						params: {
@@ -37,7 +38,7 @@
 						},
 					}"
 				>
-					<Button v-if="user.data?.is_moderator" variant="solid">
+					<Button variant="solid">
 						<template #prefix>
 							<Plus class="h-4 w-4" />
 						</template>
diff --git a/frontend/src/pages/QuizForm.vue b/frontend/src/pages/QuizForm.vue
index b1ee4705..95e487d0 100644
--- a/frontend/src/pages/QuizForm.vue
+++ b/frontend/src/pages/QuizForm.vue
@@ -141,6 +141,7 @@
 								v-slot="{ idx, column, item }"
 								v-for="row in quiz.questions"
 								@click="openQuestionModal(row)"
+								class="cursor-pointer"
 							>
 								<ListRowItem :item="item">
 									<div
diff --git a/frontend/src/pages/SCORMChapter.vue b/frontend/src/pages/SCORMChapter.vue
index 84b6f7d2..ca53ade5 100644
--- a/frontend/src/pages/SCORMChapter.vue
+++ b/frontend/src/pages/SCORMChapter.vue
@@ -65,11 +65,11 @@ onBeforeMount(() => {
 		Initialize: () => 'true',
 		Terminate: () => 'true',
 		GetValue: (key) => {
-			console.log(`GetValue called for key: ${key}`)
+			console.log(`GET: ${key}`)
 			return getDataFromLMS(key)
 		},
 		SetValue: (key, value) => {
-			console.log(`SetValue called for key: ${key} to value: ${value}`)
+			console.log(`SET: ${key} to value: ${value}`)
 
 			saveDataToLMS(key, value)
 			return 'true'
@@ -96,7 +96,6 @@ onBeforeMount(() => {
 		LMSGetErrorString: () => '',
 		LMSGetDiagnostic: () => '',
 	}
-	console.log(window.API_1484_11)
 })
 
 const getDataFromLMS = (key) => {
diff --git a/lms/lms/doctype/lms_question/lms_question.py b/lms/lms/doctype/lms_question/lms_question.py
index 82ce913c..6022b283 100644
--- a/lms/lms/doctype/lms_question/lms_question.py
+++ b/lms/lms/doctype/lms_question/lms_question.py
@@ -16,6 +16,7 @@ class LMSQuestion(Document):
 def validate_correct_answers(question):
 	if question.type == "Choices":
 		validate_duplicate_options(question)
+		validate_minimum_options(question)
 		validate_correct_options(question)
 	elif question.type == "User Input":
 		validate_possible_answer(question)
@@ -42,6 +43,11 @@ def validate_correct_options(question):
 		frappe.throw(_("At least one option must be correct for this question."))
 
 
+def validate_minimum_options(question):
+	if question.type == "Choices" and (not question.option_1 or not question.option_2):
+		frappe.throw(_("Minimum two options are required for multiple choice questions."))
+
+
 def validate_possible_answer(question):
 	possible_answers = []
 	possible_answers_fields = [