diff --git a/frontend/src/components/Modals/FeedbackModal.vue b/frontend/src/components/Modals/FeedbackModal.vue
index b69d6615..abb97478 100644
--- a/frontend/src/components/Modals/FeedbackModal.vue
+++ b/frontend/src/components/Modals/FeedbackModal.vue
@@ -2,7 +2,7 @@
 	<Dialog
 		v-model="show"
 		:options="{
-			size: '4xl',
+			size: '5xl',
 		}"
 	>
 		<template #body>
@@ -19,10 +19,17 @@
 						rowHeight: 'h-16',
 						selectable: false,
 					}"
+					class="border rounded-lg py-2 px-3"
 				>
 					<ListHeader
-						class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
-					></ListHeader>
+						class="mb-2 grid items-center rounded bg-surface-white border-b rounded-none !px-0"
+					>
+						<ListHeaderItem :item="item" v-for="item in feedbackColumns">
+							<template #prefix="{ item }">
+								<FeatherIcon :name="item.icon?.toString()" class="h-4 w-4" />
+							</template>
+						</ListHeaderItem>
+					</ListHeader>
 					<ListRows>
 						<ListRow
 							:row="row"
@@ -41,7 +48,7 @@
 												class="flex"
 												:image="row['member_image']"
 												:label="item"
-												size="sm"
+												size="xl"
 											/>
 										</div>
 									</template>
@@ -63,9 +70,11 @@
 <script setup lang="ts">
 import {
 	Dialog,
-	ListView,
 	Avatar,
+	FeatherIcon,
+	ListView,
 	ListHeader,
+	ListHeaderItem,
 	ListRows,
 	ListRow,
 	ListRowItem,
@@ -89,27 +98,43 @@ const feedbackColumns = computed(() => {
 			label: 'Member',
 			key: 'member_name',
 			width: '10rem',
+			align: 'left',
+			icon: 'user',
 		},
 		{
 			label: 'Feedback',
 			key: 'feedback',
 			width: '15rem',
+			align: 'left',
+			icon: 'message-square',
 		},
 		{
 			label: 'Content',
 			key: 'content',
-			width: '9rem',
+			width: '10rem',
+			align: 'center',
+			icon: 'book',
 		},
 		{
 			label: 'Instructors',
 			key: 'instructors',
-			width: '9rem',
+			width: '10rem',
+			align: 'center',
+			icon: 'users',
 		},
 		{
 			label: 'Value',
 			key: 'value',
-			width: '9rem',
+			width: '10rem',
+			align: 'center',
+			icon: 'dollar-sign',
 		},
 	]
 })
 </script>
+<style>
+.feedback-list > button > div {
+	padding: 0.2rem 0;
+	margin-bottom: 0.2rem;
+}
+</style>
diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
index fd0e0c26..84e17442 100644
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -228,14 +228,6 @@
 							:model-value="reviewQuestions.includes(activeQuestion) ? 1 : 0"
 							@change="markForReview($event, activeQuestion)"
 						/>
-						<!-- <div class="text-sm text-ink-gray-5">
-							{{
-								__('Question {0} of {1}').format(
-									activeQuestion,
-									questions.length
-								)
-							}}
-						</div> -->
 						<div
 							v-if="!quiz.data.show_answers"
 							class="flex items-center space-x-2"
@@ -257,11 +249,13 @@
 									'cursor-pointer': item !== '...',
 									'bg-surface-gray-4 border border-outline-gray-5 font-medium':
 										activeQuestion == item,
-									'bg-surface-gray-3 text-ink-gray-6':
-										activeQuestion != item && item !== '...',
 									'text-ink-gray-5': item === '...',
 									'bg-surface-blue-3 text-ink-white':
 										attemptedQuestions.includes(item) && activeQuestion != item,
+									'bg-surface-gray-3 text-ink-gray-6':
+										activeQuestion != item &&
+										item !== '...' &&
+										!attemptedQuestions.includes(item),
 								}"
 								@click="item !== '...' && switchQuestion(item)"
 							>
@@ -315,7 +309,7 @@
 				<div class="flex items-center space-x-2 mt-2">
 					<div
 						v-for="index in reviewQuestions"
