diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 69c2583d..3de0da5d 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -23,7 +23,6 @@ declare module 'vue' {
     BadgeAssignments: typeof import('./src/components/Settings/BadgeAssignments.vue')['default']
     BadgeForm: typeof import('./src/components/Settings/BadgeForm.vue')['default']
     Badges: typeof import('./src/components/Settings/Badges.vue')['default']
-    Bagdes: typeof import('./src/components/Settings/Bagdes.vue')['default']
     BatchCard: typeof import('./src/components/BatchCard.vue')['default']
     BatchCourseModal: typeof import('./src/components/Modals/BatchCourseModal.vue')['default']
     BatchCourses: typeof import('./src/components/BatchCourses.vue')['default']
diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
index 0d324b77..3751dc7b 100644
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -648,6 +648,8 @@ const getInstructions = (question) => {
 
 const markLessonProgress = () => {
 	let pathname = window.location.pathname.split('/')
+	if (!pathname.includes('courses'))
+		pathname = window.parent.location.pathname.split('/')
 	if (pathname[2] != 'courses') return
 	let lessonIndex = pathname.pop().split('-')
 
diff --git a/frontend/src/pages/CourseDetail.vue b/frontend/src/pages/CourseDetail.vue
index 0ac00c77..f57c435e 100644
--- a/frontend/src/pages/CourseDetail.vue
+++ b/frontend/src/pages/CourseDetail.vue
@@ -78,6 +78,7 @@
 							:title="__('Course Outline')"
 							:courseName="course.data.name"
 							:showOutline="true"
+							:getProgress="course.data.membership ? true : false"
 						/>
 					</div>
 					<CourseReviews
diff --git a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
index 61cf0858..fa4538b0 100644
--- a/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
+++ b/lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -146,11 +146,12 @@
    "fieldtype": "Section Break"
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
  "make_attachments_public": 1,
- "modified": "2025-02-17 18:40:53.374932",
- "modified_by": "Administrator",
+ "modified": "2025-07-14 10:24:23.526176",
+ "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Assignment Submission",
  "naming_rule": "Expression (old style)",
@@ -179,8 +180,45 @@
    "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": "Batch Evaluator",
+   "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
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [
@@ -202,4 +240,4 @@
   }
  ],
  "title_field": "assignment_title"
-}
\ No newline at end of file
+}
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index a10155dc..a834c2ac 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -993,6 +993,7 @@ def get_courses(filters=None, start=0):
 		or_filters=or_filters,
 		order_by="enrollments desc",
 		start=start,
+		page_length=30,
 	)
 
 	if show_featured:
@@ -2128,6 +2129,7 @@ def get_batches(filters=None, start=0, order_by="start_date"):
 		],
 		order_by=order_by,
 		start=start,
+		page_length=20,
 	)
 
 	batches = filter_batches_based_on_start_time(batches, filters)