diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..e82154a1
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "frappe-ui"]
+	path = frappe-ui
+	url = https://github.com/pateljannat/frappe-ui
diff --git a/frappe-ui b/frappe-ui
index aa44431c..a349ab07 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit aa44431c185b1e4563f2ebf6af380c7743d2cd4c
+Subproject commit a349ab070a73a3d22ead6a33374c9fe44f6ecf57
diff --git a/frontend/src/components/Modals/Question.vue b/frontend/src/components/Modals/Question.vue
new file mode 100644
index 00000000..bdecfc4c
--- /dev/null
+++ b/frontend/src/components/Modals/Question.vue
@@ -0,0 +1,30 @@
+<template>
+    <!-- <Dialog
+        v-model="show"
+    >
+        <template>
+            This is life
+        </template>
+    </Dialog> -->
+</template>
+<script setup>
+import { Dialog } from "frappe-ui"
+import { computed } from "vue"
+
+const show = defineModel()
+
+const dialogOptions = computed(() => {
+    return {
+        title: __(props.title),
+        size: 'lg',
+        actions: [
+            {
+                label: __('Submit'),
+                onClick: (close) => {
+                    submitQuestion(close)
+                },
+            },
+        ]
+    }
+})
+</script>
\ No newline at end of file
diff --git a/frontend/src/pages/QuizCreation.vue b/frontend/src/pages/QuizCreation.vue
index 99c7447e..dd2b13a5 100644
--- a/frontend/src/pages/QuizCreation.vue
+++ b/frontend/src/pages/QuizCreation.vue
@@ -4,31 +4,97 @@
 	>
 		<Breadcrumbs :items="breadcrumbs" />
 	</header>
-	<div v-if="quizDetails" class="w-3/4 mx-auto py-5">
-		<FormControl v-model="quiz.title" :label="__('Title')" />
-		<FormControl v-model="quiz.total_marks" :label="__('Total Marks')" />
-		<FormControl
-			v-model="quiz.passing_percentage"
-			:label="__('Passing Percentage')"
-		/>
-		<FormControl v-model="quiz.max_attempts" :label="__('Maximun Attempts')" />
-		<FormControl
-			v-model="quiz.limit_questions_to"
-			:label="__('Limit Questions To')"
-		/>
+	<div class="w-3/4 mx-auto py-5">
+		<!-- Details -->
+		<div class="mb-8">
+			<div class="text-sm font-semibold mb-4">
+				{{ __("Details") }}
+			</div>
+			<div class="grid grid-cols-2 gap-5">
+				<div class="space-y-2">
+					<FormControl v-model="quiz.title" :label="__('Title')" />
+					<FormControl v-model="quiz.max_attempts" :label="__('Maximun Attempts')" />
+					<FormControl
+						v-model="quiz.limit_questions_to"
+						:label="__('Limit Questions To')"
+					/>
+				</div>
+				<div class="space-y-2">
+					<FormControl v-model="quiz.total_marks" :label="__('Total Marks')" />
+					<FormControl
+						v-model="quiz.passing_percentage"
+						:label="__('Passing Percentage')"
+					/>
+				</div>
+			</div>
+		</div>
+		
+		<!-- Settings -->
+		<div class="mb-8">
+			<div class="text-sm font-semibold mb-4">
+				{{ __("Settings") }}
+			</div>
+			<div class="grid grid-cols-3 gap-5 my-4">
+				<FormControl v-model="quiz.show_answers" type="checkbox" :label="__('Show Answers')"/>
+				<FormControl v-model="quiz.show_submission_history" type="checkbox" :label="__('Show Submission History')"/>
+				<FormControl v-model="quiz.shuffle_questions" type="checkbox" :label="__('Shuffle Questions')"/>
+			</div>
+		</div>
+
+		<!-- Questions -->
+		<div>
+			<div class="flex items-center justify-between mb-4">
+				<div class="text-sm font-semibold">
+					{{ __("Questions") }}
+				</div>
+				<Button @click="openQuestionModal.value = true">
+					<template #prefix>
+						<Plus class="w-4 h-4"/>
+					</template>
+					{{ __("New Question") }}
+				</Button>
+			</div>
+			<ListView
+				:columns="questionColumns"
+				:rows="quiz.questions"
+				row-key="name"
+				:options="{ showTooltip: false }"
+			>
+				<ListHeader
+					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
+				>
+					<ListHeaderItem :item="item" v-for="item in questionColumns"/>
+				</ListHeader>
+				<ListRows>
+					<ListRow :row="row" v-slot="{ idx, column, item }" v-for="row in quiz.questions">
+						<ListRowItem :item="item">
+							<div class="text-xs">
+								{{ item }}
+							</div>
+						</ListRowItem>
+					</ListRow>
+				</ListRows>
+			</ListView>
+		</div>
 	</div>
+	<Question/>
 </template>
 <script setup>
