diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js
index 6d9fadb1..47a592d9 100644
--- a/cypress/e2e/course_creation.cy.js
+++ b/cypress/e2e/course_creation.cy.js
@@ -11,7 +11,6 @@ describe("Course Creation", () => {
 		cy.get("button").contains("Create").click();
 		cy.get("span").contains("New Course").click();
 		cy.wait(500);
-		cy.url().should("include", "/courses/new/edit");
 
 		cy.get("label").contains("Title").type("Test Course");
 		cy.get("label")
@@ -35,21 +34,6 @@ describe("Course Creation", () => {
 				});
 		});
 
-		cy.get("label")
-			.contains("Preview Video")
-			.type("https://www.youtube.com/embed/-LPmw2Znl2c");
-		cy.get("[id=tags]").type("Learning{enter}Frappe{enter}ERPNext{enter}");
-		cy.get("label")
-			.contains("Category")
-			.parent()
-			.within(() => {
-				cy.get("button").click();
-			});
-		cy.get("[id^=headlessui-combobox-option-")
-			.should("be.visible")
-			.first()
-			.click();
-
 		/* Instructor */
 		cy.get("label")
 			.contains("Instructors")
@@ -69,13 +53,32 @@ describe("Course Creation", () => {
 				});
 		});
 
+		cy.button("Create").last().click();
+
+		// Edit Course Details
+		cy.wait(500);
+		cy.get("label")
+			.contains("Preview Video")
+			.type("https://www.youtube.com/embed/-LPmw2Znl2c");
+		cy.get("[id=tags]").type("Learning{enter}Frappe{enter}ERPNext{enter}");
+		cy.get("label")
+			.contains("Category")
+			.parent()
+			.within(() => {
+				cy.get("button").click();
+			});
+		cy.get("[id^=headlessui-combobox-option-")
+			.should("be.visible")
+			.first()
+			.click();
+
 		cy.get("label").contains("Published").click();
 		cy.get("label").contains("Published On").type("2021-01-01");
 		cy.button("Save").click();
 
 		// Add Chapter
 		cy.wait(1000);