-						@click="activeQuestion = index"
+						@click="switchQuestion(index)"
 						class="w-6 h-6 rounded-full flex items-center justify-center text-sm cursor-pointer bg-surface-gray-3"
 					>
 						{{ index }}
diff --git a/frontend/src/pages/Batches/components/BatchFeedback.vue b/frontend/src/pages/Batches/components/BatchFeedback.vue
index 206cdc1c..dd084abe 100644
--- a/frontend/src/pages/Batches/components/BatchFeedback.vue
+++ b/frontend/src/pages/Batches/components/BatchFeedback.vue
@@ -183,9 +183,3 @@ const isAdmin = computed(() => {
 	return user.data?.is_moderator || user.data?.is_evaluator
 })
 </script>
-<style>
-.feedback-list > button > div {
-	align-items: start;
-	padding: 0.15rem 0;
-}
-</style>
diff --git a/frontend/src/pages/ProfileEvaluator.vue b/frontend/src/pages/ProfileEvaluator.vue
index c34e4fb9..78ef4db7 100644
--- a/frontend/src/pages/ProfileEvaluator.vue
+++ b/frontend/src/pages/ProfileEvaluator.vue
@@ -151,7 +151,7 @@
 </template>
 <script setup>
 import { createResource, FormControl, Button, Badge, toast } from 'frappe-ui'
-import { computed, reactive, ref, onMounted, inject } from 'vue'
+import { computed, reactive, ref, onMounted, inject, watch } from 'vue'
 import { convertToTitleCase } from '@/utils'
 import { Plus, X, Check, CircleAlert } from 'lucide-vue-next'
 
@@ -195,16 +195,30 @@ const evaluator = createResource({
 		evaluator: props.profile.data?.name,
 	},
 	auto: true,
-	onSuccess(data) {
-		if (data.slots.unavailable_from) from.value = data.slots.unavailable_from
-		if (data.slots.unavailable_to) to.value = data.slots.unavailable_to
-	},
 	onError(err) {
 		toast.error(err.messages?.[0] || err)
 		console.error(err)
 	},
 })
 
+watch(evaluator, () => {
+	if (evaluator.data?.slots?.unavailable_from)
+		from.value = evaluator.data.slots.unavailable_from
+	if (evaluator.data?.slots?.unavailable_to)
+		to.value = evaluator.data.slots.unavailable_to
+
+	evaluator.data?.slots?.schedule.forEach((slot) => {
+		slot.start_time = formatTime(slot.start_time)
+		slot.end_time = formatTime(slot.end_time)
+	})
+})
+
+const formatTime = (time) => {
+	if (!time) return ''
+	const [hour, minute] = time.split(':')
+	return `${hour.padStart(2, '0')}:${minute.padStart(2, '0')}`
+}
+
 const createSlot = createResource({
 	url: 'frappe.client.insert',
 	makeParams(values) {
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
index 7b78014f..a6090dc9 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
@@ -71,8 +71,13 @@
 				}"
 			>
 				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+					class="mb-2 grid items-center rounded bg-surface-gray-2 p-2"
 				>
+					<ListHeaderItem :item="item" v-for="item in columns">
+						<template #prefix="{ item }">
+							<FeatherIcon :name="item.icon?.toString()" class="h-4 w-4" />
+						</template>
+					</ListHeaderItem>
 				</ListHeader>
 				<ListRows>
 					<ListRow
@@ -134,13 +139,14 @@ import {
 	call,
 	createListResource,
 	dayjs,
+	FeatherIcon,
 	FormControl,
 	ListView,
 	ListHeader,
+	ListHeaderItem,
 	ListRows,
 	ListRow,
 	ListRowItem,
-	FeatherIcon,
 	ListSelectBanner,
 	toast,
 	usePageMeta,
@@ -272,17 +278,20 @@ const columns = computed(() => {
 			label: __('Title'),
 			key: 'title',
 			width: 3,
+			icon: 'file-text',
 		},
 		{
 			label: __('Language'),
 			key: 'language',
 			width: 2,
 			align: 'left',
+			icon: 'code',
 		},
 		{
 			label: __('Updated On'),
 			key: 'modified',
 			width: 1,
+			icon: 'clock',
 		},
 	]
 })
diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue
index ee2b7fb6..7ee1b216 100644
--- a/frontend/src/pages/Quizzes.vue
+++ b/frontend/src/pages/Quizzes.vue
@@ -10,10 +10,10 @@
 			{{ __('Create') }}
 		</Button>
 	</header>
-	<div class="py-5 mx-5">
-		<div class="flex items-center justify-between mb-4">
+	<div class="pt-5 mx-5">
+		<div class="flex items-center justify-between mb-5">
 			<div class="text-lg font-semibold text-ink-gray-9">
-				{{ __('{0} Quizzes').format(quizzes.data.length) }}
+				{{ __('{0} Quizzes').format(quizzes.data?.length) }}
 			</div>
 			<FormControl v-model="search" type="text" placeholder="Search">
 				<template #prefix>
@@ -27,9 +27,10 @@
 			:rows="quizzes.data"
 			row-key="name"
 			:options="{ showTooltip: false, selectable: true }"
+			class="h-[79vh] border-b"
 		>
 			<ListHeader
-				class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+				class="mb-2 grid items-center rounded bg-surface-white border-b rounded-none p-2"
 			>
 				<ListHeaderItem :item="item" v-for="item in quizColumns">
 					<template #prefix="{ item }">
@@ -47,7 +48,7 @@
 						},
 					}"
 				>
