diff --git a/frontend/package.json b/frontend/package.json
index 77e7d608..bead43a6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -34,7 +34,7 @@
     "dayjs": "1.11.10",
     "dompurify": "3.2.6",
     "feather-icons": "4.28.0",
-    "frappe-ui": "^0.1.254",
+    "frappe-ui": "^0.1.256",
     "highlight.js": "11.11.1",
     "lucide-vue-next": "0.383.0",
     "markdown-it": "14.0.0",
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 76464f03..8edca776 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -15,7 +15,6 @@ import { useScreenSize } from './utils/composables'
 import { usersStore } from '@/stores/user'
 import { useSettings } from '@/stores/settings'
 import { useRouter } from 'vue-router'
-import { posthogSettings } from '@/telemetry'
 import DesktopLayout from './components/DesktopLayout.vue'
 import MobileLayout from './components/MobileLayout.vue'
 import NoSidebarLayout from './components/NoSidebarLayout.vue'
@@ -49,10 +48,4 @@ const Layout = computed(() => {
 onUnmounted(() => {
 	noSidebar.value = false
 })
-
-watch(userResource, () => {
-	if (userResource.data) {
-		posthogSettings.reload()
-	}
-})
 </script>
diff --git a/frontend/src/components/AdminBatchDashboard.vue b/frontend/src/components/AdminBatchDashboard.vue
index 934ab995..135fe84c 100644
--- a/frontend/src/components/AdminBatchDashboard.vue
+++ b/frontend/src/components/AdminBatchDashboard.vue
@@ -8,7 +8,7 @@
 		<div class="grid grid-cols-2 md:grid-cols-4 gap-5 mb-8">
 			<NumberChart
 				class="border rounded-md"
-				:config="{ title: __('Students'), value: students.data?.length || 0 }"
+				:config="{ title: __('Students'), value: studentCount.data || 0 }"
 			/>
 
 			<NumberChart
@@ -29,7 +29,7 @@
 
 			<NumberChart
 				class="border rounded-md"
-				:config="{ title: __('Assessments'), value: assessmentCount || 0 }"
+				:config="{ title: __('Assessments'), value: assessmentCount.data || 0 }"
 			/>
 		</div>
 
@@ -37,7 +37,7 @@
 			v-if="showProgressChart"
 			class="border"
 			:config="{
-				data: chartData || [],
+				data: filteredChartData,
 				title: __('Batch Summary'),
 				subtitle: __('Progress of students in courses and assessments'),
 				xAxis: {
@@ -64,96 +64,55 @@
 </template>
 <script setup lang="ts">
 import { AxisChart, createResource, NumberChart } from 'frappe-ui'
-import { ref, watch } from 'vue'
-
-const chartData = ref<null | any[]>(null)
-const showProgressChart = ref(false)
-const assessmentCount = ref(0)
+import { computed } from 'vue'
 
 const props = defineProps<{
 	batch: { [key: string]: any } | null
 }>()
 
-const students = createResource({
-	url: 'lms.lms.utils.get_batch_students',
+const studentCount = createResource({
+	url: 'frappe.client.get_count',
+	cache: ['batch_student_count', props.batch?.data?.name],
+	params: {
+		doctype: 'LMS Batch Enrollment',
+		filters: { batch: props.batch?.data?.name },
+	},
+	auto: true,
+})
+
+const assessmentCount = createResource({
+	url: 'lms.lms.utils.get_batch_assessment_count',
+	cache: ['batch_assessment_count', props.batch?.data?.name],
 	params: {
 		batch: props.batch?.data?.name,
 	},
 	auto: true,
-	onSuccess(data: any[]) {
-		chartData.value = getChartData()
-		showProgressChart.value =
-			data.length &&
-			(props.batch?.data?.courses?.length || assessmentCount.value)
-	},
 })
 
-const getChartData = () => {
-	let tasks: any[] = []
-	let data: { task: any; value: any }[] = []
-
-	students.data.forEach((row: any) => {
-		tasks = countAssessments(row, tasks)
-		tasks = countCourses(row, tasks)
-	})
-
-	tasks.forEach((task) => {
-		data.push({
-			task: task.label,
-			value: task.value,
-		})
-	})
-	return data
-}
-
-const countAssessments = (
-	row: { assessments: { [x: string]: { result: string } } },
-	tasks: any[]
-) => {
-	Object.keys(row.assessments).forEach((assessment) => {
-		if (row.assessments[assessment].result === 'Pass') {
-			tasks.filter((task) => task.label === assessment).length
-				? tasks.filter((task) => task.label === assessment)[0].value++
-				: tasks.push({
-						value: 1,
-						label: assessment,
-				  })
-		}
-	})
-	return tasks
-}
-
-const countCourses = (
-	row: { courses: { [x: string]: number } },
-	tasks: any[]
-) => {
-	Object.keys(row.courses).forEach((course) => {
-		if (row.courses[course] === 100) {
-			tasks.filter((task) => task.label === course).length
-				? tasks.filter((task) => task.label === course)[0].value++
-				: tasks.push({
-						value: 1,
-						label: course,
-				  })
-		}
-	})
-	return tasks
-}
+const chartData = createResource({
+	url: 'lms.lms.utils.get_batch_chart_data',
+	cache: ['batch_chart_data', props.batch?.data?.name],
+	params: { batch: props.batch?.data?.name },
+	auto: true,
+})
 
 const certificationCount = createResource({
 	url: 'frappe.client.get_count',
+	cache: ['batch_certificate_count', props.batch?.data?.name],
 	params: {
 		doctype: 'LMS Certificate',
-		filters: {
-			batch_name: props.batch?.data?.name,
-		},
+		filters: { batch_name: props.batch?.data?.name },
 	},
 	auto: true,
 })
 
-watch(students, () => {
-	if (students.data?.length) {
-		assessmentCount.value = Object.keys(students.data?.[0].assessments).length
-	}
-})
+const filteredChartData = computed(() =>
+	(chartData.data || []).filter((item: { value: number }) => item.value > 0)
+)
+
+const showProgressChart = computed(
+	() =>
+		studentCount.data &&
+		(props.batch?.data?.courses?.length || assessmentCount.data)
+)
 </script>
diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue
index d6e336a8..1eb56e17 100644
--- a/frontend/src/components/BatchStudents.vue
+++ b/frontend/src/components/BatchStudents.vue
@@ -2,7 +2,7 @@
 	<div>
 		<div class="flex items-center justify-between mb-4">
 			<div class="text-ink-gray-9 font-medium">
-				{{ students.data?.length }} {{ __('Students') }}
+				{{ studentCount.data ?? 0 }} {{ __('Students') }}
 			</div>
 			<Button v-if="!readOnlyMode" @click="openStudentModal()">
 				<template #prefix>
@@ -15,7 +15,7 @@
 		<div v-if="students.data?.length">
 			<ListView
 				class="max-h-[75vh]"
-				:columns="getStudentColumns()"
+				:columns="studentColumns"
 				:rows="students.data"
 				row-key="name"
 				:options="{
@@ -27,7 +27,7 @@
 				>
 					<ListHeaderItem
 						:item="item"
-						v-for="item in getStudentColumns()"
+						v-for="item in studentColumns"
 						:title="item.label"
 					>
 						<template #prefix="{ item }">
@@ -88,6 +88,11 @@
 						</div>
 					</template>
 				</ListSelectBanner>
+				<div class="mt-4" v-if="students.hasNextPage">
+					<Button @click="students.next()">
+						{{ __('Load More') }}
+					</Button>
+				</div>
 			</ListView>
 		</div>
 		<div v-else-if="!students.loading" class="text-sm italic text-ink-gray-5">
@@ -110,6 +115,7 @@
 import {
 	Avatar,
 	Button,
+	createListResource,
 	createResource,
 	FeatherIcon,
 	ListHeader,
@@ -139,39 +145,48 @@ const props = defineProps({
 	},
 })
 
-const students = createResource({
-	url: 'lms.lms.utils.get_batch_students',
+const studentCount = createResource({
+	url: 'frappe.client.get_count',
+	cache: ['batch_student_count', props.batch?.data?.name],
 	params: {
+		doctype: 'LMS Batch Enrollment',
+		filters: { batch: props.batch?.data?.name },
+	},
+	auto: true,
+})
+
+const students = createListResource({
+	doctype: 'LMS Batch Enrollment',
+	url: 'lms.lms.utils.get_batch_students',
+	cache: ['batch_students', props.batch?.data?.name],
+	pageLength: 50,
+	filters: {
 		batch: props.batch?.data?.name,
 	},
 	auto: true,
 })
 
-const getStudentColumns = () => {
-	let columns = [
-		{
-			label: 'Full Name',
-			key: 'full_name',
-			width: '20rem',
-			icon: 'user',
-		},
-		{
-			label: 'Progress',
-			key: 'progress',
-			width: '15rem',
-			icon: 'activity',
-		},
-		{
-			label: 'Last Active',
-			key: 'last_active',
-			width: '10rem',
-			align: 'center',
-			icon: 'clock',
-		},
-	]
-
-	return columns
-}
+const studentColumns = [
+	{
+		label: 'Full Name',
+		key: 'full_name',
+		width: '20rem',
+		icon: 'user',
+	},
+	{
+		label: 'Progress',
+		key: 'progress',
+		width: '15rem',
+		icon: 'activity',
+	},
+	{
+		label: 'Last Active',
+		key: 'last_active',
+		width: '10rem',
+		align: 'center',
+		icon: 'clock',
+	},
+]
 
 const openStudentModal = () => {
 	showStudentModal.value = true
@@ -200,6 +215,7 @@ const removeStudents = (selections, unselectAll) => {
 		{
 			onSuccess(data) {
 				students.reload()
+				studentCount.reload()
 				props.batch.reload()
 				toast.success(__('Students deleted successfully'))
 				unselectAll()
diff --git a/frontend/src/components/Controls/ChildTable.vue b/frontend/src/components/Controls/ChildTable.vue
index dd34a34f..5e6ef47e 100644
--- a/frontend/src/components/Controls/ChildTable.vue
+++ b/frontend/src/components/Controls/ChildTable.vue
@@ -3,55 +3,56 @@
 		<div class="text-xs text-ink-gray-5 mb-2">
 			{{ label }}
 		</div>
-		<div class="overflow-x-auto overflow-y-visible border rounded-md">
-			<div
-				class="grid items-center space-x-4 p-2 border-b"
-				:style="{ gridTemplateColumns: getGridTemplateColumns() }"
-			>
+		<div class="overflow-visible border rounded-md">
+			<div class="overflow-x-auto">
 				<div
-					v-for="(column, index) in columns"
-					:key="index"
-					class="text-sm text-ink-gray-5"
+					class="grid items-center space-x-4 p-2 border-b"
+					:style="{ gridTemplateColumns: getGridTemplateColumns() }"
 				>
-					{{ column }}
-				</div>
-				<div></div>
-			</div>
-			<div
-				v-for="(row, rowIndex) in rows"
-				:key="rowIndex"
-				class="grid items-center space-x-4 p-2"
-				:style="{ gridTemplateColumns: getGridTemplateColumns() }"
-			>
-				<template v-for="key in Object.keys(row)" :key="key">
-					<input
-						v-if="showKey(key)"
-						v-model="row[key]"
-						class="py-1.5 px-2 border-none focus:ring-0 focus:border focus:border-gray-300 focus:bg-surface-gray-2 rounded-md text-sm focus:outline-none"
-					/>
-				</template>
-
-				<div class="relative" ref="menuRef">
-					<Button
-						variant="ghost"
-						@click="(event: MouseEvent) => toggleMenu(rowIndex, event)"
+					<div
+						v-for="(column, index) in columns"
+						:key="index"
+						class="text-sm text-ink-gray-5"
 					>
-						<template #icon>
-							<Ellipsis
-								class="size-4 text-ink-gray-7 stroke-1.5 cursor-pointer"
-							/>
-						</template>
-					</Button>
+						{{ column }}
+					</div>
+					<div></div>
+				</div>
+				<div
+					v-for="(row, rowIndex) in rows"
+					:key="rowIndex"
+					class="grid items-center space-x-4 p-2"
+					:style="{ gridTemplateColumns: getGridTemplateColumns() }"
+				>
+					<template v-for="key in Object.keys(row)" :key="key">
+						<input
+							v-if="showKey(key)"
+							v-model="row[key]"
+							class="py-1.5 px-2 border-none focus:ring-0 focus:border focus:border-gray-300 focus:bg-surface-gray-2 rounded-md text-sm focus:outline-none"
+						/>
+					</template>
+
+					<div class="relative">
+						<Button
+							variant="ghost"
+							@click="(event: MouseEvent) => toggleMenu(rowIndex, event)"
+						>
+							<template #icon>
+								<Ellipsis
+									class="size-4 text-ink-gray-7 stroke-1.5 cursor-pointer"
+								/>
+							</template>
+						</Button>
 
-					<Teleport to="body">
 						<div
 							v-if="menuOpenIndex === rowIndex"
-							:style="{
-								position: 'absolute',
-								top: menuTopPosition,
-								left: menuLeftPosition,
-							}"
-							class="top-5 mt-1 w-32 bg-surface-white border border-outline-gray-1 rounded-md shadow-sm"
+							ref="menuRef"
+							class="absolute right-0 w-32 z-50 bg-surface-white border border-outline-gray-1 rounded-md shadow-sm"
+							:class="
+								rowIndex == (rows?.length ?? 0) - 1
+									? 'bottom-full mb-1'
+									: 'top-full mt-1'
+							"
 						>
 							<button
 								@click="deleteRow(rowIndex)"
@@ -63,7 +64,7 @@
 								</span>
 							</button>
 						</div>
-					</Teleport>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -154,10 +155,7 @@ const getGridTemplateColumns = () => {
 }
 
 const toggleMenu = (index: number, event: MouseEvent) => {
-	const rect = (event.target as HTMLElement).getBoundingClientRect()
-	menuOpenIndex.value = index
-	menuTopPosition.value = rect.bottom + 'px'
-	menuLeftPosition.value = rect.right + 'px'
+	menuOpenIndex.value = menuOpenIndex.value === index ? null : index
 }
 
 onClickOutside(menuRef, () => {
diff --git a/frontend/src/components/Controls/Uploader.vue b/frontend/src/components/Controls/Uploader.vue
index 73643892..8c83ff4c 100644
--- a/frontend/src/components/Controls/Uploader.vue
+++ b/frontend/src/components/Controls/Uploader.vue
@@ -70,7 +70,7 @@ const props = withDefaults(
 		modelValue: string
 		label?: string
 		description?: string
-		type: 'image' | 'video'
+		type?: 'image' | 'video'
 		required?: boolean
 	}>(),
 	{
diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index d401836b..a357a747 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -189,15 +189,16 @@ import {
 import { computed, inject, ref } from 'vue'
 import { Badge, Button, call, createResource, toast } from 'frappe-ui'
 import { formatAmount } from '@/utils/'
-import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 import CertificationLinks from '@/components/CertificationLinks.vue'
 import CourseProgressSummary from '@/components/Modals/CourseProgressSummary.vue'
+import { useTelemetry } from 'frappe-ui/frappe'
 
 const router = useRouter()
 const user = inject('$user')
 const showProgressModal = ref(false)
 const readOnlyMode = window.read_only_mode
+const { capture } = useTelemetry()
 
 const props = defineProps({
 	course: {
@@ -215,7 +216,7 @@ const video_link = computed(() => {
 
 function enrollStudent() {
 	if (!user.data) {
-		toast.success(__('You need to login first to enroll for this course'))
+		toast.warning(__('You need to login first to enroll for this course'))
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`
 		}, 500)
diff --git a/frontend/src/components/LiveClass.vue b/frontend/src/components/LiveClass.vue
index 3ee8b91a..fffbd23a 100644
--- a/frontend/src/components/LiveClass.vue
+++ b/frontend/src/components/LiveClass.vue
@@ -107,7 +107,11 @@
 		v-model:reloadLiveClasses="liveClasses"
 	/>
 
-	<LiveClassAttendance v-model="showAttendance" :live_class="attendanceFor" />
+	<LiveClassAttendance
+		v-if="showAttendance"
+		v-model="showAttendance"
+		:live_class="attendanceFor"
+	/>
 </template>
 <script setup>
 import { createListResource, Button, Tooltip } from 'frappe-ui'
diff --git a/frontend/src/components/Modals/ChapterModal.vue b/frontend/src/components/Modals/ChapterModal.vue
index 6bc70b2a..409fb200 100644
--- a/frontend/src/components/Modals/ChapterModal.vue
+++ b/frontend/src/components/Modals/ChapterModal.vue
@@ -80,13 +80,13 @@ import {
 } from 'frappe-ui'
 import { reactive, watch, inject } from 'vue'
 import { getFileSize } from '@/utils/'
-import { capture } from '@/telemetry'
 import { FileText, X } from 'lucide-vue-next'
-import { useOnboarding } from 'frappe-ui/frappe'
+import { useOnboarding, useTelemetry } from 'frappe-ui/frappe'
 
 const show = defineModel()
 const outline = defineModel('outline')
 const user = inject('$user')
+const { capture } = useTelemetry()
 const { updateOnboardingStep } = useOnboarding('learning')
 
 const props = defineProps({
diff --git a/frontend/src/components/Modals/Event.vue b/frontend/src/components/Modals/Event.vue
index 04804f49..365f0c61 100644
--- a/frontend/src/components/Modals/Event.vue
+++ b/frontend/src/components/Modals/Event.vue
@@ -22,7 +22,10 @@
 							</div>
 						</Tooltip>
 						<Tooltip :text="__('Course')">
-							<div class="flex items-center space-x-2 w-fit">
+							<div
+								class="flex space-x-2 w-fit cursor-pointer"
+								@click="openLink('course', event.course)"
+							>
 								<BookOpen class="h-4 w-4 stroke-1.5" />
 								<span>
 									{{ event.course_title }}
@@ -30,7 +33,10 @@
 							</div>
 						</Tooltip>
 						<Tooltip v-if="event.batch_title" :text="__('Batch')">
-							<div class="flex items-center space-x-2 w-fit">
+							<div
+								class="flex space-x-2 w-fit cursor-pointer"
+								@click="openLink('batch', event.batch_name)"
+							>
 								<Users class="h-4 w-4 stroke-1.5" />
 								<span>
 									{{ event.batch_title }}
@@ -334,7 +340,7 @@ const certificateDetails = createResource({
 		}
 	},
 	onError(err) {
-		certificate.template = defaultTemplate.data.value
+		certificate.template = defaultTemplate.data?.value
 	},
 	auto: false,
 })
@@ -377,6 +383,16 @@ const openCertificate = (certificate) => {
 	)
 }
 
+const openLink = (type, name) => {
+	let url = ''
+	if (type === 'course') {
+		url = `/lms/courses/${name}`
+	} else if (type === 'batch') {
+		url = `/lms/batches/${name}#students`
+	}
+	window.open(url, '_blank')
+}
+
 const statusOptions = computed(() => {
 	return [
 		{
diff --git a/frontend/src/components/Modals/ZoomAccountModal.vue b/frontend/src/components/Modals/ZoomAccountModal.vue
index 5f0bb999..48f986a4 100644
--- a/frontend/src/components/Modals/ZoomAccountModal.vue
+++ b/frontend/src/components/Modals/ZoomAccountModal.vue
@@ -66,6 +66,7 @@ import { inject, reactive, watch } from 'vue'
 import { User } from '@/components/Settings/types'
 import { openSettings, cleanError } from '@/utils'
 import Link from '@/components/Controls/Link.vue'
+import { useTelemetry } from 'frappe-ui/frappe'
 
 interface ZoomAccount {
 	name: string
@@ -97,6 +98,7 @@ interface ZoomAccounts {
 const show = defineModel('show')
 const user = inject<User | null>('$user')
 const zoomAccounts = defineModel<ZoomAccounts>('zoomAccounts')
+const { capture } = useTelemetry()
 
 const account = reactive({
 	name: '',
@@ -154,6 +156,7 @@ const createAccount = (close: () => void) => {
 		},
 		{
 			onSuccess() {
+				capture('zoom_account_linked')
 				zoomAccounts.value?.reload()
 				close()
 				toast.success(__('Zoom Account created successfully'))
diff --git a/frontend/src/components/Sidebar/AppSidebar.vue b/frontend/src/components/Sidebar/AppSidebar.vue
index fbb95344..f28c0a0f 100644
--- a/frontend/src/components/Sidebar/AppSidebar.vue
+++ b/frontend/src/components/Sidebar/AppSidebar.vue
@@ -199,7 +199,6 @@ import { useSidebar } from '@/stores/sidebar'
 import { useSettings } from '@/stores/settings'
 import { Button, call, createResource, Tooltip, toast } from 'frappe-ui'
 import PageModal from '@/components/Modals/PageModal.vue'
-import { capture } from '@/telemetry'
 import LMSLogo from '@/components/Icons/LMSLogo.vue'
 import { useRouter } from 'vue-router'
 import {
@@ -233,6 +232,7 @@ import {
 	showHelpModal,
 	minimize,
 	IntermediateStepModal,
+	useTelemetry,
 } from 'frappe-ui/frappe'
 import InviteIcon from '@/components/Icons/InviteIcon.vue'
 import UserDropdown from '@/components/Sidebar/UserDropdown.vue'
@@ -246,6 +246,7 @@ let sidebarStore = useSidebar()
 const socket = inject('$socket')
 const unreadCount = ref(0)
 const sidebarLinks = ref(null)
+const { capture } = useTelemetry()
 const showPageModal = ref(false)
 const isModerator = ref(false)
 const isInstructor = ref(false)
diff --git a/frontend/src/components/UpcomingEvaluations.vue b/frontend/src/components/UpcomingEvaluations.vue
index 6bb0e8ec..dc93519d 100644
--- a/frontend/src/components/UpcomingEvaluations.vue
+++ b/frontend/src/components/UpcomingEvaluations.vue
@@ -190,7 +190,7 @@ const evaluationCourses = computed(() => {
 
 const canScheduleEvals = computed(() => {
 	return (
-		upcoming_evals.data?.length != evaluationCourses.length &&
+		upcoming_evals.data?.length != evaluationCourses.value?.length &&
 		!props.forHome &&
 		!endDateHasPassed.value
 	)
diff --git a/frontend/src/main.js b/frontend/src/main.js
index c2968afa..00873dc2 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -9,6 +9,7 @@ import translationPlugin from './translation'
 import { usersStore } from './stores/user'
 import { initSocket } from './socket'
 import { FrappeUI, setConfig, frappeRequest, pageMetaPlugin } from 'frappe-ui'
+import { telemetryPlugin } from 'frappe-ui/frappe'
 
 let pinia = createPinia()
 let app = createApp(App)
@@ -18,6 +19,7 @@ app.use(FrappeUI)
 app.use(pinia)
 app.use(router)
 app.use(translationPlugin)
+app.use(telemetryPlugin, { app_name: 'lms' })
 app.use(pageMetaPlugin)
 app.provide('$dayjs', dayjs)
 app.provide('$socket', initSocket())
diff --git a/frontend/src/pages/BatchForm.vue b/frontend/src/pages/BatchForm.vue
index e88b1aa6..a90223ca 100644
--- a/frontend/src/pages/BatchForm.vue
+++ b/frontend/src/pages/BatchForm.vue
@@ -281,22 +281,13 @@ import {
 import {
 	Breadcrumbs,
 	FormControl,
-	FileUploader,
 	Button,
 	TextEditor,
 	createResource,
 	usePageMeta,
 	toast,
 	call,
-	Toast,
 } from 'frappe-ui'
-import { useRouter } from 'vue-router'
-import { Image, Trash2 } from 'lucide-vue-next'
-import { capture } from '@/telemetry'
-import { useOnboarding } from 'frappe-ui/frappe'
-import { sessionStore } from '../stores/session'
-import MultiSelect from '@/components/Controls/MultiSelect.vue'
-import Link from '@/components/Controls/Link.vue'
 import {
 	escapeHTML,
 	getMetaInfo,
@@ -304,7 +295,13 @@ import {
 	sanitizeHTML,
 	updateMetaInfo,
 } from '@/utils'
+import { useRouter } from 'vue-router'
+import { Trash2 } from 'lucide-vue-next'
+import { useOnboarding, useTelemetry } from 'frappe-ui/frappe'
+import { sessionStore } from '../stores/session'
 import Uploader from '@/components/Controls/Uploader.vue'
+import MultiSelect from '@/components/Controls/MultiSelect.vue'
+import Link from '@/components/Controls/Link.vue'
 
 const router = useRouter()
 const user = inject('$user')
@@ -312,6 +309,7 @@ const { brand } = sessionStore()
 const { updateOnboardingStep } = useOnboarding('learning')
 const instructors = ref([])
 const app = getCurrentInstance()
+const { capture } = useTelemetry()
 const { $dialog } = app.appContext.config.globalProperties
 
 const props = defineProps({
diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue
index c471bc48..b9821622 100644
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -130,7 +130,6 @@
 import {
 	Breadcrumbs,
 	Button,
-	call,
 	createListResource,
 	Dropdown,
 	FormControl,
@@ -185,24 +184,27 @@ const batches = createListResource({
 	cache: ['batches', user.data?.name],
 	pageLength: pageLength.value,
 	start: start.value,
-	onSuccess(data) {
-		let allCategories = data.map((batch) => batch.category)
-		allCategories = allCategories.filter(
-			(category, index) => allCategories.indexOf(category) === index && category
-		)
-		if (categories.value.length <= allCategories.length) {
-			updateCategories(data)
-		}
-	},
 })
 
+const setCategories = (data) => {
+	let allCategories = data.map((batch) => batch.category)
+	allCategories = allCategories.filter(
+		(category, index) => allCategories.indexOf(category) === index && category
+	)
+	if (categories.value.length <= allCategories.length) {
+		updateCategories(data)
+	}
+}
+
 const updateBatches = () => {
 	updateFilters()
 	batches.update({
 		filters: filters.value,
 		orderBy: orderBy.value,
 	})
-	batches.reload()
+	batches.reload().then((data) => {
+		setCategories(data)
+	})
 }
 
 const updateFilters = () => {
diff --git a/frontend/src/pages/Billing.vue b/frontend/src/pages/Billing.vue
index 81ed9a5e..00a98a94 100644
--- a/frontend/src/pages/Billing.vue
+++ b/frontend/src/pages/Billing.vue
@@ -234,10 +234,12 @@ import { sessionStore } from '../stores/session'
 import Link from '@/components/Controls/Link.vue'
 import NotPermitted from '@/components/NotPermitted.vue'
 import { X } from 'lucide-vue-next'
+import { useTelemetry } from 'frappe-ui/frappe'
 
 const user = inject('$user')
 const { brand } = sessionStore()
 const showConsentWarning = ref(false)
+const { capture } = useTelemetry()
 
 onMounted(() => {
 	const script = document.createElement('script')
@@ -339,6 +341,7 @@ const generatePaymentLink = () => {
 				return validateAddress()
 			},
 			onSuccess(data) {
+				capture('checkout_initiated', { type: props.type })
 				window.location.href = data
 			},
 			onError(err) {
diff --git a/frontend/src/pages/CertifiedParticipants.vue b/frontend/src/pages/CertifiedParticipants.vue
index e18ed1dc..ddef59ae 100644
--- a/frontend/src/pages/CertifiedParticipants.vue
+++ b/frontend/src/pages/CertifiedParticipants.vue
@@ -3,7 +3,7 @@
 		class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
-		<router-link :to="{ name: 'Batches', query: { certification: true } }">
+		<router-link :to="{ name: 'Courses', query: { certification: true } }">
 			<Button>
 				<template #prefix>
 					<GraduationCap class="h-4 w-4 stroke-1.5" />
diff --git a/frontend/src/pages/CourseForm.vue b/frontend/src/pages/CourseForm.vue
index 5a412e1c..65a91ec4 100644
--- a/frontend/src/pages/CourseForm.vue
+++ b/frontend/src/pages/CourseForm.vue
@@ -75,58 +75,11 @@
 							</div>
 						</div>
 						<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
-							<div class="mb-4">
-								<div class="text-xs text-ink-gray-5 mb-2">
-									{{ __('Course Image') }}
-								</div>
-								<FileUploader
-									v-if="!course.course_image"
-									:fileTypes="['image/*']"
-									:validateFile="validateFile"
-									@success="(file) => saveImage(file)"
-								>
-									<template
-										v-slot="{ file, progress, uploading, openFileSelector }"
-									>
-										<div class="flex items-center">
-											<div
-												class="border rounded-md w-fit py-5 px-20 cursor-pointer"
-												@click="openFileSelector"
-											>
-												<Image class="size-5 stroke-1 text-ink-gray-7" />
-											</div>
-											<div class="ml-4">
-												<Button @click="openFileSelector">
-													{{ __('Upload') }}
-												</Button>
-												<div class="mt-1 text-ink-gray-5 text-sm leading-5">
-													{{
-														__('Appears on the course card in the course list')
-													}}
-												</div>
-											</div>
-										</div>
-									</template>
-								</FileUploader>
-								<div v-else class="mb-4">
-									<div class="flex items-center">
-										<img
-											:src="course.course_image.file_url"
-											class="border rounded-md w-40"
-										/>
-										<div class="ml-4">
-											<Button @click="removeImage()">
-												{{ __('Remove') }}
-											</Button>
-											<div class="mt-2 text-ink-gray-5 text-sm">
-												{{
-													__('Appears on the course card in the course list')
-												}}
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
+							<Uploader
+								v-model="course.image"
+								:label="__('Course Image')"
+								:required="false"
+							/>
 
 							<ColorSwatches
 								v-model="course.card_gradient"
@@ -333,7 +286,6 @@ import {
 	Button,
 	createResource,
 	FormControl,
-	FileUploader,
 	usePageMeta,
 	toast,
 } from 'frappe-ui'
@@ -347,23 +299,22 @@ import {
 	watch,
 	getCurrentInstance,
 } from 'vue'
-import { Image, Trash2, X } from 'lucide-vue-next'
-import { useRouter } from 'vue-router'
-import { capture, startRecording, stopRecording } from '@/telemetry'
-import { useOnboarding } from 'frappe-ui/frappe'
-import { sessionStore } from '../stores/session'
 import {
 	escapeHTML,
 	getMetaInfo,
 	openSettings,
 	sanitizeHTML,
 	updateMetaInfo,
-	validateFile,
 } from '@/utils'
+import { Trash2, X } from 'lucide-vue-next'
+import { useRouter } from 'vue-router'
+import { useOnboarding, useTelemetry } from 'frappe-ui/frappe'
+import { sessionStore } from '../stores/session'
 import Link from '@/components/Controls/Link.vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
 import ColorSwatches from '@/components/Controls/ColorSwatches.vue'
+import Uploader from '@/components/Controls/Uploader.vue'
 
 const user = inject('$user')
 const newTag = ref('')
@@ -372,6 +323,7 @@ const router = useRouter()
 const instructors = ref([])
 const related_courses = ref([])
 const app = getCurrentInstance()
+const { capture } = useTelemetry()
 const { updateOnboardingStep } = useOnboarding('learning')
 const { $dialog } = app.appContext.config.globalProperties
 
@@ -386,7 +338,7 @@ const course = reactive({
 	short_introduction: '',
 	description: '',
 	video_link: '',
-	course_image: null,
+	image: null,
 	card_gradient: '',
 	tags: '',
 	category: '',
@@ -418,7 +370,6 @@ onMounted(() => {
 		fetchCourseInfo()
 	} else {
 		capture('course_form_opened')
-		startRecording()
 	}
 	window.addEventListener('keydown', keyboardShortcut)
 })
@@ -441,7 +392,6 @@ const keyboardShortcut = (e) => {
 
 onBeforeUnmount(() => {
 	window.removeEventListener('keydown', keyboardShortcut)
-	stopRecording()
 })
 
 const courseCreationResource = createResource({
@@ -450,7 +400,7 @@ const courseCreationResource = createResource({
 		return {
 			doc: {
 				doctype: 'LMS Course',
-				image: course.course_image?.file_url || '',
+				image: course.image,
 				instructors: instructors.value.map((instructor) => ({
 					instructor: instructor,
 				})),
@@ -471,7 +421,7 @@ const courseEditResource = createResource({
 			doctype: 'LMS Course',
 			name: values.course,
 			fieldname: {
-				image: course.course_image?.file_url || '',
+				image: course.image,
 				instructors: instructors.value.map((instructor) => ({
 					instructor: instructor,
 				})),
@@ -521,24 +471,10 @@ const courseResource = createResource({
 			course[key] = course[key] ? true : false
 		}
 
-		if (data.image) imageResource.reload({ image: data.image })
 		check_permission()
 	},
 })
 
-const imageResource = createResource({
-	url: 'lms.lms.api.get_file_info',
-	makeParams(values) {
-		return {
-			file_url: values.image,
-		}
-	},
-	auto: false,
-	onSuccess(data) {
-		course.course_image = data
-	},
-})
-
 const validateFields = () => {
 	course.description = sanitizeHTML(course.description)
 
@@ -655,14 +591,6 @@ const removeTag = (tag) => {
 	newTag.value = ''
 }
 
-const saveImage = (file) => {
-	course.course_image = file
-}
-
-const removeImage = () => {
-	course.course_image = null
-}
-
 const check_permission = () => {
 	let user_is_instructor = false
 	if (user.data?.is_moderator) return
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index 06b7d765..48fc9200 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -168,9 +168,6 @@ const courses = createListResource({
 	cache: ['courses', user.data?.name],
 	pageLength: pageLength.value,
 	start: start.value,
-	onSuccess(data) {
-		setCategories(data)
-	},
 })
 
 const setCategories = (data) => {
@@ -205,7 +202,7 @@ const identifyUserPersona = async () => {
 
 const getCourseCount = () => {
 	if (!user.data) return
-
+	if (!user.data.is_moderator) return
 	call('frappe.client.get_count', {
 		doctype: 'LMS Course',
 	}).then((data) => {
@@ -219,7 +216,9 @@ const updateCourses = () => {
 	courses.update({
 		filters: filters.value,
 	})
-	courses.reload()
+	courses.reload().then((data) => {
+		setCategories(data)
+	})
 }
 
 const updateFilters = () => {
diff --git a/frontend/src/pages/JobForm.vue b/frontend/src/pages/JobForm.vue
index c81d5c62..1fb6b861 100644
--- a/frontend/src/pages/JobForm.vue
+++ b/frontend/src/pages/JobForm.vue
@@ -83,47 +83,11 @@
 							class="mb-4"
 							:required="true"
 						/>
-						<label class="block text-ink-gray-5 text-xs mb-1 mt-4">
-							{{ __('Company Logo') }}
-							<span class="text-ink-red-3">*</span>
-						</label>
-						<FileUploader
-							v-if="!job.image"
-							:fileTypes="['image/*']"
-							:validateFile="validateFile"
-							@success="(file) => saveImage(file)"
-						>
-							<template
-								v-slot="{ file, progress, uploading, openFileSelector }"
-							>
-								<div class="mb-4">
-									<Button @click="openFileSelector" :loading="uploading">
-										{{
-											uploading ? `Uploading ${progress}%` : 'Upload an image'
-										}}
-									</Button>
-								</div>
-							</template>
-						</FileUploader>
-						<div v-else class="">
-							<div class="flex items-center">
-								<div class="border rounded-md p-2 mr-2">
-									<FileText class="h-5 w-5 stroke-1.5 text-ink-gray-7" />
-								</div>
-								<div class="flex flex-col">
-									<span>
-										{{ job.image.file_name }}
-									</span>
-									<span class="text-sm text-ink-gray-4 mt-1">
-										{{ getFileSize(job.image.file_size) }}
-									</span>
-								</div>
-								<X
-									@click="removeImage()"
-									class="bg-surface-gray-3 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
-								/>
-							</div>
-						</div>
+						<Uploader
+							v-model="job.company_logo"
+							:label="__('Company Logo')"
+							:required="true"
+						/>
 					</div>
 				</div>
 			</div>
@@ -150,15 +114,14 @@ import {
 	createResource,
 	Button,
 	TextEditor,
-	FileUploader,
 	usePageMeta,
 	toast,
 } from 'frappe-ui'
 import { computed, onMounted, reactive, inject } from 'vue'
-import { FileText, X } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
 import { useRouter } from 'vue-router'
-import { escapeHTML, getFileSize, sanitizeHTML, validateFile } from '@/utils'
+import { escapeHTML, sanitizeHTML } from '@/utils'
+import Uploader from '@/components/Controls/Uploader.vue'
 
 const user = inject('$user')
 const router = useRouter()
@@ -177,7 +140,7 @@ const newJob = createResource({
 		return {
 			doc: {
 				doctype: 'Job Opportunity',
-				company_logo: job.image?.file_url,
+				company_logo: job.company_logo,
 				...job,
 			},
 		}
@@ -191,7 +154,7 @@ const updateJob = createResource({
 			doctype: 'Job Opportunity',
 			name: props.jobName,
 			fieldname: {
-				company_logo: job.image.file_url,
+				company_logo: job.company_logo,
 				...job,
 			},
 		}
@@ -215,20 +178,6 @@ const jobDetail = createResource({
 		Object.keys(data).forEach((key) => {
 			if (Object.hasOwn(job, key)) job[key] = data[key]
 		})
-		if (data.company_logo) imageResource.reload({ image: data.company_logo })
-	},
-})
-
-const imageResource = createResource({
-	url: 'lms.lms.api.get_file_info',
-	makeParams(values) {
-		return {
-			file_url: values.image,
-		}
-	},
-	auto: false,
-	onSuccess(data) {
-		job.image = data
 	},
 })
 
@@ -241,7 +190,7 @@ const job = reactive({
 	status: 'Open',
 	company_name: '',
 	company_website: '',
-	image: null,
+	company_logo: null,
 	description: '',
 	company_email_address: '',
 })
@@ -322,14 +271,6 @@ const validateJobFields = () => {
 	})
 }
 
-const saveImage = (file) => {
-	job.image = file
-}
-
-const removeImage = () => {
-	job.image = null
-}
-
 const jobTypes = computed(() => {
 	return [
 		{ label: 'Full Time', value: 'Full Time' },
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index 940fea45..41aaa5eb 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -99,14 +99,14 @@ import EditorJS from '@editorjs/editorjs'
 import LessonHelp from '@/components/LessonHelp.vue'
 import { ChevronRight } from 'lucide-vue-next'
 import { getEditorTools, enablePlyr } from '@/utils'
-import { capture, startRecording, stopRecording } from '@/telemetry'
-import { useOnboarding } from 'frappe-ui/frappe'
+import { useOnboarding, useTelemetry } from 'frappe-ui/frappe'
 
 const { brand } = sessionStore()
 const editor = ref(null)
 const instructorEditor = ref(null)
 const user = inject('$user')
 const openInstructorEditor = ref(false)
+const { capture } = useTelemetry()
 const { updateOnboardingStep } = useOnboarding('learning')
 let autoSaveInterval
 let showSuccessMessage = false
@@ -131,7 +131,6 @@ onMounted(() => {
 		window.location.href = '/login'
 	}
 	capture('lesson_form_opened')
-	startRecording()
 	editor.value = renderEditor('content')
 	instructorEditor.value = renderEditor('instructor-notes')
 	window.addEventListener('keydown', keyboardShortcut)
@@ -226,7 +225,6 @@ const keyboardShortcut = (e) => {
 onBeforeUnmount(() => {
 	clearInterval(autoSaveInterval)
 	window.removeEventListener('keydown', keyboardShortcut)
-	stopRecording()
 })
 
 const newLessonResource = createResource({
diff --git a/frontend/src/pages/Notifications.vue b/frontend/src/pages/Notifications.vue
index 8e9afeb4..238df516 100644
--- a/frontend/src/pages/Notifications.vue
+++ b/frontend/src/pages/Notifications.vue
@@ -26,7 +26,7 @@
 			class="flex space-x-2 px-2 py-4"
 			:class="{
 				'cursor-pointer': log.link,
-				'items-center': !showDetails(log) && !isMention(log),
+				'items-center': !showDetails(log) && !isMentionOrComment(log),
 			}"
 			@click="navigateToPage(log)"
 		>
@@ -56,9 +56,9 @@
 					</div>
 				</div>
 				<div
-					v-if="isMention(log)"
+					v-if="isMentionOrComment(log)"
 					v-html="log.email_content"
-					class="bg-surface-gray-2 rounded-md px-3 py-2"
+					class="bg-surface-gray-2 rounded-md px-3 py-2 line-clamp-3 overflow-hidden"
 				></div>
 				<div
 					v-else-if="showDetails(log)"
@@ -260,7 +260,7 @@ const navigateToPage = (log) => {
 	}
 }
 
-const isMention = (log) => {
+const isMentionOrComment = (log) => {
 	if (log.type == 'Mention') {
 		return true
 	}
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
index 817fdc4a..2248ca47 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue
@@ -1,12 +1,17 @@
 <template>
-	<Dialog v-model="show" :options="{ size: '5xl' }">
+	<Dialog v-model="show" :options="{ size: '4xl' }">
 		<template #body-title>
-			<div class="text-xl font-semibold text-ink-gray-9">
-				{{
-					props.exerciseID === 'new'
-						? __('Create Programming Exercise')
-						: __('Edit Programming Exercise')
-				}}
+			<div class="flex items-center space-x-2">
+				<div class="text-xl font-semibold text-ink-gray-9">
+					{{
+						props.exerciseID === 'new'
+							? __('Create Programming Exercise')
+							: __('Edit Programming Exercise')
+					}}
+				</div>
+				<Badge v-if="isDirty" theme="orange">
+					{{ __('Not Saved') }}
+				</Badge>
 			</div>
 		</template>
 		<template #body-content>
@@ -59,7 +64,6 @@
 					@click="deleteExercise(close)"
 					variant="outline"
 					theme="red"
-					class="invisible group-hover:visible"
 				>
 					<template #prefix>
 						<Trash2 class="size-4 stroke-1.5" />
@@ -108,6 +112,7 @@
 import { computed, ref, watch } from 'vue'
 import { escapeHTML } from '@/utils'
 import {
+	Badge,
 	Button,
 	createListResource,
 	Dialog,
@@ -125,6 +130,8 @@ import ChildTable from '@/components/Controls/ChildTable.vue'
 
 const show = defineModel()
 const exercises = defineModel<ProgrammingExercises>('exercises')
+const isDirty = ref(false)
+const originalTestCaseCount = ref(0)
 
 const exercise = ref<ProgrammingExercise>({
 	title: '',
@@ -172,6 +179,7 @@ const setExerciseData = () => {
 			test_cases: [],
 		}
 	}
+	isDirty.value = false
 }
 
 const testCases = createListResource({
@@ -180,6 +188,14 @@ const testCases = createListResource({
 	cache: ['testCases', props.exerciseID],
 	parent: 'LMS Programming Exercise',
 	orderBy: 'idx',
+	onSuccess(data: TestCase[]) {
+		isDirty.value = false
+		originalTestCaseCount.value = data.length
+	},
+	onError(err: any) {
+		toast.error(__(err.messages?.[0] || err))
+		console.error('Error loading testCases:', err)
+	},
 })
 
 const fetchTestCases = () => {
@@ -191,13 +207,28 @@ const fetchTestCases = () => {
 		},
 	})
 	testCases.reload()
+	originalTestCaseCount.value = testCases.data.length
 }
 
 const validateTitle = () => {
 	exercise.value.title = escapeHTML(exercise.value.title.trim())
 }
 
-const saveExercise = (close: () => void) => {
+watch(
+	exercise,
+	() => {
+		isDirty.value = true
+	},
+	{ deep: true }
+)
+
+watch(testCases, () => {
+	if (testCases.data.length !== originalTestCaseCount.value) {
+		isDirty.value = true
+	}
+})
+
+const updateTestCasesInExercise = () => {
 	exercise.value.test_cases = testCases.data.map(
 		(tc: TestCase, index: number) => ({
 			input: tc.input,
@@ -205,7 +236,11 @@ const saveExercise = (close: () => void) => {
 			idx: index + 1,
 		})
 	)
+}
+
+const saveExercise = (close: () => void) => {
 	validateTitle()
+	updateTestCasesInExercise()
 	if (props.exerciseID == 'new') createNewExercise(close)
 	else updateExercise(close)
 }
@@ -218,6 +253,7 @@ const createNewExercise = (close: () => void) => {
 		{
 			onSuccess() {
 				close()
+				isDirty.value = false
 				exercises.value?.reload()
 				toast.success(__('Programming Exercise created successfully'))
 			},
@@ -237,6 +273,7 @@ const updateExercise = (close: () => void) => {
 		{
 			onSuccess() {
 				close()
+				isDirty.value = false
 				exercises.value?.reload()
 				toast.success(__('Programming Exercise updated successfully'))
 			},
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
index 393712c3..c3a3bc9b 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
@@ -6,27 +6,26 @@
 	</header>
 	<div class="p-6">
 		<div class="flex items-center justify-between space-x-32 mb-5">
-			<div class="text-xl font-semibold text-ink-gray-7">
+			<div class="text-lg font-semibold text-ink-gray-9">
 				{{
 					submissions.data?.length
 						? __('{0} Submissions').format(submissions.data.length)
 						: __('No Submissions')
 				}}
 			</div>
-			<div
-				v-if="submissions.data?.length"
-				class="grid grid-cols-3 gap-5 flex-1"
-			>
+			<div v-if="submissions.data?.length" class="grid grid-cols-3 gap-5">
 				<Link
 					doctype="LMS Programming Exercise"
 					v-model="filters.exercise"
 					:placeholder="__('Filter by Exercise')"
+					class="w-40"
 				/>
 				<Link
 					doctype="User"
 					v-model="filters.member"
 					:placeholder="__('Filter by Member')"
 					:readonly="isStudent"
+					class="w-40"
 				/>
 				<FormControl
 					v-model="filters.status"
@@ -37,6 +36,7 @@
 						{ label: __('Failed'), value: 'Failed' },
 					]"
 					:placeholder="__('Filter by Status')"
+					class="w-40"
 				/>
 			</div>
 		</div>
@@ -47,6 +47,7 @@
 			rowKey="name"
 			:options="{
 				selectable: true,
+				showTooltip: false,
 			}"
 		>
 			<ListHeader
@@ -73,7 +74,7 @@
 						},
 					}"
 				>
-					<ListRow :row="row">
+					<ListRow :row="row" class="hover:bg-surface-gray-1">
 						<template #default="{ column, item }">
 							<ListRowItem :item="row[column.key]" :align="column.align">
 								<template #prefix>
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
index ceb358b2..e6908f80 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
@@ -33,50 +33,80 @@
 			</Button>
 		</div>
 	</header>
-	<div class="md:w-4/5 md:mx-auto p-5">
+	<div class="p-5">
 		<div class="flex items-center justify-between mb-5">
-			<div v-if="exerciseCount" class="text-lg font-semibold text-ink-gray-9">
+			<div class="text-lg font-semibold text-ink-gray-9">
 				{{ __('{0} Exercises').format(exerciseCount) }}
 			</div>
-			<div
-				v-if="exercises.data?.length || exerciseCount > 0"
-				class="grid grid-cols-2 gap-5"
-			>
-				<!-- <FormControl
-                    v-model="titleFilter"
-                    :placeholder="__('Search by title')"
-                />
-                <FormControl
-                    v-model="typeFilter"
-                    type="select"
-                    :options="assignmentTypes"
-                    :placeholder="__('Type')"
-                /> -->
+			<div class="grid grid-cols-2 gap-5">
+				<FormControl
+					v-model="titleFilter"
+					:placeholder="__('Search by Title')"
+					@input="updateList"
+				/>
+				<FormControl
+					v-model="languageFilter"
+					type="select"
+					:options="languages"
+					:placeholder="__('Type')"
+					@update:modelValue="updateList"
+				/>
 			</div>
 		</div>
 
-		<div
-			v-if="exercises.data?.length"
-			class="grid grid-cols-1 md:grid-cols-3 gap-4"
-		>
-			<div
-				v-for="exercise in exercises.data"
-				:key="exercise.name"
-				@click="
-					() => {
-						exerciseID = exercise.name
+		<div v-if="exercises.data?.length">
+			<ListView
+				:columns="columns"
+				:rows="exercises.data"
+				row-key="name"
+				:options="{
+					showTooltip: false,
+					selectable: true,
+					onRowClick: (row: any) => {
+						if (readOnlyMode) return
+						exerciseID = row.name
 						showForm = true
-					}
-				"
-				class="flex flex-col border rounded-md p-3 h-full hover:border-outline-gray-3 space-y-2 cursor-pointer"
+					},
+				}"
 			>
-				<div class="text-lg font-semibold text-ink-gray-9">
-					{{ exercise.title }}
-				</div>
-				<div class="text-sm text-ink-gray-7">
-					{{ exercise.language }}
-				</div>
-			</div>
+				<ListHeader
+					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+				>
+				</ListHeader>
+				<ListRows>
+					<ListRow
+						:row="row"
+						v-for="row in exercises.data"
+						class="hover:bg-surface-gray-1"
+					>
+						<template #default="{ column, item }">
+							<ListRowItem :item="row[column.key]" :align="column.align">
+								<div
+									v-if="column.key == 'modified'"
+									class="text-sm text-ink-gray-5"
+								>
+									{{ dayjs(row[column.key]).format('MMM D, YYYY') }}
+								</div>
+								<div v-else>
+									{{ row[column.key] }}
+								</div>
+							</ListRowItem>
+						</template>
+					</ListRow>
+				</ListRows>
+				<ListSelectBanner>
+					<template #actions="{ unselectAll, selections }">
+						<div class="flex gap-2">
+							<Button
+								variant="ghost"
+								@click="showDeleteConfirmation(selections, unselectAll)"
+							>
+								<FeatherIcon name="trash-2" class="h-4 w-4 stroke-1.5" />
+							</Button>
+						</div>
+					</template>
+				</ListSelectBanner>
+			</ListView>
 		</div>
 		<EmptyState v-else type="Programming Exercises" />
 		<div
@@ -95,12 +125,22 @@
 	/>
 </template>
 <script setup lang="ts">
-import { computed, inject, onMounted, ref } from 'vue'
+import { computed, getCurrentInstance, inject, onMounted, ref } from 'vue'
 import {
 	Breadcrumbs,
 	Button,
 	call,
 	createListResource,
+	dayjs,
+	FormControl,
+	ListView,
+	ListHeader,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	FeatherIcon,
+	ListSelectBanner,
+	toast,
 	usePageMeta,
 } from 'frappe-ui'
 import { ClipboardList, Plus } from 'lucide-vue-next'
@@ -114,7 +154,11 @@ const { brand } = sessionStore()
 const showForm = ref<boolean>(false)
 const exerciseID = ref<string | null>('new')
 const user = inject<any>('$user')
+const titleFilter = ref<string>('')
+const languageFilter = ref<string>('')
 const router = useRouter()
+const app = getCurrentInstance()
+const { $dialog } = app?.appContext.config.globalProperties
 
 onMounted(() => {
 	validatePermissions()
@@ -133,9 +177,10 @@ const validatePermissions = () => {
 	}
 }
 
-const getExerciseCount = () => {
+const getExerciseCount = (filters: any = {}) => {
 	call('frappe.client.get_count', {
 		doctype: 'LMS Programming Exercise',
+		filters: filters,
 	})
 		.then((count: number) => {
 			exerciseCount.value = count
@@ -148,11 +193,98 @@ const getExerciseCount = () => {
 const exercises = createListResource({
 	doctype: 'LMS Programming Exercise',
 	cache: ['programmingExercises'],
-	fields: ['name', 'title', 'language', 'problem_statement'],
+	fields: ['name', 'title', 'language', 'problem_statement', 'modified'],
 	auto: true,
 	orderBy: 'modified desc',
 })
 
+const updateList = () => {
+	let filters = getFilters()
+	exercises.update({
+		filters: filters,
+	})
+	exercises.reload()
+	getExerciseCount(filters)
+}
+
+const getFilters = () => {
+	let filters: any = {}
+	if (titleFilter.value) {
+		filters['title'] = ['like', `%${titleFilter.value}%`]
+	}
+	if (languageFilter.value && languageFilter.value.trim() !== '') {
+		filters['language'] = languageFilter.value
+	}
+	return filters
+}
+
+const showDeleteConfirmation = (
+	selections: Set<string>,
+	unselectAll: () => void
+) => {
+	$dialog({
+		title: __('Confirm Your Action'),
+		message: __(
+			'Deleting these exercises will permanently remove them from the system, along with all associated submissions. This action is irreversible. Are you sure you want to proceed?'
+		),
+		actions: [
+			{
+				label: __('Delete'),
+				theme: 'red',
+				variant: 'solid',
+				onClick(close: () => void) {
+					deleteExercises(selections, unselectAll)
+					close()
+				},
+			},
+		],
+	})
+}
+
+const deleteExercises = (selections: Set<string>, unselectAll: () => void) => {
+	Array.from(selections).forEach(async (exerciseName) => {
+		call('lms.lms.api.delete_programming_exercise', {
+			exercise: exerciseName,
+		})
+			.then(() => {
+				toast.success(__('Exercise deleted successfully'))
+				updateList()
+			})
+			.catch((error: any) => {
+				toast.error(__(error.message || error))
+				console.error('Error deleting exercise:', error)
+			})
+	})
+	unselectAll()
+}
+
+const languages = [
+	{ label: ' ', value: ' ' },
+	{ label: 'Python', value: 'Python' },
+	{ label: 'JavaScript', value: 'JavaScript' },
+]
+
+const columns = computed(() => {
+	return [
+		{
+			label: __('Title'),
+			key: 'title',
+			width: 3,
+		},
+		{
+			label: __('Language'),
+			key: 'language',
+			width: 2,
+			align: 'left',
+		},
+		{
+			label: __('Updated On'),
+			key: 'modified',
+			width: 1,
+		},
+	]
+})
+
 usePageMeta(() => {
 	return {
 		title: __('Programming Exercises'),
diff --git a/frontend/src/pages/QuizForm.vue b/frontend/src/pages/QuizForm.vue
index d3e8cc7a..dc8d753f 100644
--- a/frontend/src/pages/QuizForm.vue
+++ b/frontend/src/pages/QuizForm.vue
@@ -258,9 +258,7 @@ onMounted(() => {
 	if (!user.data?.is_moderator && !user.data?.is_instructor) {
 		router.push({ name: 'Courses' })
 	}
-	if (props.quizID !== 'new') {
-		quizDetails.reload()
-	}
+	quizDetails.reload()
 	window.addEventListener('keydown', keyboardShortcut)
 })
 
@@ -403,7 +401,7 @@ const breadcrumbs = computed(() => {
 	]
 
 	crumbs.push({
-		label: props.quizID == 'new' ? __('New Quiz') : quizDetails.doc?.title,
+		label: quizDetails.doc?.title,
 		route: { name: 'QuizForm', params: { quizID: props.quizID } },
 	})
 	return crumbs
@@ -411,7 +409,7 @@ const breadcrumbs = computed(() => {
 
 usePageMeta(() => {
 	return {
-		title: props.quizID == 'new' ? __('New Quiz') : quizDetails.doc?.title,
+		title: quizDetails.doc?.title,
 		icon: brand.favicon,
 	}
 })
diff --git a/frontend/src/pages/Quizzes.vue b/frontend/src/pages/Quizzes.vue
index f01742ea..ca0a77fa 100644
--- a/frontend/src/pages/Quizzes.vue
+++ b/frontend/src/pages/Quizzes.vue
@@ -144,9 +144,11 @@ import { computed, inject, onMounted, ref, watch } from 'vue'
 import { Plus } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
 import { escapeHTML } from '@/utils'
+import { useTelemetry } from 'frappe-ui/frappe'
 import EmptyState from '@/components/EmptyState.vue'
 
 const { brand } = sessionStore()
+const { capture } = useTelemetry()
 const user = inject('$user')
 const dayjs = inject('$dayjs')
 const router = useRouter()
@@ -216,6 +218,7 @@ const insertQuiz = (close) => {
 				toast.success(__('Quiz created successfully'))
 				close()
 				title.value = ''
+				capture('quiz_created')
 				router.push({
 					name: 'QuizForm',
 					params: {
diff --git a/frontend/src/telemetry.ts b/frontend/src/telemetry.ts
deleted file mode 100644
index eb17613c..00000000
--- a/frontend/src/telemetry.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import '../../../frappe/frappe/public/js/lib/posthog.js'
-import { createResource } from 'frappe-ui'
-
-declare global {
-  interface Window {
-    posthog: any
-  }
-}
-
-type PosthogSettings = {
-  posthog_project_id: string
-  posthog_host: string
-  enable_telemetry: boolean
-  telemetry_site_age: number
-}
-
-interface CaptureOptions {
-  data: {
-    user: string
-    [key: string]: string | number | boolean | object
-  }
-}
-
-let posthog: typeof window.posthog = window.posthog
-
-// Posthog Settings
-let posthogSettings = createResource({
-  url: 'lms.lms.telemetry.get_posthog_settings',
-  cache: 'posthog_settings',
-  onSuccess: (ps: PosthogSettings) => initPosthog(ps),
-})
-
-let isTelemetryEnabled = () => {
-  if (!posthogSettings.data) return false
-
-  return (
-    posthogSettings.data.enable_telemetry &&
-    posthogSettings.data.posthog_project_id &&
-    posthogSettings.data.posthog_host
-  )
-}
-
-// Posthog Initialization
-function initPosthog(ps: PosthogSettings) {
-  if (!isTelemetryEnabled()) return
-
-  posthog.init(ps.posthog_project_id, {
-    api_host: ps.posthog_host,
-    person_profiles: 'identified_only',
-    autocapture: false,
-    capture_pageview: true,
-    capture_pageleave: true,
-    enable_heatmaps: false,
-    disable_session_recording: false,
-    loaded: (ph: typeof posthog) => {
-      window.posthog = ph
-      ph.identify(window.location.hostname)
-    },
-  })
-}
-
-// Posthog Functions
-function capture(
-  event: string,
-  options: CaptureOptions = { data: { user: '' } },
-) {
-  if (!isTelemetryEnabled()) return
-  window.posthog.capture(`lms_${event}`, options)
-}
-
-function startRecording() {
-}
-
-function stopRecording() {
-}
-
-// Posthog Plugin
-function posthogPlugin(app: any) {
-    app.config.globalProperties.posthog = posthog
-    if (!window.posthog?.length) posthogSettings.fetch()
-}
-
-export {
-  posthog,
-  posthogSettings,
-  posthogPlugin,
-  capture,
-  startRecording,
-  stopRecording,
-}
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 1954a630..ab1a7ea5 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -529,6 +529,13 @@ const getSidebarItems = () => {
 					condition: () => {
 						return isAdmin()
 					},
+					activeFor: [
+						'Quizzes',
+						'QuizForm',
+						'QuizPage',
+						'QuizSubmissionList',
+						'QuizSubmission',
+					],
 				},
 				{
 					label: 'Assignments',
@@ -537,6 +544,11 @@ const getSidebarItems = () => {
 					condition: () => {
 						return isAdmin()
 					},
+					activeFor: [
+						'Assignments',
+						'AssignmentSubmissionList',
+						'AssignmentSubmission',
+					],
 				},
 				{
 					label: 'Programming Exercises',
@@ -545,6 +557,11 @@ const getSidebarItems = () => {
 					condition: () => {
 						return isAdmin()
 					},
+					activeFor: [
+						'ProgrammingExercises',
+						'ProgrammingExerciseSubmissions',
+						'ProgrammingExerciseSubmission',
+					],
 				},
 			],
 		},
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index e0f7f20a..8fa1d634 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -21,5 +21,5 @@ export default {
 			},
 		},
 	},
-	plugins: [],
+	plugins: [require('@tailwindcss/line-clamp')],
 }
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 3dc3918b..c6f02e93 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2977,10 +2977,10 @@ fraction.js@^4.1.2:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-frappe-ui@^0.1.254:
-  version "0.1.254"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.254.tgz#a0edd00a8a87e1f15e01c4526089c82e32e8630d"
-  integrity sha512-qdf7h8S6mwwajQMC6p+M11qKB0gVtNKnPTphK2nzrG9M8vxND6t0/8D6LVMX/Tqv/gpQJg7FI7V2hi+p8bT0OQ==
+frappe-ui@^0.1.256:
+  version "0.1.256"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.256.tgz#c14756eda75ca01ada034559e8bd2f91bcfe6dff"
+  integrity sha512-zj8n6KXpMv/0h1NcaCsjFLP8QBnofDEBJgQa+xECU0/jbq4gSqNhFOkcx788qNL+vmBo9frywTeXwDpl7hUCZA==
   dependencies:
     "@floating-ui/vue" "^1.1.6"
     "@headlessui/vue" "^1.7.14"
diff --git a/lms/auth.py b/lms/auth.py
new file mode 100644
index 00000000..3e756fad
--- /dev/null
+++ b/lms/auth.py
@@ -0,0 +1,57 @@
+import frappe
+
+ALLOWED_PATHS = [
+	"/api/method/ping",
+	"/api/method/login",
+	"/api/method/logout",
+	"/api/method/frappe.core.doctype.communication.email.mark_email_as_seen",
+	"/api/method/frappe.realtime.get_user_info",
+	"/api/method/frappe.realtime.can_subscribe_doc",
+	"/api/method/frappe.realtime.can_subscribe_doctype",
+	"/api/method/frappe.realtime.has_permission",
+	"/api/method/frappe.integrations.oauth2.authorize",
+	"/api/method/frappe.integrations.oauth2.approve",
+	"/api/method/frappe.integrations.oauth2.get_token",
+	"/api/method/frappe.integrations.oauth2.openid_profile",
+	"/api/method/frappe.website.doctype.web_page_view.web_page_view.make_view_log",
+	"/api/method/upload_file",
+	"/api/method/frappe.search.web_search",
+	"/api/method/frappe.email.queue.unsubscribe",
+	"/api/method/frappe.website.doctype.web_form.web_form.accept",
+	"/api/method/frappe.core.doctype.user.user.test_password_strength",
+	"/api/method/frappe.core.doctype.user.user.update_password",
+	"/api/method/frappe.utils.telemetry.pulse.client.is_enabled",
+	"/api/method/frappe.client.get_value",
+	"/api/method/frappe.client.get_count",
+	"/api/method/frappe.client.get",
+	"/api/method/frappe.client.insert",
+	"/api/method/frappe.client.set_value",
+	"/api/method/frappe.client.delete",
+	"/api/method/frappe.client.get_list",
+	"/api/method/frappe.client.rename_doc",
+	"/api/method/frappe.onboarding.get_onboarding_status",
+	"/api/method/frappe.utils.print_format.download_pdf",
+	"/api/method/frappe.desk.search.search_link",
+	"/api/method/frappe.core.doctype.communication.email.make",
+]
+
+
+def authenticate():
+	if frappe.form_dict.cmd:
+		path = f"/api/method/{frappe.form_dict.cmd}"
+	else:
+		path = frappe.request.path
+
+	user_type = frappe.db.get_value("User", frappe.session.user, "user_type")
+	if user_type == "System User":
+		return
+
+	if not path.startswith("/api/"):
+		return
+	print("path", path)
+	if path.startswith("/lms") or path.startswith("/api/method/lms."):
+		return
+
+	if path in ALLOWED_PATHS:
+		return
+	frappe.throw(f"Access not allowed for this URL: {path}", frappe.PermissionError)
diff --git a/lms/hooks.py b/lms/hooks.py
index aeb2e4b2..9c3a815b 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -262,3 +262,4 @@ add_to_apps_screen = [
 ]
 
 sqlite_search = ["lms.sqlite.LearningSearch"]
+auth_hooks = ["lms.auth.authenticate"]
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 87127272..2f39c312 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -2043,3 +2043,9 @@ def get_upcoming_batches():
 		limit=4,
 		pluck="name",
 	)
+
+
+@frappe.whitelist()
+def delete_programming_exercise(exercise):
+	frappe.db.delete("LMS Programming Exercise Submission", {"exercise": exercise})
+	frappe.db.delete("LMS Programming Exercise", exercise)
diff --git a/lms/lms/doctype/course_evaluator/test_course_evaluator.py b/lms/lms/doctype/course_evaluator/test_course_evaluator.py
index 605bb553..6fd7bf05 100644
--- a/lms/lms/doctype/course_evaluator/test_course_evaluator.py
+++ b/lms/lms/doctype/course_evaluator/test_course_evaluator.py
@@ -5,7 +5,7 @@
 from frappe.tests import UnitTestCase
 from frappe.utils import add_days, format_time, getdate
 
-from lms.lms.doctype.course_evaluator.course_evaluator import get_schedule
+from lms.lms.doctype.course_evaluator.course_evaluator import get_schedule, get_schedule_range_end_date
 from lms.lms.test_utils import TestUtils
 
 
@@ -37,7 +37,7 @@ class TestCourseEvaluator(UnitTestCase):
 	def test_schedule_dates(self):
 		schedule = get_schedule(self.batch.courses[0].course, self.batch.name)
 		first_date = self.calculated_first_date_of_schedule()
-		last_date = self.calculated_last_date_of_schedule(first_date)
+		last_date = self.calculated_last_date_of_schedule()
 		self.assertEqual(getdate(schedule[0].get("date")), first_date)
 		self.assertEqual(getdate(schedule[-1].get("date")), last_date)
 
@@ -51,17 +51,10 @@ class TestCourseEvaluator(UnitTestCase):
 			first_date = add_days(today, offset_wednesday)
 		return first_date
 
-	def calculated_last_date_of_schedule(self, first_date):
-		last_day = add_days(getdate(), 56)
-		offset_monday = (0 - last_day.weekday() + 7) % 7  # 0 for Monday
-		offset_wednesday = (2 - last_day.weekday() + 7) % 7  # 2 for Wednesday
-
-		if offset_monday < offset_wednesday and offset_monday <= 4:
-			last_day = add_days(last_day, offset_monday)
-		elif offset_wednesday <= 4:
-			last_day = add_days(last_day, offset_wednesday)
-		else:
-			last_day = add_days(last_day, min(offset_monday, offset_wednesday) + 7)
+	def calculated_last_date_of_schedule(self):
+		last_day = getdate(get_schedule_range_end_date(getdate(), self.batch.name))
+		while last_day.weekday() not in (0, 2):
+			last_day = add_days(last_day, -1)
 
 		return last_day
 
diff --git a/lms/lms/doctype/lms_certificate/lms_certificate.py b/lms/lms/doctype/lms_certificate/lms_certificate.py
index 75c64e6f..ec9f5231 100644
--- a/lms/lms/doctype/lms_certificate/lms_certificate.py
+++ b/lms/lms/doctype/lms_certificate/lms_certificate.py
@@ -7,6 +7,7 @@ from frappe.email.doctype.email_template.email_template import get_email_templat
 from frappe.model.document import Document
 from frappe.model.naming import make_autoname
 from frappe.utils import nowdate
+from frappe.utils.telemetry import capture
 
 
 class LMSCertificate(Document):
@@ -17,6 +18,10 @@ class LMSCertificate(Document):
 		self.name = make_autoname("hash", self.doctype)
 
 	def after_insert(self):
+		self.send_certification_email()
+		capture("certificate_issued", "lms")
+
+	def send_certification_email(self):
 		outgoing_email_account = frappe.get_cached_value(
 			"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
 		)
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.py b/lms/lms/doctype/lms_quiz/lms_quiz.py
index f9cccd68..32fb0c8f 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.py
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.py
@@ -33,6 +33,9 @@ class LMSQuiz(Document):
 			frappe.throw(_("Rows {0} have the duplicate questions.").format(frappe.bold(comma_and(rows))))
 
 	def validate_limit(self):
+		if not self.shuffle_questions and self.limit_questions_to:
+			self.limit_questions_to = 0
+
 		if self.limit_questions_to and cint(self.limit_questions_to) >= len(self.questions):
 			frappe.throw(_("Limit cannot be greater than or equal to the number of questions in the quiz."))
 
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 9bad9eee..88bc96d0 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -24,6 +24,8 @@ from frappe.utils import (
 	pretty_date,
 	rounded,
 )
+from pypika import Case
+from pypika import functions as fn
 
 from lms.lms.md import find_macros
 
@@ -419,7 +421,7 @@ def get_batch_details_for_notification(topic):
 	users = []
 	batch_title = frappe.db.get_value("LMS Batch", topic.reference_docname, "title")
 	subject = _("New comment in batch {0}").format(batch_title)
-	link = f"/lms/batches/{topic.reference_docname}"
+	link = f"/lms/batches/{topic.reference_docname}#discussions"
 	instructors = frappe.db.get_all(
 		"Course Instructor",
 		{"parenttype": "LMS Batch", "parent": topic.reference_docname},
@@ -588,32 +590,24 @@ def get_chart_date_range(from_date, to_date):
 
 def get_chart_filters(doctype, chart, datefield, from_date, to_date):
 	version = get_frappe_version()
-	if version.startswith("16."):
-		filters = [([chart.document_type, "docstatus", "<", 2])]
-		filters = filters + json.loads(chart.filters_json)
-		filters.append([doctype, datefield, ">=", from_date])
-		filters.append([doctype, datefield, "<=", to_date])
-	else:
+	if version.startswith("15.") or version.startswith("14."):
 		filters = [([chart.document_type, "docstatus", "<", 2, False])]
 		filters = filters + json.loads(chart.filters_json)
 		filters.append([doctype, datefield, ">=", from_date, False])
 		filters.append([doctype, datefield, "<=", to_date, False])
+	else:
+		filters = [([chart.document_type, "docstatus", "<", 2])]
+		filters = filters + json.loads(chart.filters_json)
+		filters.append([doctype, datefield, ">=", from_date])
+		filters.append([doctype, datefield, "<=", to_date])
+
 	return filters
 
 
 def get_chart_details(doctype, datefield, value_field, chart, from_date, to_date):
 	filters = get_chart_filters(doctype, chart, datefield, from_date, to_date)
 	version = get_frappe_version()
-	if version.startswith("16."):
-		return frappe.db.get_all(
-			doctype,
-			fields=[datefield, {"SUM": value_field}, {"COUNT": "*"}],
-			filters=filters,
-			group_by=datefield,
-			order_by=datefield,
-			as_list=True,
-		)
-	else:
+	if version.startswith("15.") or version.startswith("14."):
 		return frappe.db.get_all(
 			doctype,
 			fields=[f"{datefield} as _unit", f"SUM({value_field})", "COUNT(*)"],
@@ -622,6 +616,15 @@ def get_chart_details(doctype, datefield, value_field, chart, from_date, to_date
 			order_by="_unit asc",
 			as_list=True,
 		)
+	else:
+		return frappe.db.get_all(
+			doctype,
+			fields=[datefield, {"SUM": value_field}, {"COUNT": "*"}],
+			filters=filters,
+			group_by=datefield,
+			order_by=datefield,
+			as_list=True,
+		)
 
 
 @frappe.whitelist(allow_guest=True)
@@ -1354,20 +1357,129 @@ def get_exercise_details(assessment, member):
 
 
 @frappe.whitelist()
-def get_batch_students(batch):
+def get_batch_assessment_count(batch):
+	if not frappe.db.exists("LMS Batch", batch):
+		frappe.throw(_("The specified batch does not exist."))
+	return frappe.db.count("LMS Assessment", {"parent": batch})
+
+
+@frappe.whitelist()
+def get_batch_students(filters, offset=0, limit_start=0, limit_page_length=None, limit=None):
+	# limit_start and limit_page_length are used for backward compatibility
+	start = limit_start or offset
+	page_length = limit_page_length or limit
+
+	batch = filters.get("batch")
+	if not batch:
+		return []
+
 	students = []
 	students_list = frappe.get_all(
-		"LMS Batch Enrollment", filters={"batch": batch}, fields=["member", "name"]
+		"LMS Batch Enrollment",
+		filters={"batch": batch},
+		fields=["member", "name"],
+		offset=start,
+		limit=page_length,
+		order_by="creation desc",
 	)
 
 	for student in students_list:
 		details = get_batch_student_details(student)
 		calculate_student_progress(batch, details)
 		students.append(details)
-		students = sorted(students, key=lambda x: x.progress, reverse=True)
+
 	return students
 
 
+def get_course_completion_stats(batch):
+	"""Get completion counts per course in batch"""
+	BatchCourse = frappe.qb.DocType("Batch Course")
+	BatchEnrollment = frappe.qb.DocType("LMS Batch Enrollment")
+	Enrollment = frappe.qb.DocType("LMS Enrollment")
+
+	rows = (
+		frappe.qb.from_(BatchCourse)
+		.left_join(BatchEnrollment)
+		.on(BatchEnrollment.batch == BatchCourse.parent)
+		.left_join(Enrollment)
+		.on((Enrollment.course == BatchCourse.course) & (Enrollment.member == BatchEnrollment.member))
+		.where(BatchCourse.parent == batch)
+		.groupby(BatchCourse.course, BatchCourse.title)
+		.select(
+			BatchCourse.title,
+			fn.Count(Case().when(Enrollment.progress == 100, Enrollment.member)).distinct().as_("completed"),
+		)
+	).run(as_dict=True)
+
+	return [{"task": row.title, "value": row.completed or 0} for row in rows]
+
+
+def get_assignment_pass_stats(batch):
+	"""Get pass counts per assignment in batch"""
+	Assessment = frappe.qb.DocType("LMS Assessment")
+	Assignment = frappe.qb.DocType("LMS Assignment")
+	BatchEnrollment = frappe.qb.DocType("LMS Batch Enrollment")
+	Submission = frappe.qb.DocType("LMS Assignment Submission")
+
+	rows = (
+		frappe.qb.from_(Assessment)
+		.join(Assignment)
+		.on(Assignment.name == Assessment.assessment_name)
+		.left_join(BatchEnrollment)
+		.on(BatchEnrollment.batch == Assessment.parent)
+		.left_join(Submission)
+		.on(
+			(Submission.assignment == Assessment.assessment_name)
+			& (Submission.member == BatchEnrollment.member)
+		)
+		.where((Assessment.parent == batch) & (Assessment.assessment_type == "LMS Assignment"))
+		.groupby(Assessment.assessment_name, Assignment.title)
+		.select(
+			Assignment.title,
+			fn.Count(Case().when(Submission.status == "Pass", Submission.member)).distinct().as_("passed"),
+		)
+	).run(as_dict=True)
+
+	return [{"task": row.title, "value": row.passed or 0} for row in rows]
+
+
+def get_quiz_pass_stats(batch):
+	"""Get pass counts per quiz in batch"""
+	Assessment = frappe.qb.DocType("LMS Assessment")
+	Quiz = frappe.qb.DocType("LMS Quiz")
+	BatchEnrollment = frappe.qb.DocType("LMS Batch Enrollment")
+	Submission = frappe.qb.DocType("LMS Quiz Submission")
+
+	rows = (
+		frappe.qb.from_(Assessment)
+		.join(Quiz)
+		.on(Quiz.name == Assessment.assessment_name)
+		.left_join(BatchEnrollment)
+		.on(BatchEnrollment.batch == Assessment.parent)
+		.left_join(Submission)
+		.on((Submission.quiz == Assessment.assessment_name) & (Submission.member == BatchEnrollment.member))
+		.where((Assessment.parent == batch) & (Assessment.assessment_type == "LMS Quiz"))
+		.groupby(Assessment.assessment_name, Quiz.title)
+		.select(
+			Quiz.title,
+			fn.Count(Case().when(Submission.percentage >= Submission.passing_percentage, Submission.member))
+			.distinct()
+			.as_("passed"),
+		)
+	).run(as_dict=True)
+
+	return [{"task": row.title, "value": row.passed or 0} for row in rows]
+
+
+@frappe.whitelist()
+def get_batch_chart_data(batch):
+	"""Get completion counts per course and assessment"""
+	if not frappe.db.exists("LMS Batch", batch):
+		frappe.throw(_("The specified batch does not exist."))
+
+	return get_course_completion_stats(batch) + get_assignment_pass_stats(batch) + get_quiz_pass_stats(batch)
+
+
 def get_batch_student_details(student):
 	details = frappe.db.get_value(
 		"User",
@@ -1410,8 +1522,11 @@ def calculate_course_progress(batch_courses, details):
 	details.courses = frappe._dict()
 
 	for course in batch_courses:
-		progress = frappe.db.get_value(
-			"LMS Enrollment", {"course": course.course, "member": details.email}, "progress"
+		progress = (
+			frappe.db.get_value(
+				"LMS Enrollment", {"course": course.course, "member": details.email}, "progress"
+			)
+			or 0
 		)
 		details.courses[course.title] = progress
 		course_progress.append(progress)
diff --git a/lms/locale/main.pot b/lms/locale/main.pot
index c6a1dae0..4597128a 100644
--- a/lms/locale/main.pot
+++ b/lms/locale/main.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe LMS VERSION\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2026-01-13 05:34+0000\n"
-"PO-Revision-Date: 2026-01-13 05:34+0000\n"
+"POT-Creation-Date: 2026-01-16 16:04+0000\n"
+"PO-Revision-Date: 2026-01-16 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -28,6 +28,10 @@ msgstr ""
 msgid " designed as a structured learning path to guide your progress. Courses in this program must be taken in order, and each course will unlock as you complete the previous one. "
 msgstr ""
 
+#: lms/templates/emails/published_batch_notification.html:19
+msgid " to "
+msgstr ""
+
 #: frontend/src/pages/Home/Streak.vue:21
 msgid " you are on a"
 msgstr ""
@@ -80,7 +84,28 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:190
+#: lms/lms/doctype/lms_batch/lms_batch.py:189
+msgid "A new batch '{0}' has been published that might interest you. Check it out!"
+msgstr ""
+
+#: lms/templates/emails/published_batch_notification.html:7
+msgid "A new batch has been published on "
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:198
+msgid "A new course '{0}' has been published that might interest you. Check it out!"
+msgstr ""
+
+#: lms/templates/emails/published_course_notification.html:7
+msgid "A new course has been published on "
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:151
+#: lms/lms/doctype/lms_course/lms_course.py:162
+msgid "A new course has been published on {0}"
+msgstr ""
+
+#: frontend/src/pages/CourseForm.vue:143
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -88,7 +113,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:182
+#: frontend/src/pages/CourseForm.vue:135
 msgid "About the Course"
 msgstr ""
 
@@ -160,7 +185,7 @@ msgstr ""
 msgid "Add Quiz to Video"
 msgstr ""
 
-#: frontend/src/components/Controls/ChildTable.vue:76
+#: frontend/src/components/Controls/ChildTable.vue:77
 #: frontend/src/components/Settings/Coupons/CouponItems.vue:55
 msgid "Add Row"
 msgstr ""
@@ -169,7 +194,7 @@ msgstr ""
 msgid "Add Slot"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:35
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:40
 msgid "Add Test Case"
 msgstr ""
 
@@ -185,7 +210,7 @@ msgstr ""
 msgid "Add a Student"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:523
+#: frontend/src/components/Sidebar/AppSidebar.vue:524
 msgid "Add a chapter"
 msgstr ""
 
@@ -197,7 +222,7 @@ msgstr ""
 msgid "Add a keyword and then press enter"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:524
+#: frontend/src/components/Sidebar/AppSidebar.vue:525
 msgid "Add a lesson"
 msgstr ""
 
@@ -210,7 +235,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:538
+#: frontend/src/components/Sidebar/AppSidebar.vue:539
 msgid "Add a program"
 msgstr ""
 
@@ -234,7 +259,7 @@ msgstr ""
 msgid "Add at least one possible answer for this question: {0}"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:487
+#: frontend/src/components/Sidebar/AppSidebar.vue:488
 msgid "Add courses to your batch"
 msgstr ""
 
@@ -242,7 +267,7 @@ msgstr ""
 msgid "Add quiz to this video"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:466
+#: frontend/src/components/Sidebar/AppSidebar.vue:467
 msgid "Add students to your batch"
 msgstr ""
 
@@ -258,11 +283,11 @@ msgstr ""
 msgid "Add your assignment as {0}"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:399
+#: frontend/src/components/Sidebar/AppSidebar.vue:400
 msgid "Add your first chapter"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:415
+#: frontend/src/components/Sidebar/AppSidebar.vue:416
 msgid "Add your first lesson"
 msgstr ""
 
@@ -308,7 +333,7 @@ msgstr ""
 msgid "All Programs"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:42
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:45
 msgid "All questions should have the same marks if the limit is set."
 msgstr ""
 
@@ -350,7 +375,7 @@ msgstr ""
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
 #: frontend/src/components/Settings/Transactions/TransactionDetails.vue:62
 #: frontend/src/components/Settings/Transactions/TransactionList.vue:180
-#: frontend/src/pages/BatchForm.vue:278 frontend/src/pages/CourseForm.vue:262
+#: frontend/src/pages/BatchForm.vue:230 frontend/src/pages/CourseForm.vue:215
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -364,7 +389,7 @@ msgstr ""
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:69
+#: lms/lms/doctype/lms_batch/lms_batch.py:75
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -403,18 +428,6 @@ msgstr ""
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:104 frontend/src/pages/CourseForm.vue:123
-msgid "Appears on the course card in the course list"
-msgstr ""
-
-#: frontend/src/pages/BatchForm.vue:250
-msgid "Appears when the batch URL is shared on any online platform"
-msgstr ""
-
-#: frontend/src/pages/BatchForm.vue:231
-msgid "Appears when the batch URL is shared on socials"
-msgstr ""
-
 #: frontend/src/components/Settings/Coupons/CouponDetails.vue:71
 msgid "Applicable For"
 msgstr ""
@@ -475,7 +488,7 @@ msgstr ""
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:179
+#: frontend/src/components/UpcomingEvaluations.vue:206
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
@@ -518,14 +531,14 @@ msgstr ""
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:77
+#: lms/lms/doctype/lms_batch/lms_batch.py:83
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
 #. Label of the show_assessments (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/AdminBatchDashboard.vue:32
 #: frontend/src/components/Assessments.vue:5
-#: frontend/src/components/Sidebar/AppSidebar.vue:541
+#: frontend/src/components/Sidebar/AppSidebar.vue:542
 #: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/templates/assessments.html:3
 msgid "Assessments"
@@ -606,7 +619,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/Settings/Badges.vue:163
-#: frontend/src/components/Sidebar/AppSidebar.vue:545
+#: frontend/src/components/Sidebar/AppSidebar.vue:546
 #: frontend/src/pages/Assignments.vue:213 lms/www/lms.py:272
 msgid "Assignments"
 msgstr ""
@@ -793,11 +806,15 @@ msgstr ""
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
+#: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_category/lms_category.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_coupon/lms_coupon.json
+#: lms/lms/doctype/lms_live_class/lms_live_class.json
+#: lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.json
 #: lms/lms/doctype/lms_programming_exercise/lms_programming_exercise.json
 #: lms/lms/doctype/lms_programming_exercise_submission/lms_programming_exercise_submission.json
 #: lms/lms/doctype/lms_zoom_settings/lms_zoom_settings.json
@@ -834,23 +851,23 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:598
+#: frontend/src/pages/BatchForm.vue:551
 msgid "Batch deleted successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:42
+#: lms/lms/doctype/lms_batch/lms_batch.py:48
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
 
-#: lms/lms/api.py:131
+#: lms/lms/api.py:137
 msgid "Batch has already started."
 msgstr ""
 
-#: lms/lms/api.py:126
+#: lms/lms/api.py:132
 msgid "Batch is sold out."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:47
+#: lms/lms/doctype/lms_batch/lms_batch.py:53
 msgid "Batch start time cannot be greater than or equal to end time."
 msgstr ""
 
@@ -874,7 +891,7 @@ msgstr ""
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
 #: frontend/src/components/Settings/Transactions/TransactionDetails.vue:99
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:457
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:460
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr ""
@@ -931,12 +948,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:62
-#: frontend/src/components/UpcomingEvaluations.vue:184
+#: frontend/src/components/UpcomingEvaluations.vue:77
+#: frontend/src/components/UpcomingEvaluations.vue:211
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:178
+#: frontend/src/components/UpcomingEvaluations.vue:205
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -1025,7 +1042,7 @@ msgstr ""
 #. Label of a Card Break in the LMS Workspace
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/Modals/Event.vue:411
-#: frontend/src/components/Sidebar/AppSidebar.vue:549
+#: frontend/src/components/Sidebar/AppSidebar.vue:550
 #: frontend/src/pages/BatchForm.vue:69 frontend/src/pages/Batches.vue:100
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
@@ -1047,7 +1064,7 @@ msgstr ""
 msgid "Certification Name"
 msgstr ""
 
-#: lms/lms/doctype/lms_certificate/lms_certificate.py:168
+#: lms/lms/doctype/lms_certificate/lms_certificate.py:173
 msgid "Certification is not enabled for this course."
 msgstr ""
 
@@ -1130,7 +1147,7 @@ msgstr ""
 msgid "Check Discussion"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:97
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:101
 msgid "Check Submission"
 msgstr ""
 
@@ -1147,6 +1164,14 @@ msgstr ""
 msgid "Checkout Courses"
 msgstr ""
 
+#: lms/templates/emails/published_batch_notification.html:52
+msgid "Checkout the batch"
+msgstr ""
+
+#: lms/templates/emails/published_course_notification.html:36
+msgid "Checkout the course"
+msgstr ""
+
 #. Option for the 'Type' (Select) field in DocType 'LMS Question'
 #. Option for the 'Type' (Select) field in DocType 'LMS Quiz Question'
 #: lms/lms/doctype/lms_question/lms_question.json
@@ -1154,7 +1179,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:134
+#: frontend/src/pages/CourseForm.vue:87
 msgid "Choose a color for the course card"
 msgstr ""
 
@@ -1258,14 +1283,14 @@ msgstr ""
 #. Label of the card_gradient (Select) field in DocType 'LMS Course'
 #. Label of the color (Select) field in DocType 'LMS Lesson Note'
 #. Label of the color (Color) field in DocType 'LMS Timetable Legend'
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:86
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_lesson_note/lms_lesson_note.json
 #: lms/lms/doctype/lms_timetable_legend/lms_timetable_legend.json
 msgid "Color"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:306 frontend/src/pages/CourseForm.vue:312
+#: frontend/src/pages/BatchForm.vue:264 frontend/src/pages/CourseForm.vue:265
 msgid "Comma separated keywords for SEO"
 msgstr ""
 
@@ -1314,7 +1339,7 @@ msgstr ""
 
 #. Label of the company_logo (Attach Image) field in DocType 'Job Opportunity'
 #. Label of a field in the job-opportunity Web Form
-#: frontend/src/pages/JobForm.vue:87
+#: frontend/src/pages/JobForm.vue:88
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/job/web_form/job_opportunity/job_opportunity.json
 msgid "Company Logo"
@@ -1375,7 +1400,7 @@ msgid "Completed"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:249
+#: frontend/src/pages/CourseForm.vue:202
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1410,7 +1435,11 @@ msgstr ""
 msgid "Confirm Enrollment"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:576
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:226
+msgid "Confirm Your Action"
+msgstr ""
+
+#: frontend/src/pages/BatchForm.vue:529
 msgid "Confirm your action to delete"
 msgstr ""
 
@@ -1425,7 +1454,7 @@ msgstr ""
 msgid "Confirmation Email Template"
 msgstr ""
 
-#: lms/lms/doctype/lms_certificate/lms_certificate.py:27
+#: lms/lms/doctype/lms_certificate/lms_certificate.py:32
 msgid "Congratulations on getting certified!"
 msgstr ""
 
@@ -1630,7 +1659,7 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:151
 msgid "Course Description"
 msgstr ""
 
@@ -1670,7 +1699,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:78 frontend/src/pages/CourseForm.vue:322
+#: frontend/src/pages/CourseDetail.vue:78 frontend/src/pages/CourseForm.vue:275
 msgid "Course Outline"
 msgstr ""
 
@@ -1711,19 +1740,19 @@ msgstr ""
 msgid "Course already added to program"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:572
+#: frontend/src/pages/CourseForm.vue:508
 msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:609
+#: frontend/src/pages/CourseForm.vue:545
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:592
+#: frontend/src/pages/CourseForm.vue:528
 msgid "Course updated successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:54
+#: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Course {0} has already been added to this batch."
 msgstr ""
 
@@ -1799,7 +1828,7 @@ msgstr ""
 msgid "Create Program"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:7
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:8
 msgid "Create Programming Exercise"
 msgstr ""
 
@@ -1815,15 +1844,15 @@ msgstr ""
 msgid "Create a Quiz"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:531
+#: frontend/src/components/Sidebar/AppSidebar.vue:532
 msgid "Create a batch"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:522
+#: frontend/src/components/Sidebar/AppSidebar.vue:523
 msgid "Create a course"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:532
+#: frontend/src/components/Sidebar/AppSidebar.vue:533
 msgid "Create a live class"
 msgstr ""
 
@@ -1835,15 +1864,15 @@ msgstr ""
 msgid "Create an Assignment"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:456
+#: frontend/src/components/Sidebar/AppSidebar.vue:457
 msgid "Create your first batch"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:387
+#: frontend/src/components/Sidebar/AppSidebar.vue:388
 msgid "Create your first course"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:434
+#: frontend/src/components/Sidebar/AppSidebar.vue:435
 msgid "Create your first quiz"
 msgstr ""
 
@@ -1851,11 +1880,11 @@ msgstr ""
 msgid "Created"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:528
+#: frontend/src/components/Sidebar/AppSidebar.vue:529
 msgid "Creating a batch"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:519
+#: frontend/src/components/Sidebar/AppSidebar.vue:520
 msgid "Creating a course"
 msgstr ""
 
@@ -1863,7 +1892,7 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
 #: frontend/src/components/Settings/Transactions/TransactionDetails.vue:58
-#: frontend/src/pages/BatchForm.vue:285 frontend/src/pages/CourseForm.vue:282
+#: frontend/src/pages/BatchForm.vue:237 frontend/src/pages/CourseForm.vue:235
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
@@ -1879,7 +1908,7 @@ msgstr ""
 msgid "Current Streak"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:555
+#: frontend/src/components/Sidebar/AppSidebar.vue:556
 msgid "Custom Certificate Templates"
 msgstr ""
 
@@ -1977,14 +2006,15 @@ msgstr ""
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/Controls/ChildTable.vue:62
+#: frontend/src/components/Controls/ChildTable.vue:63
 #: frontend/src/components/CourseOutline.vue:294
 #: frontend/src/components/CourseOutline.vue:360
 #: frontend/src/components/DiscussionReplies.vue:41
 #: frontend/src/components/Settings/Badges.vue:171
 #: frontend/src/components/Settings/Coupons/CouponList.vue:133
-#: frontend/src/pages/BatchForm.vue:582 frontend/src/pages/CourseForm.vue:622
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:67
+#: frontend/src/pages/BatchForm.vue:535 frontend/src/pages/CourseForm.vue:558
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:71
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:232
 #: frontend/src/pages/Programs/ProgramForm.vue:230
 #: frontend/src/pages/Programs/ProgramForm.vue:567
 msgid "Delete"
@@ -1994,7 +2024,7 @@ msgstr ""
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:616
+#: frontend/src/pages/CourseForm.vue:552
 msgid "Delete Course"
 msgstr ""
 
@@ -2014,11 +2044,15 @@ msgstr ""
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:617
+#: frontend/src/pages/CourseForm.vue:553
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:577
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:227
+msgid "Deleting these exercises will permanently remove them from the system, along with all associated submissions. This action is irreversible. Are you sure you want to proceed?"
+msgstr ""
+
+#: frontend/src/pages/BatchForm.vue:530
 msgid "Deleting this batch will also delete all its data including enrolled students, linked courses, assessments, feedback and discussions. Are you sure you want to continue?"
 msgstr ""
 
@@ -2040,7 +2074,7 @@ msgstr ""
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:80
 #: frontend/src/components/Settings/BadgeForm.vue:32
-#: frontend/src/pages/JobForm.vue:132
+#: frontend/src/pages/JobForm.vue:96
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/job/web_form/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
@@ -2067,7 +2101,7 @@ msgstr ""
 msgid "Disable PWA"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:174
+#: frontend/src/pages/CourseForm.vue:127
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -2218,7 +2252,7 @@ msgstr ""
 msgid "Edit Program"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:8
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:9
 msgid "Edit Programming Exercise"
 msgstr ""
 
@@ -2245,9 +2279,15 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
+#. Option for the 'Send Notification for Published Courses' (Select) field in
+#. DocType 'LMS Settings'
+#. Option for the 'Send Notification for Published Batches' (Select) field in
+#. DocType 'LMS Settings'
 #: frontend/src/components/Settings/Evaluators.vue:105
 #: frontend/src/components/Settings/Members.vue:103
-#: frontend/src/pages/JobApplications.vue:305 lms/templates/signup-form.html:10
+#: frontend/src/pages/JobApplications.vue:305
+#: lms/lms/doctype/lms_settings/lms_settings.json
+#: lms/templates/signup-form.html:10
 msgid "Email"
 msgstr ""
 
@@ -2445,7 +2485,7 @@ msgstr ""
 msgid "Enter reply to email"
 msgstr ""
 
-#: frontend/src/components/Modals/ZoomAccountModal.vue:164
+#: frontend/src/components/Modals/ZoomAccountModal.vue:167
 msgid "Error creating Zoom Account"
 msgstr ""
 
@@ -2457,11 +2497,11 @@ msgstr ""
 msgid "Error creating email template"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:179
+#: lms/lms/doctype/lms_batch/lms_batch.py:256
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
-#: frontend/src/pages/Quizzes.vue:227
+#: frontend/src/pages/Quizzes.vue:230
 msgid "Error creating quiz: {0}"
 msgstr ""
 
@@ -2474,7 +2514,7 @@ msgstr ""
 msgid "Error deleting email templates"
 msgstr ""
 
-#: frontend/src/components/Modals/ZoomAccountModal.vue:202
+#: frontend/src/components/Modals/ZoomAccountModal.vue:205
 msgid "Error updating Zoom Account"
 msgstr ""
 
@@ -2505,7 +2545,7 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:88
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
@@ -2522,7 +2562,7 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:269 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:222 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2558,7 +2598,7 @@ msgstr ""
 msgid "Evaluator deleted successfully"
 msgstr ""
 
-#: lms/lms/api.py:1338
+#: lms/lms/api.py:1406
 msgid "Evaluator does not exist."
 msgstr ""
 
@@ -2580,7 +2620,7 @@ msgstr ""
 
 #. Label of the exercise (Link) field in DocType 'LMS Programming Exercise
 #. Submission'
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:274
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:275
 #: lms/lms/doctype/lms_programming_exercise_submission/lms_programming_exercise_submission.json
 msgid "Exercise"
 msgstr ""
@@ -2591,6 +2631,10 @@ msgstr ""
 msgid "Exercise Title"
 msgstr ""
 
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:250
+msgid "Exercise deleted successfully"
+msgstr ""
+
 #: frontend/src/components/Sidebar/AppSidebar.vue:155
 msgid "Expand"
 msgstr ""
@@ -2658,7 +2702,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Programming Exercise
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Test Case Submission'
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:37
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:36
 #: lms/lms/doctype/lms_programming_exercise_submission/lms_programming_exercise_submission.json
 #: lms/lms/doctype/lms_test_case_submission/lms_test_case_submission.json
 msgid "Failed"
@@ -2688,21 +2732,21 @@ msgstr ""
 msgid "Failed to update badge assignment: "
 msgstr ""
 
-#: frontend/src/utils/index.js:836
+#: frontend/src/utils/index.js:856
 msgid "Failed to update meta tags {0}"
 msgstr ""
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:25
 #: frontend/src/components/CourseCard.vue:79
-#: frontend/src/pages/CourseForm.vue:169
+#: frontend/src/pages/CourseForm.vue:122
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr ""
 
 #. Label of the feedback (Small Text) field in DocType 'LMS Batch Feedback'
 #: frontend/src/components/BatchFeedback.vue:30
-#: frontend/src/pages/Batch.vue:163
+#: frontend/src/pages/Batch.vue:150
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 msgid "Feedback"
 msgstr ""
@@ -2734,16 +2778,16 @@ msgstr ""
 msgid "Filter by Billing Name"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:23
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:20
 msgid "Filter by Exercise"
 msgstr ""
 
 #: frontend/src/components/Settings/Transactions/TransactionList.vue:20
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:28
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:26
 msgid "Filter by Member"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:39
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:38
 msgid "Filter by Status"
 msgstr ""
 
@@ -2812,6 +2856,10 @@ msgstr ""
 msgid "From"
 msgstr ""
 
+#: lms/templates/emails/published_batch_notification.html:19
+msgid "From "
+msgstr ""
+
 #. Label of the from_date (Date) field in DocType 'Work Experience'
 #: lms/lms/doctype/work_experience/work_experience.json
 msgid "From Date"
@@ -2968,6 +3016,11 @@ msgstr ""
 msgid "Hello"
 msgstr ""
 
+#: lms/templates/emails/published_batch_notification.html:4
+#: lms/templates/emails/published_course_notification.html:4
+msgid "Hello Learner"
+msgstr ""
+
 #: frontend/src/components/Sidebar/AppSidebar.vue:141
 msgid "Help"
 msgstr ""
@@ -2984,6 +3037,11 @@ msgstr ""
 msgid "Help us understand your needs"
 msgstr ""
 
+#: lms/templates/emails/published_batch_notification.html:7
+#: lms/templates/emails/published_course_notification.html:7
+msgid "Here are the details:"
+msgstr ""
+
 #: frontend/src/pages/Home/Home.vue:11
 msgid "Hey"
 msgstr ""
@@ -3062,7 +3120,7 @@ msgstr ""
 msgid "I consent to my personal information being stored for invoicing"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:340
+#: frontend/src/pages/QuizForm.vue:338
 msgid "ID"
 msgstr ""
 
@@ -3110,7 +3168,7 @@ msgstr ""
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:64
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:67
 msgid "If you want open ended questions then make sure each question in the quiz is of open ended type."
 msgstr ""
 
@@ -3130,7 +3188,7 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:228
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:231
 msgid "Image: Corrupted Data Stream"
 msgstr ""
 
@@ -3155,6 +3213,14 @@ msgstr ""
 msgid "In Progress"
 msgstr ""
 
+#. Option for the 'Send Notification for Published Courses' (Select) field in
+#. DocType 'LMS Settings'
+#. Option for the 'Send Notification for Published Batches' (Select) field in
+#. DocType 'LMS Settings'
+#: lms/lms/doctype/lms_settings/lms_settings.json
+msgid "In-app"
+msgstr ""
+
 #. Label of the include_in_preview (Check) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Include In Preview"
@@ -3241,8 +3307,8 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:511
-#: frontend/src/components/Sidebar/AppSidebar.vue:514
+#: frontend/src/components/Sidebar/AppSidebar.vue:512
+#: frontend/src/components/Sidebar/AppSidebar.vue:515
 msgid "Introduction"
 msgstr ""
 
@@ -3254,7 +3320,7 @@ msgstr ""
 msgid "Invalid Quiz ID in content"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:445
+#: frontend/src/components/Sidebar/AppSidebar.vue:446
 msgid "Invite your team and students"
 msgstr ""
 
@@ -3291,7 +3357,7 @@ msgstr ""
 msgid "Issue Date"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:552
+#: frontend/src/components/Sidebar/AppSidebar.vue:553
 msgid "Issue a Certificate"
 msgstr ""
 
@@ -3384,7 +3450,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:95
+#: frontend/src/components/UpcomingEvaluations.vue:110
 msgid "Join Call"
 msgstr ""
 
@@ -3706,7 +3772,8 @@ msgstr ""
 
 #. Label of the language (Select) field in DocType 'LMS Programming Exercise'
 #: frontend/src/components/Modals/EditProfile.vue:98
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:22
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:27
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:275
 #: lms/lms/doctype/lms_programming_exercise/lms_programming_exercise.json
 msgid "Language"
 msgstr ""
@@ -3724,7 +3791,7 @@ msgstr ""
 msgid "Learning Consistency"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:536
+#: frontend/src/components/Sidebar/AppSidebar.vue:537
 msgid "Learning Paths"
 msgstr ""
 
@@ -3767,7 +3834,7 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
-#: frontend/src/pages/LessonForm.vue:425
+#: frontend/src/pages/LessonForm.vue:423
 msgid "Lesson created successfully"
 msgstr ""
 
@@ -3779,7 +3846,7 @@ msgstr ""
 msgid "Lesson moved successfully"
 msgstr ""
 
-#: frontend/src/pages/LessonForm.vue:449
+#: frontend/src/pages/LessonForm.vue:447
 msgid "Lesson updated successfully"
 msgstr ""
 
@@ -3813,7 +3880,7 @@ msgstr ""
 msgid "Limit Questions To"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:37
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:40
 msgid "Limit cannot be greater than or equal to the number of questions in the quiz."
 msgstr ""
 
@@ -3844,6 +3911,7 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:93
 #: frontend/src/components/Modals/CourseProgressSummary.vue:86
 #: frontend/src/components/Settings/Evaluators.vue:81
 #: frontend/src/components/Settings/Members.vue:79
@@ -3852,8 +3920,8 @@ msgstr ""
 #: frontend/src/pages/CertifiedParticipants.vue:118
 #: frontend/src/pages/Courses.vue:108
 #: frontend/src/pages/JobApplications.vue:101
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:129
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:87
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:130
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:117
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:94
 msgid "Load More"
@@ -3879,7 +3947,7 @@ msgid "Location Preference"
 msgstr ""
 
 #: frontend/src/components/NoPermission.vue:26
-#: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:213
+#: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:200
 #: frontend/src/pages/Lesson.vue:103
 msgid "Login"
 msgstr ""
@@ -3948,7 +4016,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:40
 #: frontend/src/components/Modals/Question.vue:106
-#: frontend/src/components/Quiz.vue:120 frontend/src/pages/QuizForm.vue:350
+#: frontend/src/components/Quiz.vue:120 frontend/src/pages/QuizForm.vue:348
 #: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -3975,7 +4043,7 @@ msgid "Marks to Deduct"
 msgstr ""
 
 #. Label of the max_attempts (Int) field in DocType 'LMS Quiz'
-#: frontend/src/pages/Quizzes.vue:264 lms/lms/doctype/lms_quiz/lms_quiz.json
+#: frontend/src/pages/Quizzes.vue:267 lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Max Attempts"
 msgstr ""
 
@@ -4034,7 +4102,7 @@ msgstr ""
 #: frontend/src/components/Settings/Transactions/TransactionDetails.vue:28
 #: frontend/src/components/Settings/ZoomSettings.vue:187
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:268
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:269
 #: frontend/src/pages/Programs/ProgramProgressSummary.vue:126
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:91
@@ -4219,30 +4287,30 @@ msgid "Message is required"
 msgstr ""
 
 #. Label of the meta_description (Small Text) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:297 frontend/src/pages/CourseForm.vue:303
+#: frontend/src/pages/BatchForm.vue:255 frontend/src/pages/CourseForm.vue:256
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Meta Description"
 msgstr ""
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:207
+#: frontend/src/pages/BatchForm.vue:249
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Meta Image"
 msgstr ""
 
 #. Label of the meta_keywords (Small Text) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:303 frontend/src/pages/CourseForm.vue:309
+#: frontend/src/pages/BatchForm.vue:261 frontend/src/pages/CourseForm.vue:262
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Meta Keywords"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:292 frontend/src/pages/CourseForm.vue:298
+#: frontend/src/pages/BatchForm.vue:244 frontend/src/pages/CourseForm.vue:251
 msgid "Meta Tags"
 msgstr ""
 
-#: lms/lms/api.py:1413
+#: lms/lms/api.py:1481
 msgid "Meta tags should be a list."
 msgstr ""
 
@@ -4265,6 +4333,7 @@ msgstr ""
 #: lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
+#: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_category/lms_category.json
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
@@ -4273,6 +4342,7 @@ msgstr ""
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_lesson_note/lms_lesson_note.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
+#: lms/lms/doctype/lms_live_class_participant/lms_live_class_participant.json
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_programming_exercise/lms_programming_exercise.json
 #: lms/lms/doctype/lms_programming_exercise_submission/lms_programming_exercise_submission.json
@@ -4286,8 +4356,8 @@ msgstr ""
 msgid "Moderator"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:286
-#: frontend/src/pages/Quizzes.vue:278
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:287
+#: frontend/src/pages/Quizzes.vue:281
 msgid "Modified"
 msgstr ""
 
@@ -4295,11 +4365,11 @@ msgstr ""
 msgid "Modified By"
 msgstr ""
 
-#: lms/lms/api.py:108
+#: lms/lms/api.py:114
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:104
+#: lms/lms/api.py:110
 msgid "Module is incorrect."
 msgstr ""
 
@@ -4310,7 +4380,7 @@ msgstr ""
 msgid "Monday"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:560
+#: frontend/src/components/Sidebar/AppSidebar.vue:561
 msgid "Monetization"
 msgstr ""
 
@@ -4363,7 +4433,8 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:10 lms/www/lms.py:150
+#: frontend/src/pages/Batches.vue:10 frontend/src/pages/Notifications.vue:90
+#: lms/www/lms.py:150
 msgid "New Batch"
 msgstr ""
 
@@ -4371,8 +4442,8 @@ msgstr ""
 msgid "New Coupon"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:703 frontend/src/pages/Courses.vue:13
-#: lms/www/lms.py:94
+#: frontend/src/pages/CourseForm.vue:631 frontend/src/pages/Courses.vue:13
+#: frontend/src/pages/Notifications.vue:89 lms/www/lms.py:94
 msgid "New Course"
 msgstr ""
 
@@ -4396,10 +4467,6 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:406 frontend/src/pages/QuizForm.vue:414
-msgid "New Quiz"
-msgstr ""
-
 #: lms/www/new-sign-up.html:3
 msgid "New Sign Up"
 msgstr ""
@@ -4408,11 +4475,11 @@ msgstr ""
 msgid "New Zoom Account"
 msgstr ""
 
-#: lms/lms/utils.py:417
+#: lms/lms/utils.py:423
 msgid "New comment in batch {0}"
 msgstr ""
 
-#: lms/lms/utils.py:412
+#: lms/lms/utils.py:414
 msgid "New reply on the topic {0} in course {1}"
 msgstr ""
 
@@ -4574,14 +4641,15 @@ msgid "Not Graded"
 msgstr ""
 
 #: frontend/src/components/NoPermission.vue:5
-#: frontend/src/components/NoPermission.vue:46 frontend/src/pages/Batch.vue:181
+#: frontend/src/components/NoPermission.vue:46 frontend/src/pages/Batch.vue:168
 msgid "Not Permitted"
 msgstr ""
 
 #: frontend/src/components/Assignment.vue:36
 #: frontend/src/components/Modals/EditProfile.vue:13
 #: frontend/src/components/Settings/BrandSettings.vue:10
-#: frontend/src/components/Settings/SettingDetails.vue:10
+#: frontend/src/components/Settings/SettingDetails.vue:11
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:13
 #: frontend/src/pages/Programs/ProgramForm.vue:16
 #: frontend/src/pages/QuizForm.vue:8 frontend/src/pages/QuizSubmission.vue:9
 msgid "Not Saved"
@@ -4597,11 +4665,20 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: frontend/src/pages/Notifications.vue:53
+#: frontend/src/pages/Notifications.vue:143
 msgid "Nothing to see here."
 msgstr ""
 
+#. Label of the notification_sent (Check) field in DocType 'LMS Batch'
+#. Label of the notification_sent (Check) field in DocType 'LMS Course'
+#: lms/lms/doctype/lms_batch/lms_batch.json
+#: lms/lms/doctype/lms_course/lms_course.json
+msgid "Notification Sent"
+msgstr ""
+
 #. Label of the notifications (Check) field in DocType 'LMS Settings'
+#. Label of the notifications_section (Section Break) field in DocType 'LMS
+#. Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Notifications"
 msgstr ""
@@ -4655,14 +4732,14 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/utils/index.js:629
-msgid "Only image file is allowed."
-msgstr ""
-
 #: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
+#: frontend/src/utils/index.js:649
+msgid "Only {0} file is allowed."
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option in a Select field in the job-opportunity Web Form
 #: frontend/src/pages/Jobs.vue:189
@@ -4802,18 +4879,18 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:352
+#: frontend/src/components/Sidebar/AppSidebar.vue:353
 msgid "Page deleted successfully"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:270
+#: frontend/src/pages/BatchForm.vue:222
 #: lms/lms/doctype/lms_batch/lms_batch.json
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:254
+#: frontend/src/pages/CourseForm.vue:207
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -4823,7 +4900,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:244
+#: frontend/src/pages/CourseForm.vue:197
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -4854,7 +4931,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Programming Exercise
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Test Case Submission'
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:36
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:35
 #: lms/lms/doctype/lms_programming_exercise_submission/lms_programming_exercise_submission.json
 #: lms/lms/doctype/lms_test_case_submission/lms_test_case_submission.json
 msgid "Passed"
@@ -4862,7 +4939,7 @@ msgstr ""
 
 #. Label of the passing_percentage (Int) field in DocType 'LMS Quiz'
 #. Label of the passing_percentage (Int) field in DocType 'LMS Quiz Submission'
-#: frontend/src/pages/QuizForm.vue:78 frontend/src/pages/Quizzes.vue:257
+#: frontend/src/pages/QuizForm.vue:78 frontend/src/pages/Quizzes.vue:260
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Passing Percentage"
@@ -4873,7 +4950,7 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:167
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
@@ -5042,7 +5119,7 @@ msgstr ""
 msgid "Please complete the previous course to unlock this one."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:262
 msgid "Please enable the zoom account to use this feature."
 msgstr ""
 
@@ -5058,7 +5135,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:353
+#: frontend/src/pages/Billing.vue:356
 msgid "Please enter a coupon code"
 msgstr ""
 
@@ -5075,7 +5152,7 @@ msgid "Please enter a valid Contact Us URL."
 msgstr ""
 
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:32
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:107
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:106
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -5087,11 +5164,11 @@ msgstr ""
 msgid "Please enter a valid timestamp"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:101
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:100
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:62
+#: lms/lms/doctype/lms_batch/lms_batch.py:68
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -5099,7 +5176,7 @@ msgstr ""
 msgid "Please install the Payments App to create a paid course. Refer to the documentation for more details. {0}"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:333
+#: frontend/src/pages/Billing.vue:335
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
@@ -5107,19 +5184,19 @@ msgstr ""
 msgid "Please login to access the quiz."
 msgstr ""
 
-#: frontend/src/pages/Batch.vue:192
+#: frontend/src/pages/Batch.vue:179
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:100
+#: lms/lms/api.py:106
 msgid "Please login to continue with payment."
 msgstr ""
 
-#: lms/lms/utils.py:1943
+#: lms/lms/utils.py:2081
 msgid "Please login to enroll in the program."
 msgstr ""
 
-#: frontend/src/pages/Batch.vue:158
+#: frontend/src/components/UpcomingEvaluations.vue:19
 msgid "Please make sure to schedule your evaluation before this date."
 msgstr ""
 
@@ -5132,7 +5209,7 @@ msgstr ""
 msgid "Please provide your consent to proceed with the payment"
 msgstr ""
 
-#: frontend/src/pages/Billing.vue:337
+#: frontend/src/pages/Billing.vue:339
 msgid "Please provide your consent to proceed with the payment."
 msgstr ""
 
@@ -5188,7 +5265,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:104
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:103
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -5278,7 +5355,9 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:212
+#. Label of the video_link (Attach) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:207 frontend/src/pages/CourseForm.vue:165
+#: lms/lms/doctype/lms_batch/lms_batch.json
 msgid "Preview Video"
 msgstr ""
 
@@ -5287,13 +5366,13 @@ msgid "Previous"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:265
+#: frontend/src/pages/BatchForm.vue:217
 #: lms/lms/doctype/lms_batch/lms_batch.json
 msgid "Pricing"
 msgstr ""
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:238
+#: frontend/src/pages/CourseForm.vue:191
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -5312,7 +5391,7 @@ msgstr ""
 
 #. Label of the problem_statement (Text Editor) field in DocType 'LMS
 #. Programming Exercise'
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:41
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:46
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue:25
 #: lms/lms/doctype/lms_programming_exercise/lms_programming_exercise.json
 msgid "Problem Statement"
@@ -5372,26 +5451,26 @@ msgid "Programming Exercise Submission"
 msgstr ""
 
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue:416
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:298
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:299
 msgid "Programming Exercise Submissions"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:222
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:258
 msgid "Programming Exercise created successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:258
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:295
 msgid "Programming Exercise deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:241
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:278
 msgid "Programming Exercise updated successfully"
 msgstr ""
 
 #. Label of the programming_exercises (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:308
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:158
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:166
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:309
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:290
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:298
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Programming Exercises"
 msgstr ""
@@ -5445,7 +5524,7 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Program'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:122
-#: frontend/src/pages/BatchForm.vue:59 frontend/src/pages/CourseForm.vue:152
+#: frontend/src/pages/BatchForm.vue:59 frontend/src/pages/CourseForm.vue:105
 #: frontend/src/pages/Programs/ProgramForm.vue:33
 #: frontend/src/pages/Programs/StudentPrograms.vue:100
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5461,7 +5540,7 @@ msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:156
+#: frontend/src/pages/CourseForm.vue:109
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -5494,7 +5573,7 @@ msgstr ""
 #: frontend/src/components/Assignment.vue:20
 #: frontend/src/components/Modals/AssignmentForm.vue:38
 #: frontend/src/components/Modals/Question.vue:27
-#: frontend/src/pages/QuizForm.vue:345 frontend/src/pages/QuizSubmission.vue:56
+#: frontend/src/pages/QuizForm.vue:343 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5535,7 +5614,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:387
+#: frontend/src/pages/QuizForm.vue:385
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -5577,7 +5656,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/Quizzes.vue:216
+#: frontend/src/pages/Quizzes.vue:218
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -5585,7 +5664,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:312
+#: frontend/src/pages/QuizForm.vue:310
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -5594,13 +5673,13 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:544
-#: frontend/src/pages/QuizForm.vue:398 frontend/src/pages/Quizzes.vue:290
-#: frontend/src/pages/Quizzes.vue:300 lms/www/lms.py:250
+#: frontend/src/components/Sidebar/AppSidebar.vue:545
+#: frontend/src/pages/QuizForm.vue:396 frontend/src/pages/Quizzes.vue:293
+#: frontend/src/pages/Quizzes.vue:303 lms/www/lms.py:250
 msgid "Quizzes"
 msgstr ""
 
-#: frontend/src/pages/Quizzes.vue:238
+#: frontend/src/pages/Quizzes.vue:241
 msgid "Quizzes deleted successfully"
 msgstr ""
 
@@ -5688,7 +5767,7 @@ msgstr ""
 #. Label of the related_courses (Table) field in DocType 'LMS Course'
 #. Name of a DocType
 #: frontend/src/components/RelatedCourses.vue:5
-#: frontend/src/pages/CourseForm.vue:223
+#: frontend/src/pages/CourseForm.vue:176
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/related_courses/related_courses.json
 msgid "Related Courses"
@@ -5699,8 +5778,7 @@ msgstr ""
 msgid "Remote"
 msgstr ""
 
-#: frontend/src/components/Controls/Uploader.vue:34
-#: frontend/src/pages/BatchForm.vue:246 frontend/src/pages/CourseForm.vue:119
+#: frontend/src/components/Controls/Uploader.vue:45
 msgid "Remove"
 msgstr ""
 
@@ -5770,7 +5848,7 @@ msgstr ""
 msgid "Role updated successfully"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:572
+#: frontend/src/components/Sidebar/AppSidebar.vue:573
 msgid "Roles"
 msgstr ""
 
@@ -5779,19 +5857,19 @@ msgstr ""
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:119
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:115
+#: lms/lms/doctype/lms_batch/lms_batch.py:121
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:105
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:114
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -5830,7 +5908,7 @@ msgstr ""
 msgid "SEO"
 msgstr ""
 
-#: frontend/src/utils/index.js:648
+#: frontend/src/utils/index.js:668
 msgid "SVG contains potentially unsafe content."
 msgstr ""
 
@@ -5860,7 +5938,7 @@ msgstr ""
 #: frontend/src/components/Settings/Transactions/TransactionDetails.vue:129
 #: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:17
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:101
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:105
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseModal.vue:9
 #: frontend/src/pages/Programs/ProgramForm.vue:233
 #: frontend/src/pages/QuizForm.vue:43 frontend/src/pages/QuizSubmission.vue:14
@@ -5874,11 +5952,11 @@ msgstr ""
 msgid "Schedule"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:13
+#: frontend/src/components/UpcomingEvaluations.vue:8
 msgid "Schedule Evaluation"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:103
+#: frontend/src/components/UpcomingEvaluations.vue:118
 msgid "Schedule an evaluation to get certified."
 msgstr ""
 
@@ -5921,11 +5999,11 @@ msgid "Search by Name"
 msgstr ""
 
 #: frontend/src/pages/Batches.vue:82 frontend/src/pages/Courses.vue:67
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:44
 msgid "Search by Title"
 msgstr ""
 
 #: frontend/src/pages/Assignments.vue:34
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:47
 msgid "Search by title"
 msgstr ""
 
@@ -5948,7 +6026,7 @@ msgstr ""
 msgid "Seat Left"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:86
+#: lms/lms/doctype/lms_batch/lms_batch.py:92
 msgid "Seat count cannot be negative."
 msgstr ""
 
@@ -6006,6 +6084,18 @@ msgstr ""
 msgid "Send Email to {0}"
 msgstr ""
 
+#. Label of the send_notification_for_published_batches (Select) field in
+#. DocType 'LMS Settings'
+#: lms/lms/doctype/lms_settings/lms_settings.json
+msgid "Send Notification for Published Batches"
+msgstr ""
+
+#. Label of the send_notification_for_published_courses (Select) field in
+#. DocType 'LMS Settings'
+#: lms/lms/doctype/lms_settings/lms_settings.json
+msgid "Send Notification for Published Courses"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -6028,17 +6118,17 @@ msgstr ""
 msgid "Set your Password"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:515
+#: frontend/src/components/Sidebar/AppSidebar.vue:516
 msgid "Setting up"
 msgstr ""
 
-#: frontend/src/components/Sidebar/AppSidebar.vue:565
+#: frontend/src/components/Sidebar/AppSidebar.vue:566
 msgid "Setting up payment gateway"
 msgstr ""
 
 #: frontend/src/components/Settings/Settings.vue:9
-#: frontend/src/components/Sidebar/AppSidebar.vue:570
-#: frontend/src/pages/BatchForm.vue:53 frontend/src/pages/CourseForm.vue:142
+#: frontend/src/components/Sidebar/AppSidebar.vue:571
+#: frontend/src/pages/BatchForm.vue:53 frontend/src/pages/CourseForm.vue:95
 #: frontend/src/pages/ProfileRoles.vue:4
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue:19
 #: frontend/src/pages/QuizForm.vue:86
@@ -6054,7 +6144,7 @@ msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:188
+#: frontend/src/pages/CourseForm.vue:141
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
@@ -6069,7 +6159,7 @@ msgid "Show Answer"
 msgstr ""
 
 #. Label of the show_answers (Check) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:93 frontend/src/pages/Quizzes.vue:271
+#: frontend/src/pages/QuizForm.vue:93 frontend/src/pages/Quizzes.vue:274
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Show Answers"
 msgstr ""
@@ -6277,7 +6367,7 @@ msgstr ""
 #: frontend/src/components/Settings/ZoomSettings.vue:197
 #: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobForm.vue:53
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:280
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:281
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/job/web_form/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -6315,7 +6405,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:204
+#: frontend/src/components/BatchStudents.vue:220
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -6353,7 +6443,7 @@ msgstr ""
 msgid "Submission saved!"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:254
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue:255
 msgid "Submissions deleted successfully"
 msgstr ""
 
@@ -6395,7 +6485,7 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: lms/lms/api.py:989
+#: lms/lms/api.py:995
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -6491,7 +6581,7 @@ msgstr ""
 #. Label of the test_cases (Table) field in DocType 'LMS Programming Exercise'
 #. Label of the test_cases (Table) field in DocType 'LMS Programming Exercise
 #. Submission'
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:29
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:34
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue:83
 #: lms/lms/doctype/lms_programming_exercise/lms_programming_exercise.json
 #: lms/lms/doctype/lms_programming_exercise_submission/lms_programming_exercise_submission.json
@@ -6502,7 +6592,7 @@ msgstr ""
 msgid "Test Quiz"
 msgstr ""
 
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:82
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:86
 msgid "Test this Exercise"
 msgstr ""
 
@@ -6528,7 +6618,7 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
-#: lms/lms/utils.py:2109
+#: lms/lms/utils.py:2247
 msgid "The batch does not exist."
 msgstr ""
 
@@ -6536,7 +6626,7 @@ msgstr ""
 msgid "The batch you have enrolled for is starting tomorrow. Please be prepared and be on time for the session."
 msgstr ""
 
-#: lms/lms/utils.py:1609
+#: lms/lms/utils.py:1747
 msgid "The coupon code '{0}' is invalid."
 msgstr ""
 
@@ -6544,15 +6634,23 @@ msgstr ""
 msgid "The course {0} is now available on {1}."
 msgstr ""
 
+#: frontend/src/components/UpcomingEvaluations.vue:26
+msgid "The deadline to schedule evaluations has passed. Please contact the Instructor for assistance."
+msgstr ""
+
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.py:56
 msgid "The evaluator of this course is unavailable from {0} to {1}. Please select a date after {1}"
 msgstr ""
 
-#: frontend/src/pages/Batch.vue:151
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:67
+msgid "The instructor has left a comment on your assignment {0}"
+msgstr ""
+
+#: frontend/src/components/UpcomingEvaluations.vue:15
 msgid "The last day to schedule your evaluations is "
 msgstr ""
 
-#: lms/lms/utils.py:2093
+#: lms/lms/utils.py:2231
 msgid "The lesson does not exist."
 msgstr ""
 
@@ -6560,7 +6658,7 @@ msgstr ""
 msgid "The slot is already booked by another participant."
 msgstr ""
 
-#: lms/lms/utils.py:1806
+#: lms/lms/utils.py:1361 lms/lms/utils.py:1477 lms/lms/utils.py:1944
 msgid "The specified batch does not exist."
 msgstr ""
 
@@ -6576,12 +6674,12 @@ msgstr ""
 msgid "There are no courses currently. Create your first course to get started!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:90
+#: lms/lms/doctype/lms_batch/lms_batch.py:96
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:74
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:94
+#: frontend/src/components/BatchStudents.vue:99
 msgid "There are no students in this batch."
 msgstr ""
 
@@ -6597,10 +6695,6 @@ msgstr ""
 msgid "There are no {0} on this site."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:67
-msgid "There has been an update on your submission for assignment {0}"
-msgstr ""
-
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:59
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -6630,15 +6724,15 @@ msgstr ""
 msgid "This class has ended"
 msgstr ""
 
-#: lms/lms/utils.py:1638
+#: lms/lms/utils.py:1776
 msgid "This coupon has expired."
 msgstr ""
 
-#: lms/lms/utils.py:1641
+#: lms/lms/utils.py:1779
 msgid "This coupon has reached its maximum usage limit."
 msgstr ""
 
-#: lms/lms/utils.py:1650
+#: lms/lms/utils.py:1788
 msgid "This coupon is not applicable to this {0}."
 msgstr ""
 
@@ -6646,7 +6740,7 @@ msgstr ""
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1569
+#: lms/lms/utils.py:1707
 msgid "This course is free."
 msgstr ""
 
@@ -6735,6 +6829,10 @@ msgstr ""
 msgid "Time must be in 24 hour format (HH:mm). Example 11:30 or 22:00"
 msgstr ""
 
+#: lms/templates/emails/published_batch_notification.html:29
+msgid "Time: "
+msgstr ""
+
 #. Label of the schedule_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the timetable (Table) field in DocType 'LMS Batch'
 #. Label of the timetable (Table) field in DocType 'LMS Timetable Template'
@@ -6761,7 +6859,7 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Course'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:59
-#: frontend/src/pages/BatchForm.vue:114 frontend/src/pages/CourseForm.vue:288
+#: frontend/src/pages/BatchForm.vue:114 frontend/src/pages/CourseForm.vue:241
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -6798,10 +6896,11 @@ msgstr ""
 #: frontend/src/components/Settings/BadgeForm.vue:19
 #: frontend/src/pages/Assignments.vue:167 frontend/src/pages/BatchForm.vue:27
 #: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:17
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseForm.vue:22
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:270
 #: frontend/src/pages/Programs/ProgramForm.vue:25
 #: frontend/src/pages/QuizForm.vue:56 frontend/src/pages/Quizzes.vue:117
-#: frontend/src/pages/Quizzes.vue:244
+#: frontend/src/pages/Quizzes.vue:247
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -6833,7 +6932,7 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1583
+#: lms/lms/utils.py:1721
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
@@ -6846,7 +6945,7 @@ msgid "Total"
 msgstr ""
 
 #. Label of the total_marks (Int) field in DocType 'LMS Quiz'
-#: frontend/src/pages/QuizForm.vue:73 frontend/src/pages/Quizzes.vue:250
+#: frontend/src/pages/QuizForm.vue:73 frontend/src/pages/Quizzes.vue:253
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
 msgid "Total Marks"
 msgstr ""
@@ -6900,7 +6999,7 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:44
 #: frontend/src/pages/Assignments.vue:40 frontend/src/pages/Assignments.vue:172
 #: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:83
-#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:53
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:51
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/job/web_form/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -6976,14 +7075,14 @@ msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
 #. Label of the upcoming (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/Batches.vue:328 frontend/src/pages/CourseForm.vue:164
+#: frontend/src/pages/Batches.vue:328 frontend/src/pages/CourseForm.vue:117
 #: frontend/src/pages/Courses.vue:347
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
 msgstr ""
 
-#: frontend/src/pages/Batch.vue:204 frontend/src/pages/Home/AdminHome.vue:34
+#: frontend/src/pages/Batch.vue:191 frontend/src/pages/Home/AdminHome.vue:34
 msgid "Upcoming Batches"
 msgstr ""
 
@@ -6998,7 +7097,7 @@ msgid "Upcoming Live Classes"
 msgstr ""
 
 #: frontend/src/components/Settings/BrandSettings.vue:24
-#: frontend/src/components/Settings/SettingDetails.vue:23
+#: frontend/src/components/Settings/SettingDetails.vue:17
 msgid "Update"
 msgstr ""
 
@@ -7006,8 +7105,11 @@ msgstr ""
 msgid "Update Password"
 msgstr ""
 
-#: frontend/src/components/Controls/Uploader.vue:20
-#: frontend/src/pages/BatchForm.vue:227 frontend/src/pages/CourseForm.vue:100
+#: frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue:281
+msgid "Updated On"
+msgstr ""
+
+#: frontend/src/components/Controls/Uploader.vue:23
 msgid "Upload"
 msgstr ""
 
@@ -7111,10 +7213,6 @@ msgstr ""
 msgid "Video Statistics for {0}"
 msgstr ""
 
-#: frontend/src/pages/Notifications.vue:39
-msgid "View"
-msgstr ""
-
 #: frontend/src/pages/JobDetail.vue:31
 msgid "View Applications"
 msgstr ""
@@ -7274,19 +7372,19 @@ msgstr ""
 msgid "You are already certified for this course. Click on the card below to open your certificate."
 msgstr ""
 
-#: lms/lms/api.py:120
+#: lms/lms/api.py:126
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:114
+#: lms/lms/api.py:120
 msgid "You are already enrolled for this course."
 msgstr ""
 
-#: frontend/src/pages/Batch.vue:186
+#: frontend/src/pages/Batch.vue:173
 msgid "You are not a member of this batch. Please checkout our upcoming batches."
 msgstr ""
 
-#: lms/lms/doctype/lms_certificate/lms_certificate.py:165
+#: lms/lms/doctype/lms_certificate/lms_certificate.py:170
 msgid "You are not enrolled in this course."
 msgstr ""
 
@@ -7327,7 +7425,7 @@ msgstr ""
 msgid "You cannot enroll in an unpublished course."
 msgstr ""
 
-#: lms/lms/utils.py:1947
+#: lms/lms/utils.py:2085
 msgid "You cannot enroll in an unpublished program."
 msgstr ""
 
@@ -7343,11 +7441,11 @@ msgstr ""
 msgid "You cannot schedule evaluations for past slots."
 msgstr ""
 
-#: lms/lms/utils.py:2121
+#: lms/lms/utils.py:2259
 msgid "You do not have access to this batch."
 msgstr ""
 
-#: lms/lms/utils.py:2104
+#: lms/lms/utils.py:2242
 msgid "You do not have access to this course."
 msgstr ""
 
@@ -7355,7 +7453,7 @@ msgstr ""
 msgid "You do not have permission to access this page."
 msgstr ""
 
-#: lms/lms/api.py:1438 lms/lms/api.py:1442
+#: lms/lms/api.py:1506 lms/lms/api.py:1510
 msgid "You do not have permission to update meta tags."
 msgstr ""
 
@@ -7380,7 +7478,7 @@ msgstr ""
 msgid "You have already exceeded the maximum number of attempts allowed for this quiz."
 msgstr ""
 
-#: lms/lms/api.py:144
+#: lms/lms/api.py:150
 msgid "You have already purchased the certificate for this course."
 msgstr ""
 
@@ -7396,7 +7494,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:234
+#: frontend/src/components/CourseCardOverlay.vue:235
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -7408,7 +7506,7 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: lms/lms/doctype/lms_certificate/lms_certificate.py:174
+#: lms/lms/doctype/lms_certificate/lms_certificate.py:179
 msgid "You have not completed the course yet."
 msgstr ""
 
@@ -7448,7 +7546,7 @@ msgstr ""
 msgid "You need to complete the payment for this course before enrolling."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:218
+#: frontend/src/components/CourseCardOverlay.vue:219
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -7492,10 +7590,14 @@ msgstr ""
 msgid "Your Output"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:297
+#: lms/lms/doctype/lms_batch/lms_batch.py:374
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
+#: frontend/src/components/Controls/Uploader.vue:41
+msgid "Your browser does not support the video tag."
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:143
 msgid "Your calendar is set."
 msgstr ""
@@ -7545,11 +7647,11 @@ msgstr ""
 msgid "Zoom Account"
 msgstr ""
 
-#: frontend/src/components/Modals/ZoomAccountModal.vue:159
+#: frontend/src/components/Modals/ZoomAccountModal.vue:162
 msgid "Zoom Account created successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ZoomAccountModal.vue:197
+#: frontend/src/components/Modals/ZoomAccountModal.vue:200
 msgid "Zoom Account updated successfully"
 msgstr ""
 
@@ -7626,7 +7728,7 @@ msgstr ""
 msgid "days"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:290
+#: frontend/src/pages/CourseForm.vue:243
 msgid "e.g. IST, UTC, GMT..."
 msgstr ""
 
@@ -7688,7 +7790,7 @@ msgstr ""
 msgid "others"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:346
+#: frontend/src/pages/QuizForm.vue:344
 msgid "question_detail"
 msgstr ""
 
@@ -7704,6 +7806,11 @@ msgstr ""
 msgid "students"
 msgstr ""
 
+#: lms/templates/emails/published_batch_notification.html:7
+#: lms/templates/emails/published_course_notification.html:7
+msgid "that might interest you!"
+msgstr ""
+
 #: frontend/src/components/CommandPalette/CommandPalette.vue:59
 msgid "to close"
 msgstr ""
@@ -7740,7 +7847,7 @@ msgstr ""
 msgid "{0} Quizzes"
 msgstr ""
 
-#: lms/lms/api.py:745 lms/lms/api.py:753
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
@@ -7752,6 +7859,14 @@ msgstr ""
 msgid "{0} has applied for the job position {1}"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:186
+msgid "{0} has published a new batch {1}"
+msgstr ""
+
+#: lms/lms/doctype/lms_course/lms_course.py:195
+msgid "{0} has published a new course {1}"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:4
 msgid "{0} has reported a job post for the following reason."
 msgstr ""
@@ -7764,11 +7879,11 @@ msgstr ""
 msgid "{0} is already a mentor for course {1}"
 msgstr ""
 
-#: lms/lms/doctype/lms_certificate/lms_certificate.py:89
+#: lms/lms/doctype/lms_certificate/lms_certificate.py:94
 msgid "{0} is already certified for the batch {1}"
 msgstr ""
 
-#: lms/lms/doctype/lms_certificate/lms_certificate.py:70
+#: lms/lms/doctype/lms_certificate/lms_certificate.py:75
 msgid "{0} is already certified for the course {1}"
 msgstr ""
 
@@ -7776,7 +7891,7 @@ msgstr ""
 msgid "{0} is your evaluator"
 msgstr ""
 
-#: lms/lms/utils.py:490
+#: lms/lms/utils.py:516
 msgid "{0} mentioned you in a comment"
 msgstr ""
 
@@ -7784,11 +7899,11 @@ msgstr ""
 msgid "{0} mentioned you in a comment in your batch."
 msgstr ""
 
-#: lms/lms/utils.py:447 lms/lms/utils.py:451
+#: lms/lms/utils.py:469 lms/lms/utils.py:475
 msgid "{0} mentioned you in a comment in {1}"
 msgstr ""
 
-#: lms/lms/api.py:794
+#: lms/lms/api.py:800
 msgid "{0} not found"
 msgstr ""
 
diff --git a/lms/locale/ru.po b/lms/locale/ru.po
index 278312e2..b9b4ca9a 100644
--- a/lms/locale/ru.po
+++ b/lms/locale/ru.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
 "POT-Creation-Date: 2026-01-13 05:34+0000\n"
-"PO-Revision-Date: 2026-01-13 19:44\n"
+"PO-Revision-Date: 2026-01-14 19:44\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -2412,7 +2412,7 @@ msgstr "Регистрация на программу {0}"
 #. Label of the enrollment_from_batch (Link) field in DocType 'LMS Enrollment'
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Enrollment from Batch"
-msgstr ""
+msgstr "Зачисление из группы"
 
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:57
 msgid "Enrollment in this batch is restricted. Please contact the Administrator."
@@ -2730,7 +2730,7 @@ msgstr "Тип файла"
 
 #: frontend/src/components/AssessmentPlugin.vue:54
 msgid "Filter assignments by course"
-msgstr ""
+msgstr "Фильтруйте задания по курсу"
 
 #: frontend/src/components/Settings/Transactions/TransactionList.vue:15
 msgid "Filter by Billing Name"
@@ -3031,7 +3031,7 @@ msgstr "Подсвеченный текст"
 #: frontend/src/pages/CertifiedParticipants.vue:52
 #: frontend/src/pages/Profile.vue:70 lms/fixtures/custom_field.json
 msgid "Hiring"
-msgstr ""
+msgstr "Набор персонала"
 
 #: frontend/src/pages/Home/Home.vue:5 frontend/src/pages/Home/Home.vue:154
 msgid "Home"
@@ -3062,7 +3062,7 @@ msgstr "Я недоступен"
 
 #: frontend/src/pages/Billing.vue:181
 msgid "I consent to my personal information being stored for invoicing"
-msgstr ""
+msgstr "Я даю согласие на хранение моих персональных данных для выставления счетов"
 
 #: frontend/src/pages/QuizForm.vue:340
 msgid "ID"
@@ -3900,7 +3900,7 @@ msgstr "Самая длинная серия"
 
 #: frontend/src/components/Modals/EditProfile.vue:95
 msgid "Looking for new work or hiring talent?"
-msgstr ""
+msgstr "Ищете новую работу или нанимаете талантливых сотрудников?"
 
 #: lms/templates/emails/payment_reminder.html:23
 msgid "Looking forward to seeing you enrolled!"
@@ -4065,7 +4065,7 @@ msgstr "Участник"
 #. Label of the member_consent (Check) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Member Consent"
-msgstr ""
+msgstr "Согласие участника"
 
 #. Label of the member_count (Int) field in DocType 'LMS Program'
 #: lms/lms/doctype/lms_program/lms_program.json
@@ -4696,7 +4696,7 @@ msgstr "Откройте "
 #: frontend/src/components/Modals/EditProfile.vue:94
 #: lms/fixtures/custom_field.json
 msgid "Open to"
-msgstr ""
+msgstr "Открыто для"
 
 #: frontend/src/components/UserAvatar.vue:11
 #: frontend/src/pages/CertifiedParticipants.vue:46
@@ -5054,7 +5054,7 @@ msgstr "Запишитесь на этот курс, чтобы просмотр
 
 #: frontend/src/pages/Billing.vue:99
 msgid "Please ensure that the billing name you enter is correct, as it will be used on your invoice."
-msgstr ""
+msgstr "Пожалуйста, убедитесь, что указанное вами имя плательщика верное, так как оно будет использовано в вашем счете."
 
 #: frontend/src/components/Quiz.vue:16
 msgid "Please ensure that you complete all the questions in {0} minutes."
@@ -5132,11 +5132,11 @@ msgstr "Пожалуйста, хорошо подготовьтесь и при
 
 #: frontend/src/pages/Billing.vue:194
 msgid "Please provide your consent to proceed with the payment"
-msgstr ""
+msgstr "Пожалуйста, подтвердите свое согласие на продолжение оплаты"
 
 #: frontend/src/pages/Billing.vue:337
 msgid "Please provide your consent to proceed with the payment."
-msgstr ""
+msgstr "Пожалуйста, подтвердите свое согласие на продолжение оплаты."
 
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue:139
 msgid "Please run the code to execute the test cases."
@@ -5989,7 +5989,7 @@ msgstr "Выберите тест"
 #: frontend/src/components/AssessmentPlugin.vue:41
 #: frontend/src/components/AssessmentPlugin.vue:49
 msgid "Select an Assignment"
-msgstr ""
+msgstr "Выберите задание"
 
 #: frontend/src/components/ContactUsEmail.vue:33
 #: frontend/src/pages/JobApplications.vue:115
@@ -7796,7 +7796,7 @@ msgstr "{0} не найден"
 
 #: frontend/src/pages/Jobs.vue:33
 msgid "{0} {1} Jobs"
-msgstr ""
+msgstr "{0} {1} Работа"
 
 #. Count format of shortcut in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
diff --git a/lms/locale/sr.po b/lms/locale/sr.po
index 481be63b..679ffabe 100644
--- a/lms/locale/sr.po
+++ b/lms/locale/sr.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
 "POT-Creation-Date: 2026-01-13 05:34+0000\n"
-"PO-Revision-Date: 2026-01-13 19:44\n"
+"PO-Revision-Date: 2026-01-14 19:44\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Serbian (Cyrillic)\n"
 "MIME-Version: 1.0\n"
@@ -2412,7 +2412,7 @@ msgstr "Упис у програм {0}"
 #. Label of the enrollment_from_batch (Link) field in DocType 'LMS Enrollment'
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Enrollment from Batch"
-msgstr ""
+msgstr "Упис из групе"
 
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:57
 msgid "Enrollment in this batch is restricted. Please contact the Administrator."
@@ -2730,7 +2730,7 @@ msgstr "Врста фајла"
 
 #: frontend/src/components/AssessmentPlugin.vue:54
 msgid "Filter assignments by course"
-msgstr ""
+msgstr "Филтрирај задатке према обуци"
 
 #: frontend/src/components/Settings/Transactions/TransactionList.vue:15
 msgid "Filter by Billing Name"
@@ -3031,7 +3031,7 @@ msgstr "Истакнути текст"
 #: frontend/src/pages/CertifiedParticipants.vue:52
 #: frontend/src/pages/Profile.vue:70 lms/fixtures/custom_field.json
 msgid "Hiring"
-msgstr ""
+msgstr "Запошљавање"
 
 #: frontend/src/pages/Home/Home.vue:5 frontend/src/pages/Home/Home.vue:154
 msgid "Home"
@@ -3062,7 +3062,7 @@ msgstr "Нисам доступан"
 
 #: frontend/src/pages/Billing.vue:181
 msgid "I consent to my personal information being stored for invoicing"
-msgstr ""
+msgstr "Слажем се да се моји лични подаци чувају за фактурисање"
 
 #: frontend/src/pages/QuizForm.vue:340
 msgid "ID"
@@ -3900,7 +3900,7 @@ msgstr "Најдужи низ дана"
 
 #: frontend/src/components/Modals/EditProfile.vue:95
 msgid "Looking for new work or hiring talent?"
-msgstr ""
+msgstr "Тражите нови посао или запошљавате таленте?"
 
 #: lms/templates/emails/payment_reminder.html:23
 msgid "Looking forward to seeing you enrolled!"
@@ -4065,7 +4065,7 @@ msgstr "Члан"
 #. Label of the member_consent (Check) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Member Consent"
-msgstr ""
+msgstr "Сагласност члана"
 
 #. Label of the member_count (Int) field in DocType 'LMS Program'
 #: lms/lms/doctype/lms_program/lms_program.json
@@ -4696,7 +4696,7 @@ msgstr "Отвори "
 #: frontend/src/components/Modals/EditProfile.vue:94
 #: lms/fixtures/custom_field.json
 msgid "Open to"
-msgstr ""
+msgstr "Отворен за"
 
 #: frontend/src/components/UserAvatar.vue:11
 #: frontend/src/pages/CertifiedParticipants.vue:46
@@ -5054,7 +5054,7 @@ msgstr "Молимо Вас да се упишете на ову обуку да
 
 #: frontend/src/pages/Billing.vue:99
 msgid "Please ensure that the billing name you enter is correct, as it will be used on your invoice."
-msgstr ""
+msgstr "Молимо Вас да проверите да ли је назив за фактурисање које уносите тачно, јер ће бити коришћено на Вашој фактури."
 
 #: frontend/src/components/Quiz.vue:16
 msgid "Please ensure that you complete all the questions in {0} minutes."
@@ -5132,11 +5132,11 @@ msgstr "Молимо Вас да се добро припремите и сти
 
 #: frontend/src/pages/Billing.vue:194
 msgid "Please provide your consent to proceed with the payment"
-msgstr ""
+msgstr "Молимо Вас да дате сагласност како бисте наставили са плаћањем"
 
 #: frontend/src/pages/Billing.vue:337
 msgid "Please provide your consent to proceed with the payment."
-msgstr ""
+msgstr "Молимо Вас да дате сагласност како бисте наставили са плаћањем."
 
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue:139
 msgid "Please run the code to execute the test cases."
@@ -5989,7 +5989,7 @@ msgstr "Изаберите квиз"
 #: frontend/src/components/AssessmentPlugin.vue:41
 #: frontend/src/components/AssessmentPlugin.vue:49
 msgid "Select an Assignment"
-msgstr ""
+msgstr "Изаберите задатак"
 
 #: frontend/src/components/ContactUsEmail.vue:33
 #: frontend/src/pages/JobApplications.vue:115
@@ -7796,7 +7796,7 @@ msgstr "{0} није пронађено"
 
 #: frontend/src/pages/Jobs.vue:33
 msgid "{0} {1} Jobs"
-msgstr ""
+msgstr "{0} {1} послова"
 
 #. Count format of shortcut in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
diff --git a/lms/locale/sr_CS.po b/lms/locale/sr_CS.po
index be704a84..a1be316c 100644
--- a/lms/locale/sr_CS.po
+++ b/lms/locale/sr_CS.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
 "POT-Creation-Date: 2026-01-13 05:34+0000\n"
-"PO-Revision-Date: 2026-01-13 19:44\n"
+"PO-Revision-Date: 2026-01-14 19:44\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Serbian (Latin)\n"
 "MIME-Version: 1.0\n"
@@ -2412,7 +2412,7 @@ msgstr "Upis u program {0}"
 #. Label of the enrollment_from_batch (Link) field in DocType 'LMS Enrollment'
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Enrollment from Batch"
-msgstr ""
+msgstr "Upis iz grupe"
 
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:57
 msgid "Enrollment in this batch is restricted. Please contact the Administrator."
@@ -2730,7 +2730,7 @@ msgstr "Vrsta fajla"
 
 #: frontend/src/components/AssessmentPlugin.vue:54
 msgid "Filter assignments by course"
-msgstr ""
+msgstr "Filtriraj zadatke prema obuci"
 
 #: frontend/src/components/Settings/Transactions/TransactionList.vue:15
 msgid "Filter by Billing Name"
@@ -3031,7 +3031,7 @@ msgstr "Istaknuti tekst"
 #: frontend/src/pages/CertifiedParticipants.vue:52
 #: frontend/src/pages/Profile.vue:70 lms/fixtures/custom_field.json
 msgid "Hiring"
-msgstr ""
+msgstr "Zapošljavanje"
 
 #: frontend/src/pages/Home/Home.vue:5 frontend/src/pages/Home/Home.vue:154
 msgid "Home"
@@ -3062,7 +3062,7 @@ msgstr "Nisam dostupan"
 
 #: frontend/src/pages/Billing.vue:181
 msgid "I consent to my personal information being stored for invoicing"
-msgstr ""
+msgstr "Slažem se da se moji lični podaci čuvaju za fakturisanje"
 
 #: frontend/src/pages/QuizForm.vue:340
 msgid "ID"
@@ -3900,7 +3900,7 @@ msgstr "Najduži niz dana"
 
 #: frontend/src/components/Modals/EditProfile.vue:95
 msgid "Looking for new work or hiring talent?"
-msgstr ""
+msgstr "Tražite novi posao ili zapošljavate talente?"
 
 #: lms/templates/emails/payment_reminder.html:23
 msgid "Looking forward to seeing you enrolled!"
@@ -4065,7 +4065,7 @@ msgstr "Član"
 #. Label of the member_consent (Check) field in DocType 'LMS Payment'
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Member Consent"
-msgstr ""
+msgstr "Saglasnost člana"
 
 #. Label of the member_count (Int) field in DocType 'LMS Program'
 #: lms/lms/doctype/lms_program/lms_program.json
@@ -4696,7 +4696,7 @@ msgstr "Otvori "
 #: frontend/src/components/Modals/EditProfile.vue:94
 #: lms/fixtures/custom_field.json
 msgid "Open to"
-msgstr ""
+msgstr "Otvoren za"
 
 #: frontend/src/components/UserAvatar.vue:11
 #: frontend/src/pages/CertifiedParticipants.vue:46
@@ -5054,7 +5054,7 @@ msgstr "Molimo Vas da se upišete na ovu obuku da biste pristupili lekciji"
 
 #: frontend/src/pages/Billing.vue:99
 msgid "Please ensure that the billing name you enter is correct, as it will be used on your invoice."
-msgstr ""
+msgstr "Molimo Vas da proverite da li je naziv za fakturisanje koje unosite tačno, jer će biti korišćeno na Vašoj fakturi."
 
 #: frontend/src/components/Quiz.vue:16
 msgid "Please ensure that you complete all the questions in {0} minutes."
@@ -5132,11 +5132,11 @@ msgstr "Molimo Vas da se dobro pripremite i stignete na vreme za ocenjivanje."
 
 #: frontend/src/pages/Billing.vue:194
 msgid "Please provide your consent to proceed with the payment"
-msgstr ""
+msgstr "Molimo Vas da date saglasnost kako biste nastavili sa plaćanjem"
 
 #: frontend/src/pages/Billing.vue:337
 msgid "Please provide your consent to proceed with the payment."
-msgstr ""
+msgstr "Molimo Vas da date saglasnost kako biste nastavili sa plaćanjem."
 
 #: frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue:139
 msgid "Please run the code to execute the test cases."
@@ -5989,7 +5989,7 @@ msgstr "Izaberite kviz"
 #: frontend/src/components/AssessmentPlugin.vue:41
 #: frontend/src/components/AssessmentPlugin.vue:49
 msgid "Select an Assignment"
-msgstr ""
+msgstr "Izaberite zadatak"
 
 #: frontend/src/components/ContactUsEmail.vue:33
 #: frontend/src/pages/JobApplications.vue:115
@@ -7796,7 +7796,7 @@ msgstr "{0} nije pronađeno"
 
 #: frontend/src/pages/Jobs.vue:33
 msgid "{0} {1} Jobs"
-msgstr ""
+msgstr "{0} {1} poslova"
 
 #. Count format of shortcut in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
diff --git a/lms/test_auth.py b/lms/test_auth.py
new file mode 100644
index 00000000..42569cbd
--- /dev/null
+++ b/lms/test_auth.py
@@ -0,0 +1,36 @@
+import frappe
+from frappe.tests import UnitTestCase
+from frappe.tests.test_api import FrappeAPITestCase
+
+from lms.auth import authenticate
+from lms.lms.test_utils import TestUtils
+
+
+class TestAuth(FrappeAPITestCase):
+	def setUp(self):
+		self.normal_user = TestUtils.create_user(
+			self, "normal-user@example.com", "Normal", "User", ["LMS Student"]
+		)
+
+	def test_allowed_path(self):
+		site_url = frappe.utils.get_site_url(frappe.local.site)
+		headers = {"Authorization": "Bearer set_test_example_user"}
+		url = site_url + "/api/method/lms.lms.utils.get_courses"
+		response = self.get(
+			url,
+			headers=headers,
+		)
+		self.assertNotEqual(response.json.get("exc_type"), "PermissionError")
+
+	def test_not_allowed_path(self):
+		site_url = frappe.utils.get_site_url(frappe.local.site)
+		headers = {"Authorization": "Bearer set_test_example_user"}
+		url = site_url + "/api/method/frappe.auth.get_logged_user"
+		response = self.get(
+			url,
+			headers=headers,
+		)
+		self.assertEqual(response.json.get("exc_type"), "PermissionError")
+
+	def tearDown(self):
+		frappe.delete_doc("User", self.normal_user.name)