-		cy.button("Add Chapter").click();
+		cy.button("Add").click();
 
 		cy.wait(1000);
 		cy.get("[data-dismissable-layer]")
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 1292ad68..2ce38f23 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -54,7 +54,6 @@ declare module 'vue' {
     CourseCardOverlay: typeof import('./src/components/CourseCardOverlay.vue')['default']
     CourseInstructors: typeof import('./src/components/CourseInstructors.vue')['default']
     CourseOutline: typeof import('./src/components/CourseOutline.vue')['default']
-    CourseProgressSummary: typeof import('./src/components/Modals/CourseProgressSummary.vue')['default']
     CourseReviews: typeof import('./src/components/CourseReviews.vue')['default']
     CreateOutline: typeof import('./src/components/CreateOutline.vue')['default']
     DateRange: typeof import('./src/components/Common/DateRange.vue')['default']
diff --git a/frontend/src/pages/Courses/CourseDashboard.vue b/frontend/src/pages/Courses/CourseDashboard.vue
index a802ae59..f5b75a44 100644
--- a/frontend/src/pages/Courses/CourseDashboard.vue
+++ b/frontend/src/pages/Courses/CourseDashboard.vue
@@ -20,7 +20,7 @@
 			<NumberChartGraph :title="__('Lessons')" :value="course.data?.lessons" />
 		</div>
 		<div class="grid grid-cols-[2fr_1fr] gap-5 items-start">
-			<div class="border rounded-lg py-3 px-4">
+			<div v-if="course.data?.enrollments" class="border rounded-lg py-3 px-4">
 				<div class="flex items-center justify-between mb-3">
 					<div class="text-lg font-semibold">
 						{{ __('Students') }}
@@ -120,7 +120,7 @@
 				</div>
 			</div>
 			<div class="space-y-5">
-				<div class="border rounded-lg p-4">
+				<div v-if="chartDetails.data?.length" class="border rounded-lg p-4">
 					<div class="text-ink-gray-5 mb-4">
 						{{ __('Progress Summary') }}
 					</div>
diff --git a/frontend/src/pages/Courses/NewCourseModal.vue b/frontend/src/pages/Courses/NewCourseModal.vue
index 46389790..eff45643 100644
--- a/frontend/src/pages/Courses/NewCourseModal.vue
+++ b/frontend/src/pages/Courses/NewCourseModal.vue
@@ -1,82 +1,82 @@
 <template>
-    <Dialog
-        v-model="show"
-        :options="{
-            title: __('Create Course'),
-            size: '3xl',
-        }"
-    >
-        <template #body-content>
-            <div class="text-base">
-                <div class="grid grid-cols-2 gap-5 border-b mb-5">
-                    <FormControl
-                        v-model="course.title"
-                        :label="__('Title')"
-                        :required="true"
-                    />
-                    <Link
-                        doctype="LMS Category"
-                        v-model="course.category"
-                        :label="__('Category')"
-                        :allowCreate="true"
-                        @create="
-                            () => {
-                                openSettings('Categories')
-                                show = false
-                            }
-                        "
-                    />
-                    <MultiSelect
-                        v-model="course.instructors"
-                        doctype="User"
-                        :label="__('Instructors')"
-                        :filters="{ ignore_user_type: 1 }"
-                        :onCreate="(close: () => void) => openSettings('Members', close)"
-                        :required="true"
-                    />
-                    <Uploader
-                        v-model="course.image"
-                        :label="__('Course Image')"
-                        :required="false"
-                    />
-                </div>
-                <div class="space-y-4">
-                    <FormControl
-                        v-model="course.short_introduction"
-                        :label="__('Short Introduction')"
-                        type="textarea"
-                        :required="true"
-                        :rows="4"
-                    />
-                    <div class="">
-                        <div class="mb-1.5 text-sm text-ink-gray-5">
-                            {{ __('Course Description') }}
-                            <span class="text-ink-red-3">*</span>
-                        </div>
-                        <TextEditor
-                            :content="course.description"
-                            @change="(val: string) => (course.description = val)"
-                            :editable="true"
-                            :fixedMenu="true"
-                            editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[10rem]"
-                        />
-                    </div>
-                </div>
-            </div>
-        </template>
-        <template #actions="{ close }">
-            <div class="text-right">
-                <Button variant="solid" @click="saveCourse(close)">
-                    {{ __('Create') }}
-                </Button>
-            </div>
-        </template>
-    </Dialog>
+	<Dialog
+		v-model="show"
+		:options="{
+			title: __('Create Course'),
+			size: '3xl',
+		}"
+	>
+		<template #body-content>
+			<div class="text-base">
+				<div class="grid grid-cols-2 gap-5 border-b mb-5">
+					<FormControl
+						v-model="course.title"
+						:label="__('Title')"
+						:required="true"
+					/>
+					<Link
+						doctype="LMS Category"
+						v-model="course.category"
+						:label="__('Category')"
+						:allowCreate="true"
+						@create="
+							() => {
+								openSettings('Categories')
+								show = false
+							}
+						"
+					/>
+					<MultiSelect
+						v-model="course.instructors"
+						doctype="User"
+						:label="__('Instructors')"
+						:filters="{ ignore_user_type: 1 }"
+						:onCreate="(close: () => void) => openSettings('Members', close)"
+						:required="true"
+					/>
+					<Uploader
+						v-model="course.image"
+						:label="__('Course Image')"
+						:required="false"
+					/>
+				</div>
+				<div class="space-y-4">
+					<FormControl
+						v-model="course.short_introduction"
+						:label="__('Short Introduction')"
+						type="textarea"
+						:required="true"
+						:rows="4"
+					/>
+					<div class="">
+						<div class="mb-1.5 text-sm text-ink-gray-5">
+							{{ __('Course Description') }}
+							<span class="text-ink-red-3">*</span>
+						</div>
+						<TextEditor
+							:content="course.description"
+							@change="(val: string) => (course.description = val)"
+							:editable="true"
+							:fixedMenu="true"
+							editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[10rem]"
+						/>
+					</div>
+				</div>
+			</div>
+		</template>
+		<template #actions="{ close }">
+			<div class="text-right">
+				<Button variant="solid" @click="saveCourse(close)">
+					{{ __('Create') }}
+				</Button>
+			</div>
+		</template>
+	</Dialog>
 </template>
 <script setup lang="ts">
 import { Button, Dialog, FormControl, TextEditor, toast } from 'frappe-ui'