-					<ListRow :row="row">
+					<ListRow :row="row" class="hover:bg-surface-gray-2">
 						<template #default="{ column, item }">
 							<ListRowItem :item="row[column.key]" :align="column.align">
 								<div v-if="column.key == 'show_answers'">
@@ -59,7 +60,7 @@
 								</div>
 								<div
 									v-else-if="column.key == 'modified'"
-									class="text-xs text-ink-gray-5"
+									class="text-sm text-ink-gray-5"
 								>
 									{{ row[column.key] }}
 								</div>
@@ -71,7 +72,7 @@
 					</ListRow>
 				</router-link>
 			</ListRows>
-			<ListSelectBanner>
+			<ListSelectBanner class="bottom-50">
 				<template #actions="{ unselectAll, selections }">
 					<div class="flex gap-2">
 						<Button
@@ -85,10 +86,14 @@
 			</ListSelectBanner>
 		</ListView>
 		<EmptyState v-else type="Quizzes" />
-		<div v-if="quizzes.hasNextPage" class="flex justify-center my-5">
-			<Button @click="quizzes.next()">
+		<div class="flex items-center justify-end space-x-3 mt-3">
+			<Button v-if="quizzes.hasNextPage" @click="quizzes.next()">
 				{{ __('Load More') }}
 			</Button>
+			<div v-if="quizzes.hasNextPage" class="h-8 border-l"></div>
+			<div class="text-ink-gray-5">
+				{{ quizzes.data?.length }} {{ __('of') }} {{ totalQuizzes.data }}
+			</div>
 		</div>
 	</div>
 	<Dialog