-import { Breadcrumbs, createDocumentResource, FormControl } from 'frappe-ui'
-import { computed, reactive } from 'vue'
+import { Breadcrumbs, createDocumentResource, FormControl, ListView, ListHeader, ListHeaderItem, ListRows, ListRow, ListRowItem, Button } from 'frappe-ui'
+import { computed, reactive, ref } from 'vue'
+import { Plus } from "lucide-vue-next"
+import Question from '@/components/Modals/Question.vue';
+
+const openQuestionModal = ref(false)
 
 const props = defineProps({
-	quizId: {
+	quizID: {
 		type: String,
 		required: true,
 	},
 })
 
+
 const quiz = reactive({
 	title: '',
 	total_marks: '',
@@ -43,9 +109,43 @@ const quiz = reactive({
 
 const quizDetails = createDocumentResource({
 	doctype: 'LMS Quiz',
-	name: props.quiz,
+	name: props.quizID,
 	auto: true,
 	cache: ['quiz', props.quiz],
+	onSuccess(data) {
+		Object.keys(data).forEach((key) => {
+			if (Object.hasOwn(quiz, key))
+				quiz[key] = data[key]
+		})
+
+		let checkboxes = ["show_answers", "show_submission_history", "shuffle_questions"]
+		for (let idx in checkboxes) {
+			let key = checkboxes[idx]
+			quiz[key] = quiz[key] ? true : false
+		}
+	}
+})
+
+console.log(quizDetails)
+
+const questionColumns = computed(() => {
+	return [
+		{
+			label: __("ID"),
+			key: "question",
+			width: 1
+		},
+		{
+			label: __("Question"),
+			key: __("question_detail"),
+			width: 3
+		},
+		{
+			label: __("Marks"),
+			key: "marks",
+			width: 1,
+		},
+	]
 })
 
 const breadcrumbs = computed(() => {
diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue
index 113fde84..e7e75b30 100644
--- a/frontend/src/pages/Quizzes.vue
+++ b/frontend/src/pages/Quizzes.vue
@@ -3,13 +3,19 @@
 		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
+		<Button variant="solid">
+			<template #prefix>
+				<Plus class="w-4 h-4"/>
+			</template>
+			{{ __('New Quiz') }}
+		</Button>
 	</header>
 	<div v-if="quizzes.data?.length" class="w-3/4 mx-auto py-5">
 		<ListView
 			:columns="quizColumns"
 			:rows="quizzes.data"
 			row-key="name"
-			:options="{ showTooltip: false }"
+			:options="{ showTooltip: false, selectable: false }"
 		>
 			<ListHeader
 				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
@@ -30,18 +36,6 @@
 					<ListRow :row="row" />
 				</router-link>
 			</ListRows>
-			<ListSelectBanner>
-				<template #actions="{ unselectAll, selections }">
-					<div class="flex gap-2">
-						<Button
-							variant="ghost"
-							@click="removeQuiz(selections, unselectAll)"
-						>
-							<Trash2 class="h-4 w-4 stroke-1.5" />
-						</Button>
-					</div>
-				</template>
-			</ListSelectBanner>
 		</ListView>
 	</div>
 </template>
@@ -49,18 +43,15 @@
 import {
 	Breadcrumbs,
 	createListResource,
-	FormControl,
 	ListView,
 	ListRows,
 	ListRow,
-	ListRowItem,
 	ListHeader,
 	ListHeaderItem,
-	ListSelectBanner,
 	Button,
 } from 'frappe-ui'
 import { computed, inject } from 'vue'
-import { Trash2 } from 'lucide-vue-next'
+import { Plus } from 'lucide-vue-next'
 
 const user = inject('$user')
 
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 30adce7c..7833087e 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -68,13 +68,6 @@
   dependencies:
     "@codexteam/icons" "^0.0.5"
 
-"@editorjs/image@^2.9.2":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@editorjs/image/-/image-2.9.2.tgz#c8bea65a578fab65a1a75df1223b4fd8f06b57d5"
-  integrity sha512-n09sMieGW8cksoeflpplzvbmFH2bdVzVTWbnidPWAHaeU467HRteoXU9yfGBB7+eeHZLnmCulQ2dr6ae+G2niw==
-  dependencies:
-    "@codexteam/icons" "^0.3.0"
-
 "@editorjs/inline-code@^1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@editorjs/inline-code/-/inline-code-1.5.0.tgz#ad5849bac3396b9dad22dceeda76198dd991e426"
@@ -1882,8 +1875,16 @@ source-map-js@^1.2.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1901,8 +1902,14 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
diff --git a/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json b/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
index e14a8d48..5570559f 100644
--- a/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
+++ b/lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
@@ -6,7 +6,10 @@
  "engine": "InnoDB",
  "field_order": [
   "question",
-  "marks"
+  "column_break_qcpo",
+  "marks",
+  "section_break_huup",
+  "question_detail"
  ],
  "fields": [
   {
@@ -25,12 +28,28 @@
    "label": "Marks",
    "non_negative": 1,
    "reqd": 1
+  },
+  {
+   "fetch_from": "question.question",
+   "fieldname": "question_detail",
+   "fieldtype": "Text",
+   "in_list_view": 1,
+   "label": "Question Detail",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_qcpo",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_huup",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-10-16 19:51:03.893144",
+ "modified": "2024-07-29 15:10:09.662715",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz Question",
diff --git a/lms/lms/notification/certificate_request_creation/certificate_request_creation.html b/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
index 1db1fa13..34e041a1 100644
--- a/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
+++ b/lms/lms/notification/certificate_request_creation/certificate_request_creation.html
@@ -5,5 +5,5 @@
 
 <p> {{ _("Hey {0}").format(doc.member_name) }} </p>
 <p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, "medium"), frappe.utils.format_time(doc.start_time, "short"), timezone) }}</p>
-<p> {{ _("Your evaluator is {0}").format(evaluator_name) }}
+<p> {{ _("Your evaluator is {0}").format(evaluator_name) }} </p>
 <p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>
diff --git a/package.json b/package.json
index 01084562..21679ab9 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "frappe_lms",
   "version": "1.0.0",
   "description": "Easy to use, open-source, Learning Management System",
-  "workspaces1": [
+  "workspaces": [
     "frappe-ui",
     "frontend"
   ],