-import { Link, useOnboarding, useTelemetry } from "frappe-ui/frappe"
-import { onMounted, onBeforeUnmount, ref, watch } from 'vue';
+import { Link, useOnboarding, useTelemetry } from 'frappe-ui/frappe'
+import { inject, onMounted, onBeforeUnmount, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { openSettings } from '@/utils'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
@@ -86,58 +86,64 @@ const show = defineModel<boolean>({ required: true, default: false })
 const router = useRouter()
 const { capture } = useTelemetry()
 const { updateOnboardingStep } = useOnboarding('learning')
+const user = inject<any>('$user')
 
 const props = defineProps<{
-    courses: any
+	courses: any
 }>()
 
 const course = ref({
-    title: '',
-    short_introduction: '',
-    description: '',
-    instructors: [],
-    category: null,
-    image: null,
-}) 
+	title: '',
+	short_introduction: '',
+	description: '',
+	instructors: [],
+	category: null,
+	image: null,
+})
 
 const saveCourse = (close: () => void = () => {}) => {
-    props.courses.insert.submit({
-        ...course.value,
-        instructors: course.value.instructors.map((instructor) => ({
-            instructor: instructor,
-        })),
-    }, {
-        onSuccess(data: any) {
-            toast.success(__('Course created successfully'))
-            close()
-            capture('course_created')
-            updateOnboardingStep('create_first_course', true, false, () => {
-                localStorage.setItem('firstCourse', data.name)
-            })
-            router.push({
-                name: 'CourseDetail',
-                params: { courseName: data.name },
-                hash: '#settings',
-            })
-        },
-    })
+	props.courses.insert.submit(
+		{
+			...course.value,
+			instructors: course.value.instructors.map((instructor) => ({
+				instructor: instructor,
+			})),
+		},
+		{
+			onSuccess(data: any) {
+				toast.success(__('Course created successfully'))
+				close()
+				capture('course_created')
+				router.push({
+					name: 'CourseDetail',
+					params: { courseName: data.name },
+					hash: '#settings',
+				})
+				if (user.data?.is_system_manager) {
+					updateOnboardingStep('create_first_course', true, false, () => {
+						localStorage.setItem('firstCourse', data.name)
+					})
+				}
+			},
+		}
+	)
 }
 
 const keyboardShortcut = (e: KeyboardEvent) => {
-    if (
-        e.key === 's' &&
-        (e.ctrlKey || e.metaKey) &&
-        e.target &&
-        e.target instanceof HTMLElement &&
-        !e.target.classList.contains('ProseMirror')
-    ) {
-        saveCourse()
-        e.preventDefault()
-    }
+	if (
+		e.key === 's' &&
+		(e.ctrlKey || e.metaKey) &&
+		e.target &&
+		e.target instanceof HTMLElement &&
+		!e.target.classList.contains('ProseMirror')
+	) {
+		saveCourse()
+		e.preventDefault()
+	}
 }
 
 onMounted(() => {
-    window.addEventListener('keydown', keyboardShortcut)
+	window.addEventListener('keydown', keyboardShortcut)
 })
 
 onBeforeUnmount(() => {
@@ -147,4 +153,4 @@ onBeforeUnmount(() => {
 watch(show, () => {
 	capture('course_form_opened')
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/lms/lms/doctype/lms_course_review/lms_course_review.json b/lms/lms/doctype/lms_course_review/lms_course_review.json
index 3eab43fb..4ac6be0c 100644
--- a/lms/lms/doctype/lms_course_review/lms_course_review.json
+++ b/lms/lms/doctype/lms_course_review/lms_course_review.json
@@ -38,10 +38,11 @@
    "fieldtype": "Column Break"
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-12-21 15:25:16.744558",
- "modified_by": "Administrator",
+ "modified": "2026-01-29 16:10:47.787285",
+ "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Course Review",
  "owner": "Administrator",
@@ -60,7 +61,6 @@
   },
   {
    "create": 1,
-   "delete": 1,
    "email": 1,
    "export": 1,
    "print": 1,
@@ -69,12 +69,49 @@
    "role": "LMS Student",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Moderator",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Course Creator",
+   "share": 1,
+   "write": 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",
  "search_fields": "course",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "title_field": "course",
  "track_changes": 1
-}
\ No newline at end of file
+}