@@ -123,6 +128,7 @@ import {
 	Breadcrumbs,
 	Button,
 	createListResource,
+	createResource,
 	Dialog,
 	FeatherIcon,
 	FormControl,
@@ -157,10 +163,12 @@ const showForm = ref(false)
 const title = ref('')
 
 onMounted(() => {
-	if (!user.data?.is_moderator && !user.data?.is_instructor) {
+	if (
+		!user.data?.is_moderator &&
+		!user.data?.is_instructor &&
+		!user.data?.is_evaluator
+	) {
 		router.push({ name: 'Courses' })
-	} else if (!user.data?.is_moderator) {
-		quizFilters.value['owner'] = user.data?.name
 	}
 	if (route.query.new === 'true') {
 		showForm.value = true
@@ -173,6 +181,9 @@ watch(search, () => {
 		filters: quizFilters.value,
 	})
 	quizzes.reload()
+	totalQuizzes.update({
+		filters: quizFilters.value,
+	})
 })
 
 const quizzes = createListResource({
@@ -194,12 +205,26 @@ const quizzes = createListResource({
 		return data.map((quiz) => {
 			return {
 				...quiz,
-				modified: dayjs(quiz.modified).fromNow(),
+				modified: dayjs(quiz.modified).fromNow(true),
 			}
 		})
 	},
 })
 
+const totalQuizzes = createResource({
+	url: 'frappe.client.get_count',
+	params: {
+		doctype: 'LMS Quiz',
+		filters: quizFilters.value,
+	},
+	auto: true,
+	cache: ['quizzes_count', user.data?.name],
+	onError(err) {
+		toast.error(err.messages?.[0] || err)
+		console.error(err)
+	},
+})
+
 const validateTitle = () => {
 	title.value = escapeHTML(title.value.trim())
 }
@@ -249,7 +274,7 @@ const quizColumns = computed(() => {
 		{
 			label: __('Total Marks'),
 			key: 'total_marks',
-			width: 1,
+			width: 0.5,
 			align: 'center',
 			icon: 'hash',
 		},
@@ -263,7 +288,7 @@ const quizColumns = computed(() => {
 		{
 			label: __('Max Attempts'),
 			key: 'max_attempts',
-			width: 1,
+			width: 0.5,
 			align: 'center',
 			icon: 'repeat',
 		},
@@ -275,7 +300,7 @@ const quizColumns = computed(() => {
 			icon: 'eye',
 		},
 		{
-			label: __('Modified'),
+			label: __('Updated On'),
 			key: 'modified',
 			width: 1,
 			align: 'center',
diff --git a/lms/demo/demo_data.py b/lms/demo/demo_data.py
index bbf7f0ac..2677495f 100644
--- a/lms/demo/demo_data.py
+++ b/lms/demo/demo_data.py
@@ -86,12 +86,21 @@ def create_instructor():
 			pluck="name",
 			limit=1,
 		)[0]
-		return frappe.get_doc("User", user)
+		instructor = frappe.get_doc("User", user)
+		instructor.user_image = "/assets/lms/images/instructor.png"
+		instructor.add_roles("Moderator")
+		instructor.save()
+		return instructor
 
-	return create_user("Jannat", "Patel", "jannat@example.com", "/assets/lms/images/instructor.png")
+	return create_user(
+		"Jannat", "Patel", "jannat@example.com", "/assets/lms/images/instructor.png", ["Moderator"]
+	)
 
 
-def create_user(first_name, last_name, email, user_image):
+def create_user(first_name, last_name, email, user_image, roles=None):
+	if roles is None:
+		roles = ["LMS Student"]
+
 	filters = {"first_name": first_name, "last_name": last_name, "email": email}
 	if frappe.db.exists("User", filters):
 		return frappe.get_doc("User", filters)
@@ -101,6 +110,8 @@ def create_user(first_name, last_name, email, user_image):
 	user.last_name = last_name
 	user.user_image = user_image
 	user.email = email
+	user.send_welcome_email = False
+	user.add_roles(*roles)
 	user.save()
 	return user
 
diff --git a/lms/lms/api.py b/lms/lms/api.py
index d57d7009..0819fd62 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -335,7 +335,8 @@ def get_evaluator_details(evaluator: str):
 		doc = frappe.new_doc("Course Evaluator")
 		doc.evaluator = evaluator
 		doc.insert()
-
+	for slot in doc.schedule:
+		print(slot.start_time, slot.end_time)
 	return {
 		"slots": doc.as_dict(),
 		"calendar": calendar.name,
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.json b/lms/lms/doctype/lms_quiz/lms_quiz.json
index 6de9c1ec..2ca7dbc3 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.json
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.json
@@ -159,7 +159,7 @@
    "link_fieldname": "quiz"
   }
  ],
- "modified": "2025-06-27 20:00:15.660323",
+ "modified": "2026-03-25 20:22:22.124828",
  "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Quiz",
@@ -209,6 +209,18 @@
    "report": 1,
    "role": "LMS Student",
    "share": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Batch Evaluator",
+   "share": 1,
+   "write": 1
   }
  ],
  "row_format": "Dynamic",