diff --git a/frontend/components.d.ts b/frontend/components.d.ts
new file mode 100644
index 00000000..bd14c7fb
--- /dev/null
+++ b/frontend/components.d.ts
@@ -0,0 +1,95 @@
+/* eslint-disable */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
+export {}
+
+/* prettier-ignore */
+declare module 'vue' {
+  export interface GlobalComponents {
+    Annoucements: typeof import('./src/components/Annoucements.vue')['default']
+    AnnouncementModal: typeof import('./src/components/Modals/AnnouncementModal.vue')['default']
+    Apps: typeof import('./src/components/Apps.vue')['default']
+    AppSidebar: typeof import('./src/components/AppSidebar.vue')['default']
+    AssessmentModal: typeof import('./src/components/Modals/AssessmentModal.vue')['default']
+    AssessmentPlugin: typeof import('./src/components/AssessmentPlugin.vue')['default']
+    Assessments: typeof import('./src/components/Assessments.vue')['default']
+    Assignment: typeof import('./src/components/Assignment.vue')['default']
+    AssignmentBlock: typeof import('./src/components/AssignmentBlock.vue')['default']
+    AudioBlock: typeof import('./src/components/AudioBlock.vue')['default']
+    Autocomplete: typeof import('./src/components/Controls/Autocomplete.vue')['default']
+    BatchCard: typeof import('./src/components/BatchCard.vue')['default']
+    BatchCourseModal: typeof import('./src/components/Modals/BatchCourseModal.vue')['default']
+    BatchCourses: typeof import('./src/components/BatchCourses.vue')['default']
+    BatchDashboard: typeof import('./src/components/BatchDashboard.vue')['default']
+    BatchFeedback: typeof import('./src/components/BatchFeedback.vue')['default']
+    BatchIcon: typeof import('./src/components/Icons/BatchIcon.vue')['default']
+    BatchOverlay: typeof import('./src/components/BatchOverlay.vue')['default']
+    BatchStudentProgress: typeof import('./src/components/Modals/BatchStudentProgress.vue')['default']
+    BatchStudents: typeof import('./src/components/BatchStudents.vue')['default']
+    BrandSettings: typeof import('./src/components/BrandSettings.vue')['default']
+    BulkCertificates: typeof import('./src/components/Modals/BulkCertificates.vue')['default']
+    Categories: typeof import('./src/components/Categories.vue')['default']
+    CertificationLinks: typeof import('./src/components/CertificationLinks.vue')['default']
+    ChapterModal: typeof import('./src/components/Modals/ChapterModal.vue')['default']
+    CodeEditor: typeof import('./src/components/Controls/CodeEditor.vue')['default']
+    CollapseSidebar: typeof import('./src/components/Icons/CollapseSidebar.vue')['default']
+    CourseCard: typeof import('./src/components/CourseCard.vue')['default']
+    CourseCardOverlay: typeof import('./src/components/CourseCardOverlay.vue')['default']
+    CourseInstructors: typeof import('./src/components/CourseInstructors.vue')['default']
+    CourseOutline: typeof import('./src/components/CourseOutline.vue')['default']
+    CourseReviews: typeof import('./src/components/CourseReviews.vue')['default']
+    CreateOutline: typeof import('./src/components/CreateOutline.vue')['default']
+    DateRange: typeof import('./src/components/Common/DateRange.vue')['default']
+    DesktopLayout: typeof import('./src/components/DesktopLayout.vue')['default']
+    DiscussionModal: typeof import('./src/components/Modals/DiscussionModal.vue')['default']
+    DiscussionReplies: typeof import('./src/components/DiscussionReplies.vue')['default']
+    Discussions: typeof import('./src/components/Discussions.vue')['default']
+    EditCoverImage: typeof import('./src/components/Modals/EditCoverImage.vue')['default']
+    EditProfile: typeof import('./src/components/Modals/EditProfile.vue')['default']
+    EvaluationModal: typeof import('./src/components/Modals/EvaluationModal.vue')['default']
+    Event: typeof import('./src/components/Modals/Event.vue')['default']
+    ExplanationVideos: typeof import('./src/components/Modals/ExplanationVideos.vue')['default']
+    FrappeCloudIcon: typeof import('./src/components/Icons/FrappeCloudIcon.vue')['default']
+    IconPicker: typeof import('./src/components/Controls/IconPicker.vue')['default']
+    IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default']
+    JobApplicationModal: typeof import('./src/components/Modals/JobApplicationModal.vue')['default']
+    JobCard: typeof import('./src/components/JobCard.vue')['default']
+    LessonContent: typeof import('./src/components/LessonContent.vue')['default']
+    LessonHelp: typeof import('./src/components/LessonHelp.vue')['default']
+    Link: typeof import('./src/components/Controls/Link.vue')['default']
+    LiveClass: typeof import('./src/components/LiveClass.vue')['default']
+    LiveClassModal: typeof import('./src/components/Modals/LiveClassModal.vue')['default']
+    LMSLogo: typeof import('./src/components/Icons/LMSLogo.vue')['default']
+    Members: typeof import('./src/components/Members.vue')['default']
+    MobileLayout: typeof import('./src/components/MobileLayout.vue')['default']
+    MultiSelect: typeof import('./src/components/Controls/MultiSelect.vue')['default']
+    NoPermission: typeof import('./src/components/NoPermission.vue')['default']
+    NotPermitted: typeof import('./src/components/NotPermitted.vue')['default']
+    OnboardingBanner: typeof import('./src/components/OnboardingBanner.vue')['default']
+    PageModal: typeof import('./src/components/Modals/PageModal.vue')['default']
+    PaymentSettings: typeof import('./src/components/PaymentSettings.vue')['default']
+    ProgressBar: typeof import('./src/components/ProgressBar.vue')['default']
+    Question: typeof import('./src/components/Modals/Question.vue')['default']
+    Quiz: typeof import('./src/components/Quiz.vue')['default']
+    QuizBlock: typeof import('./src/components/QuizBlock.vue')['default']
+    Rating: typeof import('./src/components/Controls/Rating.vue')['default']
+    ReviewModal: typeof import('./src/components/Modals/ReviewModal.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+    SettingDetails: typeof import('./src/components/SettingDetails.vue')['default']
+    SettingFields: typeof import('./src/components/SettingFields.vue')['default']
+    Settings: typeof import('./src/components/Modals/Settings.vue')['default']
+    SidebarLink: typeof import('./src/components/SidebarLink.vue')['default']
+    StudentHeatmap: typeof import('./src/components/StudentHeatmap.vue')['default']
+    StudentModal: typeof import('./src/components/Modals/StudentModal.vue')['default']
+    Tags: typeof import('./src/components/Tags.vue')['default']
+    UnsplashImageBrowser: typeof import('./src/components/UnsplashImageBrowser.vue')['default']
+    UpcomingEvaluations: typeof import('./src/components/UpcomingEvaluations.vue')['default']
+    UploadPlugin: typeof import('./src/components/UploadPlugin.vue')['default']
+    UserAvatar: typeof import('./src/components/UserAvatar.vue')['default']
+    UserDropdown: typeof import('./src/components/UserDropdown.vue')['default']
+    VideoBlock: typeof import('./src/components/VideoBlock.vue')['default']
+  }
+}
diff --git a/frontend/package.json b/frontend/package.json
index b0695d69..57752299 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -26,7 +26,8 @@
     "codemirror-editor-vue3": "^2.8.0",
     "dayjs": "^1.11.6",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.112",
+    "frappe-ui": "^0.1.118",
+    "highlight.js": "^11.11.1",
     "lucide-vue-next": "^0.383.0",
     "markdown-it": "^14.0.0",
     "pinia": "^2.0.33",
diff --git a/frontend/src/components/AppSidebar.vue b/frontend/src/components/AppSidebar.vue
index e6ac5c0c..0a45fb7e 100644
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -109,7 +109,8 @@ import { sessionStore } from '@/stores/session'
 import { useSidebar } from '@/stores/sidebar'
 import { useSettings } from '@/stores/settings'
 import { ChevronRight, Plus } from 'lucide-vue-next'
-import { Button, createResource, TrialBanner } from 'frappe-ui'
+import { Button, createResource } from 'frappe-ui'
+import { TrialBanner } from 'frappe-ui/frappe'
 import PageModal from '@/components/Modals/PageModal.vue'
 
 const { user, sidebarSettings } = sessionStore()
diff --git a/frontend/src/components/Assignment.vue b/frontend/src/components/Assignment.vue
index 9056fb30..4003b4d5 100644
--- a/frontend/src/components/Assignment.vue
+++ b/frontend/src/components/Assignment.vue
@@ -1,7 +1,7 @@
 <template>
 	<div
 		v-if="assignment.data"
-		class="grid grid-cols-[65%,35%] h-full"
+		class="grid grid-cols-[60%,40%] h-full"
 		:class="{ 'border rounded-lg': !showTitle }"
 	>
 		<div class="border-r p-5 overflow-y-auto h-[calc(100vh-3.2rem)]">
@@ -115,7 +115,13 @@
 						:readonly="!canModifyAssignment"
 					/>
 				</div>
-				<div v-else>
+				<div v-if="true">
+					<div class="text-sm mb-4">
+						{{ __('Write your answer here') }}
+					</div>
+					<FormControl />
+				</div>
+				<!-- <div v-else>
 					<div class="text-sm mb-4">
 						{{ __('Write your answer here') }}
 					</div>
@@ -126,7 +132,7 @@
 						:fixedMenu="true"
 						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
 					/>
-				</div>
+				</div> -->
 
 				<div
 					v-if="
diff --git a/frontend/src/components/AssignmentBlock.vue b/frontend/src/components/AssignmentBlock.vue
index fcc8736b..62040e07 100644
--- a/frontend/src/components/AssignmentBlock.vue
+++ b/frontend/src/components/AssignmentBlock.vue
@@ -1,4 +1,6 @@
 <template>
+	{{ user.data }}
+	{{ submission.data }}
 	<Assignment
 		v-if="user.data && submission.data"
 		:assignmentID="assignmentID"
@@ -16,7 +18,7 @@
 	</div>
 </template>
 <script setup>
-import { inject, watch } from 'vue'
+import { inject } from 'vue'
 import { Button, createResource } from 'frappe-ui'
 import Assignment from '@/components/Assignment.vue'
 
diff --git a/frontend/src/components/CertificationLinks.vue b/frontend/src/components/CertificationLinks.vue
index 1ddc22f4..0da84a13 100644
--- a/frontend/src/components/CertificationLinks.vue
+++ b/frontend/src/components/CertificationLinks.vue
@@ -1,6 +1,16 @@
 <template>
+	<Button
+		v-if="certification.data && certification.data.certificate"
+		@click="downloadCertificate"
+		class=""
+	>
+		<template #prefix>
+			<GraduationCap class="size-4 stroke-1.5" />
+		</template>
+		{{ __('View Certificate') }}
+	</Button>
 	<div
-		v-if="
+		v-else-if="
 			certification.data &&
 			certification.data.membership &&
 			certification.data.paid_certificate &&
@@ -25,7 +35,7 @@
 			</Button>
 		</router-link>
 		<router-link
-			v-else-if="!certification.data.membership.certficate"
+			v-else-if="!certification.data.membership.certificate"
 			:to="{
 				name: 'CourseCertification',
 				params: {
@@ -61,7 +71,15 @@ const certification = createResource({
 	params: {
 		course: props.courseName,
 	},
-	auto: true,
+	auto: user.data ? true : false,
 	cache: ['certificationData', user.data?.name],
 })
+
+const downloadCertificate = () => {
+	window.open(
+		`/api/method/frappe.utils.print_format.download_pdf?doctype=LMS+Certificate&name=${
+			certification.data.certificate.name
+		}&format=${encodeURIComponent(certification.data.certificate.template)}`
+	)
+}
 </script>
diff --git a/frontend/src/components/CourseCardOverlay.vue b/frontend/src/components/CourseCardOverlay.vue
index ad534557..9f263d54 100644
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -30,7 +30,7 @@
 						</span>
 					</Button>
 				</router-link>
-				<CertificationLinks :courseName="course.data.name" />
+				<CertificationLinks :courseName="course.data.name" class="w-full" />
 			</div>
 			<router-link
 				v-else-if="course.data.paid_course"
diff --git a/frontend/src/components/UpcomingEvaluations.vue b/frontend/src/components/UpcomingEvaluations.vue
index e9458829..7c978b67 100644
--- a/frontend/src/components/UpcomingEvaluations.vue
+++ b/frontend/src/components/UpcomingEvaluations.vue
@@ -18,8 +18,51 @@
 			<div class="grid grid-cols-3 gap-4">
 				<div v-for="evl in upcoming_evals.data">
 					<div class="border rounded-md p-3">
-						<div class="font-semibold mb-3">
-							{{ evl.course_title }}
+						<div class="flex justify-between mb-3">
+							<span class="font-semibold leading-5">
+								{{ evl.course_title }}
+							</span>
+							<Menu
+								v-if="evl.date > dayjs().format()"
+								as="div"
+								class="relative inline-block text-left"
+							>
+								<div>
+									<MenuButton class="inline-flex w-full justify-center">
+										<EllipsisVertical class="w-4 h-4 stroke-1.5" />
+									</MenuButton>
+								</div>
+
+								<transition
+									enter-active-class="transition duration-100 ease-out"
+									enter-from-class="transform scale-95 opacity-0"
+									enter-to-class="transform scale-100 opacity-100"
+									leave-active-class="transition duration-75 ease-in"
+									leave-from-class="transform scale-100 opacity-100"
+									leave-to-class="transform scale-95 opacity-0"
+								>
+									<MenuItems
+										class="absolute mt-2 w-32 rounded-md bg-white shadow-lg p-1.5"
+									>
+										<MenuItem v-slot="{ active }">
+											<Button
+												variant="ghost"
+												class="w-full"
+												@click="cancelEvaluation(evl)"
+											>
+												<template #prefix>
+													<Ban
+														:active="active"
+														class="size-4 stroke-1.5"
+														aria-hidden="true"
+													/>
+												</template>
+												{{ __('Cancel') }}
+											</Button>
+										</MenuItem>
+									</MenuItems>
+								</transition>
+							</Menu>
 						</div>
 						<div class="flex items-center mb-2">
 							<Calendar class="w-4 h-4 stroke-1.5" />
@@ -50,16 +93,6 @@
 								</template>
 								{{ __('Join Call') }}
 							</Button>
-							<Button
-								v-if="evl.date > dayjs().format()"
-								@click="cancelEvaluation(evl)"
-								class="w-full"
-							>
-								<template #prefix>
-									<Ban class="w-4 h-4 stroke-1.5" />
-								</template>
-								{{ __('Cancel') }}
-							</Button>
 						</div>
 					</div>
 				</div>
@@ -84,11 +117,13 @@ import {
 	Clock,
 	GraduationCap,
 	HeadsetIcon,
+	EllipsisVertical,
 } from 'lucide-vue-next'
 import { inject, ref, getCurrentInstance } from 'vue'
 import { formatTime } from '../utils'
 import { Button, createResource, call } from 'frappe-ui'
 import EvaluationModal from '@/components/Modals/EvaluationModal.vue'
+import { Menu, MenuButton, MenuItems, MenuItem } from '@headlessui/vue'
 
 const dayjs = inject('$dayjs')
 const user = inject('$user')
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 18d81dc8..7a326682 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -82,6 +82,7 @@ import {
 	User,
 	Settings,
 	Sun,
+	Zap,
 } from 'lucide-vue-next'
 
 const router = useRouter()
@@ -125,98 +126,115 @@ const toggleTheme = () => {
 const userDropdownOptions = computed(() => {
 	return [
 		{
-			icon: User,
-			label: 'My Profile',
-			onClick: () => {
-				router.push(`/user/${userResource.data?.username}`)
-			},
-			condition: () => {
-				return isLoggedIn
-			},
+			group: '',
+			items: [
+				{
+					icon: User,
+					label: 'My Profile',
+					onClick: () => {
+						router.push(`/user/${userResource.data?.username}`)
+					},
+					condition: () => {
+						return isLoggedIn
+					},
+				},
+				{
+					icon: theme.value === 'light' ? Moon : Sun,
+					label: 'Toggle Theme',
+					onClick: () => {
+						toggleTheme()
+					},
+				},
+				{
+					component: markRaw(Apps),
+					condition: () => {
+						let cookies = new URLSearchParams(
+							document.cookie.split('; ').join('&')
+						)
+						let system_user = cookies.get('system_user')
+						if (system_user === 'yes') return true
+						else return false
+					},
+				},
+				{
+					icon: Settings,
+					label: 'Settings',
+					onClick: () => {
+						settingsStore.isSettingsOpen = true
+					},
+					condition: () => {
+						return userResource.data?.is_moderator
+					},
+				},
+				{
+					icon: FrappeCloudIcon,
+					label: 'Login to Frappe Cloud',
+					onClick: () => {
+						$dialog({
+							title: __('Login to Frappe Cloud?'),
+							message: __(
+								'Are you sure you want to login to your Frappe Cloud dashboard?'
+							),
+							actions: [
+								{
+									label: __('Confirm'),
+									variant: 'solid',
+									onClick(close) {
+										loginToFrappeCloud()
+										close()
+									},
+								},
+							],
+						})
+					},
+					condition: () => {
+						return (
+							userResource.data?.is_system_manager &&
+							userResource.data?.is_fc_site
+						)
+					},
+				},
+			],
 		},
 		{
-			icon: theme.value === 'light' ? Moon : Sun,
-			label: 'Toggle Theme',
-			onClick: () => {
-				toggleTheme()
-			},
-		},
-		{
-			component: markRaw(Apps),
-			condition: () => {
-				let cookies = new URLSearchParams(document.cookie.split('; ').join('&'))
-				let system_user = cookies.get('system_user')
-				if (system_user === 'yes') return true
-				else return false
-			},
-		},
-		{
-			icon: Settings,
-			label: 'Settings',
-			onClick: () => {
-				settingsStore.isSettingsOpen = true
-			},
-			condition: () => {
-				return userResource.data?.is_moderator
-			},
-		},
-		{
-			icon: FrappeCloudIcon,
-			label: 'Login to Frappe Cloud',
-			onClick: () => {
-				$dialog({
-					title: __('Login to Frappe Cloud?'),
-					message: __(
-						'Are you sure you want to login to your Frappe Cloud dashboard?'
-					),
-					actions: [
-						{
-							label: __('Confirm'),
-							variant: 'solid',
-							onClick(close) {
-								loginToFrappeCloud()
-								close()
-							},
-						},
-					],
-				})
-			},
-			condition: () => {
-				return (
-					userResource.data?.is_system_manager && userResource.data?.is_fc_site
-				)
-			},
-		},
-		{
-			icon: LogOut,
-			label: 'Log out',
-			onClick: () => {
-				logout.submit().then(() => {
-					isLoggedIn = false
-				})
-			},
-			condition: () => {
-				return isLoggedIn
-			},
-		},
-		{
-			icon: LogIn,
-			label: 'Log in',
-			onClick: () => {
-				window.location.href = '/login'
-			},
-			condition: () => {
-				return !isLoggedIn
-			},
+			group: '',
+			items: [
+				{
+					icon: Zap,
+					label: 'Powered by Learning',
+					onClick: () => {
+						window.open('https://frappe.io/learning', '_blank')
+					},
+				},
+				{
+					icon: LogOut,
+					label: 'Log out',
+					onClick: () => {
+						logout.submit().then(() => {
+							isLoggedIn = false
+						})
+					},
+					condition: () => {
+						return isLoggedIn
+					},
+				},
+				{
+					icon: LogIn,
+					label: 'Log in',
+					onClick: () => {
+						window.location.href = '/login'
+					},
+					condition: () => {
+						return !isLoggedIn
+					},
+				},
+			],
 		},
 	]
 })
 
 const loginToFrappeCloud = () => {
-	let redirect_to = '/dashboard/welcome'
-	if (userResource.data?.site_info.is_payment_method_added) {
-		redirect_to = '/dashboard/sites/' + userResource.data.sitename
-	}
+	let redirect_to = '/dashboard/sites/' + userResource.data.sitename
 	window.open(`${frappeCloudBaseEndpoint}${redirect_to}`, '_blank')
 }
 </script>
diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue
index dd46a7bf..6323fbe2 100644
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -22,7 +22,7 @@
 		<div
 			class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
 		>
-			<div class="text-lg font-semibold">
+			<div class="text-lg text-ink-gray-9 font-semibold">
 				{{ __('All Batches') }}
 			</div>
 			<div
@@ -72,7 +72,7 @@
 		</div>
 		<div
 			v-else-if="!batches.list.loading"
-			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
+			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 mt-48"
 		>
 			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
 			<div class="text-lg font-medium mb-1">
@@ -105,6 +105,7 @@ import {
 	Select,
 	TabButtons,
 } from 'frappe-ui'
+import { useRouteQuery } from '@vueuse/router'
 import { computed, inject, onMounted, ref, watch } from 'vue'
 import { BookOpen, Plus } from 'lucide-vue-next'
 import { updateDocumentTitle } from '@/utils'
@@ -119,7 +120,10 @@ const currentCategory = ref(null)
 const title = ref('')
 const certification = ref(false)
 const filters = ref({})
-const currentTab = ref(user.data?.is_student ? 'All' : 'Upcoming')
+const currentTab = useRouteQuery(
+	'tab',
+	user.data?.is_student ? 'All' : 'Upcoming'
+)
 const orderBy = ref('start_date')
 
 onMounted(() => {
@@ -250,7 +254,12 @@ const setQueryParams = () => {
 		}
 	})
 
-	history.replaceState({}, '', `${location.pathname}?${queries.toString()}`)
+	let queryString = ''
+	if (queries.toString()) {
+		queryString = `?${queries.toString()}`
+	}
+
+	history.replaceState({}, '', `${location.pathname}${queryString}`)
 }
 
 const updateCategories = (data) => {
@@ -270,18 +279,6 @@ watch(currentTab, () => {
 	updateBatches()
 })
 
-const batchType = computed(() => {
-	let types = [
-		{ label: __(''), value: null },
-		{ label: __('Upcoming'), value: 'Upcoming' },
-		{ label: __('Archived'), value: 'Archived' },
-	]
-	if (user.data?.is_moderator) {
-		types.push({ label: __('Unpublished'), value: 'Unpublished' })
-	}
-	return types
-})
-
 const batchTabs = computed(() => {
 	let tabs = [
 		{
diff --git a/frontend/src/pages/Billing.vue b/frontend/src/pages/Billing.vue
index ca74fbdd..7c4242d6 100644
--- a/frontend/src/pages/Billing.vue
+++ b/frontend/src/pages/Billing.vue
@@ -245,12 +245,10 @@ const paymentLink = createResource({
 })
 
 const generatePaymentLink = () => {
-	console.log('called')
 	paymentLink.submit(
 		{},
 		{
 			validate() {
-				console.log('validation start')
 				if (!billingDetails.source) {
 					return __('Please let us know where you heard about us from.')
 				}
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index 769b0121..ad32e940 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -22,17 +22,13 @@
 		<div
 			class="flex flex-col lg:flex-row space-y-4 lg:space-y-0 lg:items-center justify-between mb-5"
 		>
-			<div class="text-lg font-semibold">
+			<div class="text-lg text-ink-gray-9 font-semibold">
 				{{ __('All Courses') }}
 			</div>
 			<div
 				class="flex flex-col space-y-2 lg:space-y-0 lg:flex-row lg:items-center lg:space-x-4"
 			>
-				<TabButtons
-					v-if="user.data"
-					:buttons="courseTabs"
-					v-model="currentTab"
-				/>
+				<TabButtons :buttons="courseTabs" v-model="currentTab" />
 				<FormControl
 					v-model="certification"
 					:label="__('Certification')"
@@ -105,6 +101,7 @@ import {
 	Select,
 	TabButtons,
 } from 'frappe-ui'
+import { useRouteQuery } from '@vueuse/router'
 import { computed, inject, onMounted, ref, watch } from 'vue'
 import { BookOpen, Plus } from 'lucide-vue-next'
 import { updateDocumentTitle } from '@/utils'
@@ -119,7 +116,7 @@ const currentCategory = ref(null)
 const title = ref('')
 const certification = ref(false)
 const filters = ref({})
-const currentTab = ref('Live')
+const currentTab = useRouteQuery('tab', 'Live')
 
 onMounted(() => {
 	setFiltersFromQuery()
@@ -198,10 +195,6 @@ const updateCertificationFilter = () => {
 }
 
 const updateTabFilter = () => {
-	if (!user.data) {
-		return
-	}
-
 	delete filters.value['live']
 	delete filters.value['created']
 	delete filters.value['published_on']
@@ -255,7 +248,12 @@ const setQueryParams = () => {
 		}
 	})
 
-	history.replaceState({}, '', `${location.pathname}?${queries.toString()}`)
+	let queryString = ''
+	if (queries.toString()) {
+		queryString = `?${queries.toString()}`
+	}
+
+	history.replaceState({}, '', `${location.pathname}${queryString}`)
 }
 
 const updateCategories = (data) => {
@@ -275,21 +273,6 @@ watch(currentTab, () => {
 	updateCourses()
 })
 
-const courseType = computed(() => {
-	let types = [
-		{ label: __(''), value: null },
-		{ label: __('New'), value: 'New' },
-		{ label: __('Upcoming'), value: 'Upcoming' },
-	]
-	if (user.data?.is_student) {
-		types.push({ label: __('Enrolled'), value: 'Enrolled' })
-	}
-	if (user.data?.is_moderator || user.data?.is_instructor) {
-		types.push({ label: __('Created'), value: 'Created' })
-	}
-	return types
-})
-
 const courseTabs = computed(() => {
 	let tabs = [
 		{
@@ -304,7 +287,7 @@ const courseTabs = computed(() => {
 	]
 	if (user.data?.is_student) {
 		tabs.push({ label: __('Enrolled') })
-	} else {
+	} else if (user.data) {
 		tabs.push({ label: __('Created') })
 	}
 	return tabs
diff --git a/frontend/src/pages/Programs.vue b/frontend/src/pages/Programs.vue
index 64f608f7..203cd895 100644
--- a/frontend/src/pages/Programs.vue
+++ b/frontend/src/pages/Programs.vue
@@ -17,7 +17,7 @@
 	<div v-if="programs.data?.length" class="pt-5 px-5">
 		<div v-for="program in programs.data" class="mb-10">
 			<div class="flex items-center justify-between">
-				<div class="text-xl font-semibold">
+				<div class="text-xl text-ink-gray-9 font-semibold">
 					{{ program.name }}
 				</div>
 				<div class="flex items-center space-x-2">
diff --git a/frontend/src/utils/assignment.js b/frontend/src/utils/assignment.js
index 8abeec88..3ef31a94 100644
--- a/frontend/src/utils/assignment.js
+++ b/frontend/src/utils/assignment.js
@@ -5,6 +5,7 @@ import AssignmentBlock from '@/components/AssignmentBlock.vue'
 import translationPlugin from '../translation'
 import { usersStore } from '@/stores/user'
 import router from '../router'
+import { FrappeUI, setConfig, frappeRequest, pageMetaPlugin } from 'frappe-ui'
 
 export class Assignment {
 	constructor({ data, api, readOnly }) {
@@ -46,8 +47,11 @@ export class Assignment {
 			const app = createApp(AssignmentBlock, {
 				assignmentID: assignment,
 			})
+			app.use(FrappeUI)
+			setConfig('resourceFetcher', frappeRequest)
 			app.use(translationPlugin)
 			app.use(router)
+			app.use(pageMetaPlugin)
 			const { userResource } = usersStore()
 			app.provide('$user', userResource)
 			app.mount(this.wrapper)
diff --git a/frontend/src/utils/code.ts b/frontend/src/utils/code.ts
index f1b10f61..c1dcee1e 100644
--- a/frontend/src/utils/code.ts
+++ b/frontend/src/utils/code.ts
@@ -1,5 +1,7 @@
 import { Code } from "lucide-vue-next"
 import { h, createApp } from "vue"
+import hljs from 'highlight.js/lib/core';
+
 
 const DEFAULT_THEMES = ['light', 'dark'];
 const COMMON_LANGUAGES = {
@@ -42,7 +44,6 @@ export class CodeBox {
 		this.selectInput = document.createElement('input');
 		this.selectDropIcon = document.createElement('i');
 
-		this._injectHighlightJSScriptElement();
 		this._injectHighlightJSCSSElement();
 
 		this.api.listeners.on(window, 'click', this._closeAllLanguageSelects, true);
@@ -150,7 +151,7 @@ export class CodeBox {
 	}
 
 	_highlightCodeArea(event) {
-		window.hljs.highlightBlock(this.codeArea);
+		hljs.highlightBlock(this.codeArea);
 	}
 
 	_handleCodeAreaPaste(event) {
@@ -167,7 +168,8 @@ export class CodeBox {
 		this.codeArea.removeAttribute('class');
 		this.data.language = language[0];
 		this.codeArea.setAttribute('class', `codeBoxTextArea ${this.config.useDefaultTheme} ${this.data.language}`);
-		window.hljs.highlightBlock(this.codeArea);
+	
+		hljs.highlightElement(this.codeArea);
 	}
 
 	_closeAllLanguageSelects() {
@@ -175,20 +177,6 @@ export class CodeBox {
 		for (let i = 0, len = selectPreviews.length; i < len; i++) selectPreviews[i].classList.remove('codeBoxShow');
 	}
 
-	_injectHighlightJSScriptElement() {
-		const highlightJSScriptElement = document.querySelector(`#${this.highlightScriptID}`);
-		const highlightJSScriptURL = 'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/highlight.min.js';
-		if (!highlightJSScriptElement) {
-			const script = document.createElement('script');
-			const head = document.querySelector('head');
-			script.setAttribute('src', highlightJSScriptURL);
-			script.setAttribute('id', this.highlightScriptID);
-
-			if (head) head.appendChild(script);
-		}
-		else highlightJSScriptElement.setAttribute('src', highlightJSScriptURL);
-	}
-
 	_injectHighlightJSCSSElement() {
 		const highlightJSCSSElement = document.querySelector(`#${this.highlightCSSID}`);
 		let highlightJSCSSURL = this._getThemeURLFromConfig();
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 29650ec8..a470bd2f 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -177,9 +177,6 @@ export function getEditorTools() {
 		codeBox: {
 			class: CodeBox,
 			config: {
-				themeURL:
-					'https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@9.18.1/build/styles/atom-one-dark.min.css',
-				themeName: 'atom-one-dark',
 				useDefaultTheme: 'dark',
 			},
 		},
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 2263cd75..4be6085e 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -6,7 +6,17 @@ import frappeui from 'frappe-ui/vite'
 // https://vitejs.dev/config/
 export default defineConfig({
 	plugins: [
-		frappeui(),
+		frappeui({
+			frappeProxy: true,
+			lucideIcons: true,
+			jinjaBootData: true,
+			frappeTypes: {
+				input: {},
+			},
+			buildConfig: {
+				indexHtmlPath: '../lms/www/lms.html',
+			},
+		}),
 		vue({
 			script: {
 				defineModel: true,
@@ -23,28 +33,13 @@ export default defineConfig({
 			'tailwind.config.js': path.resolve(__dirname, 'tailwind.config.js'),
 		},
 	},
-	build: {
-		outDir: `../lms/public/frontend`,
-		emptyOutDir: true,
-		commonjsOptions: {
-			include: [/tailwind.config.js/, /node_modules/],
-		},
-		sourcemap: true,
-		target: 'es2015',
-		rollupOptions: {
-			output: {
-				manualChunks: {
-					'frappe-ui': ['frappe-ui'],
-				},
-			},
-		},
-	},
 	optimizeDeps: {
 		include: [
 			'feather-icons',
 			'showdown',
 			'engine.io-client',
 			'tailwind.config.js',
+			'highlight.js',
 		],
 	},
 })
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 20bdc979..ce2fe446 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -7,6 +7,19 @@
   resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
   integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
 
+"@antfu/install-pkg@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@antfu/install-pkg/-/install-pkg-1.0.0.tgz#2912a150fc8b35ec912f583f90074ee98f64d66a"
+  integrity sha512-xvX6P/lo1B3ej0OsaErAjqgFYzYVcJpamjLAFLYh9vRJngBrMoUG7aVnrGTeqM7yxbyTD5p3F2+0/QUEh8Vzhw==
+  dependencies:
+    package-manager-detector "^0.2.8"
+    tinyexec "^0.3.2"
+
+"@antfu/utils@^8.1.0":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-8.1.1.tgz#95b1947d292a9a2efffba2081796dcaa05ecedfb"
+  integrity sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==
+
 "@babel/helper-string-parser@^7.25.9":
   version "7.25.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
@@ -18,16 +31,16 @@
   integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
 
 "@babel/parser@^7.25.3":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
-  integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
+  version "7.26.10"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.10.tgz#e9bdb82f14b97df6569b0b038edd436839c57749"
+  integrity sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==
   dependencies:
-    "@babel/types" "^7.26.9"
+    "@babel/types" "^7.26.10"
 
-"@babel/types@^7.26.9":
-  version "7.26.9"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.9.tgz#08b43dec79ee8e682c2ac631c010bdcac54a21ce"
-  integrity sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==
+"@babel/types@^7.26.10":
+  version "7.26.10"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.10.tgz#396382f6335bd4feb65741eacfc808218f859259"
+  integrity sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==
   dependencies:
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
@@ -120,9 +133,9 @@
     "@codexteam/icons" "^0.0.6"
 
 "@editorjs/table@^2.4.2":
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/@editorjs/table/-/table-2.4.3.tgz#3bf7d2185297138864ece0ff04bc8ec699e2596f"
-  integrity sha512-TBLVFA1T6PIZRSWz0gXZUtNrFu4a59FeABM/wS0/Coc/bhOfWBRrf5/Ic5tVHaTazXEo1dYWWrVgg/jRaRnYbw==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@editorjs/table/-/table-2.4.4.tgz#724cbebd2c99b929bd41d31a147fdaf690ae2c81"
+  integrity sha512-2wWjxk48C9Z7uaBZIS5dML81c2VsD47Va9J4RDd2UboxcnYV8OZ4oYxKafH5RJIGPj8ykGaROIzyDVR1N4e7Cg==
   dependencies:
     "@codexteam/icons" "^0.0.6"
 
@@ -248,7 +261,7 @@
   dependencies:
     "@floating-ui/utils" "^0.2.9"
 
-"@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.6.7":
+"@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.6.13", "@floating-ui/dom@^1.6.7":
   version "1.6.13"
   resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.13.tgz#a8a938532aea27a95121ec16e667a7cbe8c59e34"
   integrity sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==
@@ -261,7 +274,7 @@
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.9.tgz#50dea3616bc8191fb8e112283b49eaff03e78429"
   integrity sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==
 
-"@floating-ui/vue@^1.1.0":
+"@floating-ui/vue@^1.1.0", "@floating-ui/vue@^1.1.6":
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/@floating-ui/vue/-/vue-1.1.6.tgz#1c7e8f257fae5b71a72d10c1746e6b0ba338399c"
   integrity sha512-XFlUzGHGv12zbgHNk5FN2mUB7ROul3oG2ENdTpWdE+qMFxyNxWSRmsoyhiEnpmabNm6WnUvR1OvJfUfN4ojC1A==
@@ -277,14 +290,33 @@
   dependencies:
     "@tanstack/vue-virtual" "^3.0.0-beta.60"
 
-"@internationalized/date@^3.5.4":
+"@iconify/types@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"
+  integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==
+
+"@iconify/utils@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@iconify/utils/-/utils-2.3.0.tgz#1bbbf8c477ebe9a7cacaea78b1b7e8937f9cbfba"
+  integrity sha512-GmQ78prtwYW6EtzXRU1rY+KwOKfz32PD7iJh6Iyqw68GiKuoZ2A6pRtzWONz5VQJbp50mEjXh/7NkumtrAgRKA==
+  dependencies:
+    "@antfu/install-pkg" "^1.0.0"
+    "@antfu/utils" "^8.1.0"
+    "@iconify/types" "^2.0.0"
+    debug "^4.4.0"
+    globals "^15.14.0"
+    kolorist "^1.8.0"
+    local-pkg "^1.0.0"
+    mlly "^1.7.4"
+
+"@internationalized/date@^3.5.0", "@internationalized/date@^3.5.4":
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/@internationalized/date/-/date-3.7.0.tgz#23a4956308ee108e308517a7137c69ab8f5f2ad9"
   integrity sha512-VJ5WS3fcVx0bejE/YHfbDKR/yawZgKqn/if+oEeLqNwBtPzVB06olkfcnojTmEMX+gTpH+FlQ69SHNitJ8/erQ==
   dependencies:
     "@swc/helpers" "^0.5.0"
 
-"@internationalized/number@^3.5.3":
+"@internationalized/number@^3.5.0", "@internationalized/number@^3.5.3":
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/@internationalized/number/-/number-3.6.0.tgz#dc6ba20c41b25eb605f1d5cac7d8668e9022c224"
   integrity sha512-PtrRcJVy7nw++wn4W2OuePQQfTqDzfusSuY1QTtui4wa7r+rGVtR75pO8CyKvHvzyQYi3Q1uO5sY0AsB4e65Bw==
@@ -376,100 +408,100 @@
   resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-3.0.0.tgz#96fdb89d25c62e7b6a5d08caf0ce5114370e3b8f"
   integrity sha512-42aWfPrimMfDKDi4YegyS7x+/0tlzaqwPQCULLanv3DMIlu96KTJR0fM5isWX2UViOqlGnX6YFgqWepcX+XMNg==
 
-"@rollup/rollup-android-arm-eabi@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.9.tgz#661a45a4709c70e59e596ec78daa9cb8b8d27604"
-  integrity sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==
+"@rollup/rollup-android-arm-eabi@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.36.0.tgz#6229c36cddc172c468f53107f2b7aebe2585609b"
+  integrity sha512-jgrXjjcEwN6XpZXL0HUeOVGfjXhPyxAbbhD0BlXUB+abTOpbPiN5Wb3kOT7yb+uEtATNYF5x5gIfwutmuBA26w==
 
-"@rollup/rollup-android-arm64@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.9.tgz#128fe8dd510d880cf98b4cb6c7add326815a0c4b"
-  integrity sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==
+"@rollup/rollup-android-arm64@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.36.0.tgz#d38163692d0729bd64a026c13749ecac06f847e8"
+  integrity sha512-NyfuLvdPdNUfUNeYKUwPwKsE5SXa2J6bCt2LdB/N+AxShnkpiczi3tcLJrm5mA+eqpy0HmaIY9F6XCa32N5yzg==
 
-"@rollup/rollup-darwin-arm64@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.9.tgz#363467bc49fd0b1e17075798ac8e9ad1e1e29535"
-  integrity sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==
+"@rollup/rollup-darwin-arm64@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.36.0.tgz#82601b8ff81f3dbaef28017aa3d0e9709edc99c0"
+  integrity sha512-JQ1Jk5G4bGrD4pWJQzWsD8I1n1mgPXq33+/vP4sk8j/z/C2siRuxZtaUA7yMTf71TCZTZl/4e1bfzwUmFb3+rw==
 
-"@rollup/rollup-darwin-x64@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.9.tgz#c2fe3d85fffe47f0ed0f076b3563ada22c8af19c"
-  integrity sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==
+"@rollup/rollup-darwin-x64@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.36.0.tgz#0e961354fb2bf26d691810ca61dc861d9a1e94b2"
+  integrity sha512-6c6wMZa1lrtiRsbDziCmjE53YbTkxMYhhnWnSW8R/yqsM7a6mSJ3uAVT0t8Y/DGt7gxUWYuFM4bwWk9XCJrFKA==
 
-"@rollup/rollup-freebsd-arm64@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.9.tgz#d95bd8f6eaaf829781144fc8bd2d5d71d9f6a9f5"
-  integrity sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==
+"@rollup/rollup-freebsd-arm64@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.36.0.tgz#6aee296cd6b8c39158d377c89b7e0cd0851dd7c7"
+  integrity sha512-KXVsijKeJXOl8QzXTsA+sHVDsFOmMCdBRgFmBb+mfEb/7geR7+C8ypAml4fquUt14ZyVXaw2o1FWhqAfOvA4sg==
 
-"@rollup/rollup-freebsd-x64@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.9.tgz#c3576c6011656e4966ded29f051edec636b44564"
-  integrity sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==
+"@rollup/rollup-freebsd-x64@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.36.0.tgz#432e49d93942225ac1b4d98254a6fb6ca0afcd17"
+  integrity sha512-dVeWq1ebbvByI+ndz4IJcD4a09RJgRYmLccwlQ8bPd4olz3Y213uf1iwvc7ZaxNn2ab7bjc08PrtBgMu6nb4pQ==
 
-"@rollup/rollup-linux-arm-gnueabihf@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.9.tgz#48c87d0dee4f8dc9591a416717f91b4a89d77e3d"
-  integrity sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==
+"@rollup/rollup-linux-arm-gnueabihf@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.36.0.tgz#a66910c6c63b46d45f239528ad5509097f8df885"
+  integrity sha512-bvXVU42mOVcF4le6XSjscdXjqx8okv4n5vmwgzcmtvFdifQ5U4dXFYaCB87namDRKlUL9ybVtLQ9ztnawaSzvg==
 
-"@rollup/rollup-linux-arm-musleabihf@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.9.tgz#f4c4e7c03a7767f2e5aa9d0c5cfbf5c0f59f2d41"
-  integrity sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==
+"@rollup/rollup-linux-arm-musleabihf@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.36.0.tgz#1cfadc70d44501b0a58615a460cf1b6ec8cfddf3"
+  integrity sha512-JFIQrDJYrxOnyDQGYkqnNBtjDwTgbasdbUiQvcU8JmGDfValfH1lNpng+4FWlhaVIR4KPkeddYjsVVbmJYvDcg==
 
-"@rollup/rollup-linux-arm64-gnu@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.9.tgz#1015c9d07a99005025d13b8622b7600029d0b52f"
-  integrity sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==
+"@rollup/rollup-linux-arm64-gnu@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.36.0.tgz#d32e42b25216472dfdc5cb7df6a37667766d3855"
+  integrity sha512-KqjYVh3oM1bj//5X7k79PSCZ6CvaVzb7Qs7VMWS+SlWB5M8p3FqufLP9VNp4CazJ0CsPDLwVD9r3vX7Ci4J56A==
 
-"@rollup/rollup-linux-arm64-musl@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.9.tgz#8f895eb5577748fc75af21beae32439626e0a14c"
-  integrity sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==
+"@rollup/rollup-linux-arm64-musl@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.36.0.tgz#d742917d61880941be26ff8d3352d935139188b9"
+  integrity sha512-QiGnhScND+mAAtfHqeT+cB1S9yFnNQ/EwCg5yE3MzoaZZnIV0RV9O5alJAoJKX/sBONVKeZdMfO8QSaWEygMhw==
 
-"@rollup/rollup-linux-loongarch64-gnu@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.9.tgz#c9cd5dbbdc6b3ca4dbeeb0337498cf31949004a0"
-  integrity sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==
+"@rollup/rollup-linux-loongarch64-gnu@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.36.0.tgz#9ad12d1a5d3abf4ecb90fbe1a49249608cee8cbb"
+  integrity sha512-1ZPyEDWF8phd4FQtTzMh8FQwqzvIjLsl6/84gzUxnMNFBtExBtpL51H67mV9xipuxl1AEAerRBgBwFNpkw8+Lg==
 
-"@rollup/rollup-linux-powerpc64le-gnu@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.9.tgz#7ebb5b4441faa17843a210f7d0583a20c93b40e4"
-  integrity sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==
+"@rollup/rollup-linux-powerpc64le-gnu@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.36.0.tgz#c3ca6f5ce4a8b785dd450113660d9529a75fdf2a"
+  integrity sha512-VMPMEIUpPFKpPI9GZMhJrtu8rxnp6mJR3ZzQPykq4xc2GmdHj3Q4cA+7avMyegXy4n1v+Qynr9fR88BmyO74tg==
 
-"@rollup/rollup-linux-riscv64-gnu@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.9.tgz#10f5d7349fbd2fe78f9e36ecc90aab3154435c8d"
-  integrity sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==
+"@rollup/rollup-linux-riscv64-gnu@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.36.0.tgz#05eb5e71db5b5b1d1a3428265a63c5f6f8a1e4b8"
+  integrity sha512-ttE6ayb/kHwNRJGYLpuAvB7SMtOeQnVXEIpMtAvx3kepFQeowVED0n1K9nAdraHUPJ5hydEMxBpIR7o4nrm8uA==
 
-"@rollup/rollup-linux-s390x-gnu@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.9.tgz#196347d2fa20593ab09d0b7e2589fb69bdf742c6"
-  integrity sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==
+"@rollup/rollup-linux-s390x-gnu@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.36.0.tgz#6fa895f181fa6804bc6ca27c0e9a6823355436dd"
+  integrity sha512-4a5gf2jpS0AIe7uBjxDeUMNcFmaRTbNv7NxI5xOCs4lhzsVyGR/0qBXduPnoWf6dGC365saTiwag8hP1imTgag==
 
-"@rollup/rollup-linux-x64-gnu@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.9.tgz#7193cbd8d128212b8acda37e01b39d9e96259ef8"
-  integrity sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==
+"@rollup/rollup-linux-x64-gnu@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.36.0.tgz#d2e69f7598c71f03287b763fdbefce4163f07419"
+  integrity sha512-5KtoW8UWmwFKQ96aQL3LlRXX16IMwyzMq/jSSVIIyAANiE1doaQsx/KRyhAvpHlPjPiSU/AYX/8m+lQ9VToxFQ==
 
-"@rollup/rollup-linux-x64-musl@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.9.tgz#29a6867278ca0420b891574cfab98ecad70c59d1"
-  integrity sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==
+"@rollup/rollup-linux-x64-musl@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.36.0.tgz#9eb0075deaabf5d88a9dc8b61bd7bd122ac64ef9"
+  integrity sha512-sycrYZPrv2ag4OCvaN5js+f01eoZ2U+RmT5as8vhxiFz+kxwlHrsxOwKPSA8WyS+Wc6Epid9QeI/IkQ9NkgYyQ==
 
-"@rollup/rollup-win32-arm64-msvc@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.9.tgz#89427dcac0c8e3a6d32b13a03a296a275d0de9a9"
-  integrity sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==
+"@rollup/rollup-win32-arm64-msvc@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.36.0.tgz#bfda7178ed8cb8fa8786474a02eae9fc8649a74d"
+  integrity sha512-qbqt4N7tokFwwSVlWDsjfoHgviS3n/vZ8LK0h1uLG9TYIRuUTJC88E1xb3LM2iqZ/WTqNQjYrtmtGmrmmawB6A==
 
-"@rollup/rollup-win32-ia32-msvc@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.9.tgz#ecb9711ba2b6d2bf6ee51265abe057ab90913deb"
-  integrity sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==
+"@rollup/rollup-win32-ia32-msvc@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.36.0.tgz#8e12739b9c43de8f0690b280c676af3de571cee0"
+  integrity sha512-t+RY0JuRamIocMuQcfwYSOkmdX9dtkr1PbhKW42AMvaDQa+jOdpUYysroTF/nuPpAaQMWp7ye+ndlmmthieJrQ==
 
-"@rollup/rollup-win32-x64-msvc@4.34.9":
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.9.tgz#1973871850856ae72bc678aeb066ab952330e923"
-  integrity sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==
+"@rollup/rollup-win32-x64-msvc@4.36.0":
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.36.0.tgz#88b23fe29d28fa647030b36e912c1b5b50831b1d"
+  integrity sha512-aRXd7tRZkWLqGbChgcMMDEHjOKudo1kChb1Jt1IfR8cY/KIpgNviLeJy5FUb9IpSuQj8dU2fAYNMPW/hLKOSTw==
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.2"
@@ -527,17 +559,17 @@
     lodash.merge "^4.6.2"
     postcss-selector-parser "6.0.10"
 
-"@tanstack/virtual-core@3.13.2":
-  version "3.13.2"
-  resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.13.2.tgz#132fde09a19cc4b10dff24a2df1fc7be40635866"
-  integrity sha512-Qzz4EgzMbO5gKrmqUondCjiHcuu4B1ftHb0pjCut661lXZdGoHeze9f/M8iwsK1t5LGR6aNuNGU7mxkowaW6RQ==
+"@tanstack/virtual-core@3.13.4":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@tanstack/virtual-core/-/virtual-core-3.13.4.tgz#31ac7710d102ed59463f922ab088dde5a9e62010"
+  integrity sha512-fNGO9fjjSLns87tlcto106enQQLycCKR4DPNpgq3djP5IdcPFdPAmaKjsgzIeRhH7hWrELgW12hYnRthS5kLUw==
 
-"@tanstack/vue-virtual@^3.0.0-beta.60", "@tanstack/vue-virtual@^3.8.1":
-  version "3.13.2"
-  resolved "https://registry.yarnpkg.com/@tanstack/vue-virtual/-/vue-virtual-3.13.2.tgz#8e4c5f6723133c76547b18da542aa2d3d78cb5db"
-  integrity sha512-z4swzjdhzCh95n9dw9lTvw+t3iwSkYRlVkYkra3C9mul/m5fTzHR7KmtkwH4qXMTXGJUbngtC/bz2cHQIHkO8g==
+"@tanstack/vue-virtual@^3.0.0-beta.60", "@tanstack/vue-virtual@^3.12.0", "@tanstack/vue-virtual@^3.8.1":
+  version "3.13.4"
+  resolved "https://registry.yarnpkg.com/@tanstack/vue-virtual/-/vue-virtual-3.13.4.tgz#0e5e8b6ba03a9a5f27793b2b4325bc4a80b60ad3"
+  integrity sha512-1fPrd3hE1SS4R/9JbX1AlzueY4duCK7ixuLcMW5GMnk9N6WbLo9MioNKiv22V+UaXKOLNy8tLdzT8NYerOFTOQ==
   dependencies:
-    "@tanstack/virtual-core" "3.13.2"
+    "@tanstack/virtual-core" "3.13.4"
 
 "@tiptap/core@^2.11.5":
   version "2.11.5"
@@ -566,6 +598,11 @@
   resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.11.5.tgz#84c6bf623c5dffcd73dd24d012c9636191031d43"
   integrity sha512-VXwHlX6A/T6FAspnyjbKDO0TQ+oetXuat6RY1/JxbXphH42nLuBaGWJ6pgy6xMl6XY8/9oPkTNrfJw/8/eeRwA==
 
+"@tiptap/extension-code-block-lowlight@^2.11.5":
+  version "2.11.5"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block-lowlight/-/extension-code-block-lowlight-2.11.5.tgz#62c05a70ec1f0b47e257a9345253031650ab014b"
+  integrity sha512-EIE+mAGsp8C69dI0Yyg+VH1x36rgyPJc93SfA7h4xFF6Oth18z4YhJtiLaZcwCMyOOVs2efApZ0R3/Fnz2VlqA==
+
 "@tiptap/extension-code-block@^2.11.5":
   version "2.11.5"
   resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.11.5.tgz#b90cea403884630f3f86c7629815250e8a266802"
@@ -784,6 +821,13 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
+"@types/hast@^3.0.0":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa"
+  integrity sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/linkify-it@^5":
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-5.0.0.tgz#21413001973106cda1c3a9b91eedd4ccd5469d76"
@@ -802,15 +846,25 @@
   resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-2.0.0.tgz#d43878b5b20222682163ae6f897b20447233bdfd"
   integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==
 
+"@types/unist@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.3.tgz#acaab0f919ce69cce629c2d4ed2eb4adc1b6c20c"
+  integrity sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==
+
 "@types/web-bluetooth@^0.0.20":
   version "0.0.20"
   resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
   integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
 
+"@types/web-bluetooth@^0.0.21":
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz#525433c784aed9b457aaa0ee3d92aeb71f346b63"
+  integrity sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==
+
 "@vitejs/plugin-vue@^5.0.3":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.2.1.tgz#d1491f678ee3af899f7ae57d9c21dc52a65c7133"
-  integrity sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-5.2.3.tgz#71a8fc82d4d2e425af304c35bf389506f674d89b"
+  integrity sha512-IYSLEQj4LgZZuoVpdSUCw3dIynTWQgPlaRP6iAvMle4My0HdYwr5g5wQAfwOeHQBmYwEkqF70nRpSilr6PoUDg==
 
 "@vue/compiler-core@3.5.13":
   version "3.5.13"
@@ -907,11 +961,26 @@
     "@vueuse/shared" "10.11.1"
     vue-demi ">=0.14.8"
 
+"@vueuse/core@^12.5.0":
+  version "12.8.2"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-12.8.2.tgz#007c6dd29a7d1f6933e916e7a2f8ef3c3f968eaa"
+  integrity sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.21"
+    "@vueuse/metadata" "12.8.2"
+    "@vueuse/shared" "12.8.2"
+    vue "^3.5.13"
+
 "@vueuse/metadata@10.11.1":
   version "10.11.1"
   resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.11.1.tgz#209db7bb5915aa172a87510b6de2ca01cadbd2a7"
   integrity sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==
 
+"@vueuse/metadata@12.8.2":
+  version "12.8.2"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-12.8.2.tgz#6cb3a4e97cdcf528329eebc1bda73cd7f64318d3"
+  integrity sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==
+
 "@vueuse/router@^12.7.0":
   version "12.8.2"
   resolved "https://registry.yarnpkg.com/@vueuse/router/-/router-12.8.2.tgz#3792eab50493e50a79767592a52f6c5bb441ef33"
@@ -927,7 +996,7 @@
   dependencies:
     vue-demi ">=0.14.8"
 
-"@vueuse/shared@12.8.2":
+"@vueuse/shared@12.8.2", "@vueuse/shared@^12.5.0":
   version "12.8.2"
   resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-12.8.2.tgz#b9e4611d0603629c8e151f982459da394e22f930"
   integrity sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==
@@ -944,6 +1013,11 @@ ace-builds@^1.36.2:
   resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.39.0.tgz#c191ce9168ba60e51a0de3c51950066809e3c7ce"
   integrity sha512-MqoZojv4gpc5QyTMor/dS6kmruDV9db9LVZbCiT4qYz6WsDiv4qyG5f7ZPc+wjUl6oLMqgCAsBjo1whdSVyMlQ==
 
+acorn@^8.14.0, acorn@^8.14.1:
+  version "8.14.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.1.tgz#721d5dc10f7d5b5609a891773d47731796935dfb"
+  integrity sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -1009,15 +1083,15 @@ aria-hidden@^1.2.4:
     tslib "^2.0.0"
 
 autoprefixer@^10.4.2:
-  version "10.4.20"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.20.tgz#5caec14d43976ef42e32dcb4bd62878e96be5b3b"
-  integrity sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==
+  version "10.4.21"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.21.tgz#77189468e7a8ad1d9a37fbc08efc9f480cf0a95d"
+  integrity sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==
   dependencies:
-    browserslist "^4.23.3"
-    caniuse-lite "^1.0.30001646"
+    browserslist "^4.24.4"
+    caniuse-lite "^1.0.30001702"
     fraction.js "^4.3.7"
     normalize-range "^0.1.2"
-    picocolors "^1.0.1"
+    picocolors "^1.1.1"
     postcss-value-parser "^4.2.0"
 
 balanced-match@^1.0.0:
@@ -1058,7 +1132,7 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.23.3:
+browserslist@^4.24.4:
   version "4.24.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.4.tgz#c6b2865a3f08bcb860a0e827389003b9fe686e4b"
   integrity sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==
@@ -1081,10 +1155,10 @@ camelcase-css@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
   integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
 
-caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001688:
-  version "1.0.30001702"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001702.tgz#cde16fa8adaa066c04aec2967b6cde46354644c4"
-  integrity sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==
+caniuse-lite@^1.0.30001688, caniuse-lite@^1.0.30001702:
+  version "1.0.30001706"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001706.tgz#902c3f896f4b2968031c3a546ab2ef8b465a2c8f"
+  integrity sha512-3ZczoTApMAZwPKYWmwVbQMFpXBDds3/0VciVoUwPUbldlYyVLmRVuRs/PcUZtHpbLRpzzDvrvnFuREsGt6lUug==
 
 chalk@^4.1.0:
   version "4.1.2"
@@ -1173,6 +1247,16 @@ commander@^9.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
   integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
 
+confbox@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.8.tgz#820d73d3b3c82d9bd910652c5d4d599ef8ff8b06"
+  integrity sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==
+
+confbox@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.2.1.tgz#ae39f2c99699afa451d00206479f15f9a1208a8b"
+  integrity sha512-hkT3yDPFbs95mNCy1+7qNKC6Pro+/ibzYxtM2iqEigpf0sVw+bg4Zh9/snjsBcf990vfIsg5+1U7VyiyBb3etg==
+
 core-js@^3.1.3:
   version "3.41.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.41.0.tgz#57714dafb8c751a6095d028a7428f1fb5834a776"
@@ -1207,6 +1291,13 @@ dayjs@^1.11.13, dayjs@^1.11.6:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
+debug@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  dependencies:
+    ms "^2.1.3"
+
 debug@~4.3.1, debug@~4.3.2:
   version "4.3.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
@@ -1226,6 +1317,18 @@ defu@^6.1.4:
   resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.4.tgz#4e0c9cf9ff68fe5f3d7f2765cc1a012dfdcb0479"
   integrity sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==
 
+dequal@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
+devlop@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018"
+  integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==
+  dependencies:
+    dequal "^2.0.0"
+
 didyoumean@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
@@ -1247,9 +1350,9 @@ eastasianwidth@^0.2.0:
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
 electron-to-chromium@^1.5.73:
-  version "1.5.112"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.112.tgz#8d3d95d4d5653836327890282c8eda5c6f26626d"
-  integrity sha512-oen93kVyqSb3l+ziUgzIOlWt/oOuy4zRmpwestMn4rhFWAoFJeFuCVte9F2fASjeZZo7l/Cif9TiyrdW4CwEMA==
+  version "1.5.120"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.120.tgz#ccfdd28e9795fb8c2221cefa2c9a071501c86247"
+  integrity sha512-oTUp3gfX1gZI+xfD2djr2rzQdHCwHzPQrrK0CD7WpTdF0nPdQ/INcRVjWgLdCT4a9W3jFObR9DAfsuyFQnI8CQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -1326,6 +1429,11 @@ estree-walker@^2.0.2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
+exsolve@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/exsolve/-/exsolve-1.0.4.tgz#7de5c75af82ecd15998328fbf5f2295883be3a39"
+  integrity sha512-xsZH6PXaER4XoV+NiT7JHp1bJodJVT+cxeSH1G0f0tlT0lJqYuHUP3bUx2HtfTDvOagMINYp8rsqusxud3RXhw==
+
 fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -1349,6 +1457,11 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
+fdir@^6.4.3:
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.3.tgz#011cdacf837eca9b811c89dbb902df714273db72"
+  integrity sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==
+
 feather-icons@^4.28.0:
   version "4.29.2"
   resolved "https://registry.yarnpkg.com/feather-icons/-/feather-icons-4.29.2.tgz#b03a47588a1c400f215e884504db1c18860d89f8"
@@ -1377,15 +1490,16 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-frappe-ui@^0.1.112:
-  version "0.1.112"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.112.tgz#8a1a3b5705c9a7b6e606cd462109400d86d760fb"
-  integrity sha512-swml+AedLotwdcqVEYbXfCs5MxSIB5qoRzyG59bw5xDqhGO3CrK01d2Egp2jYaBOWthYjqs3ZJ2ieE4c2ticIg==
+frappe-ui@^0.1.118:
+  version "0.1.118"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.118.tgz#36fb108d63194fe9b06078a84576e32af54d06b8"
+  integrity sha512-t29fYu22jfPoi/pFAbPX4//bh5XEgqbECHttjsOsPboC8BsnyYUtQSA/pY6PP/M/hMAW74QslnTK6iU/1OuSaQ==
   dependencies:
     "@headlessui/vue" "^1.7.14"
     "@popperjs/core" "^2.11.2"
     "@tailwindcss/forms" "^0.5.3"
     "@tailwindcss/typography" "^0.5.16"
+    "@tiptap/extension-code-block-lowlight" "^2.11.5"
     "@tiptap/extension-color" "^2.0.3"
     "@tiptap/extension-highlight" "^2.0.3"
     "@tiptap/extension-image" "^2.0.3"
@@ -1407,13 +1521,18 @@ frappe-ui@^0.1.112:
     dayjs "^1.11.13"
     feather-icons "^4.28.0"
     idb-keyval "^6.2.0"
+    lowlight "^3.3.0"
+    lucide-static "^0.479.0"
     ora "5.4.1"
     prettier "^3.3.2"
     radix-vue "^1.5.3"
+    reka-ui "^2.0.2"
     showdown "^2.1.0"
     socket.io-client "^4.5.1"
     tippy.js "^6.3.7"
     typescript "^5.0.2"
+    unplugin-icons "^22.1.0"
+    unplugin-vue-components "^28.4.1"
 
 fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
@@ -1451,6 +1570,11 @@ glob@^10.3.10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
+globals@^15.14.0:
+  version "15.15.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.15.0.tgz#7c4761299d41c32b075715a4ce1ede7897ff72a8"
+  integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==
+
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
@@ -1463,6 +1587,11 @@ hasown@^2.0.2:
   dependencies:
     function-bind "^1.1.2"
 
+highlight.js@^11.11.1, highlight.js@~11.11.0:
+  version "11.11.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.11.1.tgz#fca06fa0e5aeecf6c4d437239135fabc15213585"
+  integrity sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==
+
 idb-keyval@^6.2.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-6.2.1.tgz#94516d625346d16f56f3b33855da11bfded2db33"
@@ -1543,6 +1672,11 @@ jiti@^1.21.6:
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9"
   integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==
 
+kolorist@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
+  integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
+
 lilconfig@^3.0.0, lilconfig@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
@@ -1565,6 +1699,15 @@ linkifyjs@^4.2.0:
   resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.2.0.tgz#9dd30222b9cbabec9c950e725ec00031c7fa3f08"
   integrity sha512-pCj3PrQyATaoTYKHrgWRF3SJwsm61udVh+vuls/Rl6SptiDhgE7ziUIudAedRY9QEfynmM7/RmLEfPUyw1HPCw==
 
+local-pkg@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-1.1.1.tgz#f5fe74a97a3bd3c165788ee08ca9fbe998dc58dd"
+  integrity sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==
+  dependencies:
+    mlly "^1.7.4"
+    pkg-types "^2.0.1"
+    quansync "^0.2.8"
+
 lodash.castarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
@@ -1588,17 +1731,31 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
+lowlight@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-3.3.0.tgz#007b8a5bfcfd27cc65b96246d2de3e9dd4e23c6c"
+  integrity sha512-0JNhgFoPvP6U6lE/UdVsSq99tn6DhjjpAj5MxG49ewd2mOBVtwWYIT8ClyABhq198aXXODMU6Ox8DrGy/CpTZQ==
+  dependencies:
+    "@types/hast" "^3.0.0"
+    devlop "^1.0.0"
+    highlight.js "~11.11.0"
+
 lru-cache@^10.2.0:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
 
+lucide-static@^0.479.0:
+  version "0.479.0"
+  resolved "https://registry.yarnpkg.com/lucide-static/-/lucide-static-0.479.0.tgz#820318a03ab207a6242520aaf2156ff3384fd3e2"
+  integrity sha512-E+w3/8lKFpey3lZNKZfzHQGX+t/CH/afpPDdQxjBgStZ2bXY+CxI5KFX9TW818gYndLjV43fZJ7FqAO9kTCK4A==
+
 lucide-vue-next@^0.383.0:
   version "0.383.0"
   resolved "https://registry.yarnpkg.com/lucide-vue-next/-/lucide-vue-next-0.383.0.tgz#7222eea85c185634ceb6d494d5153a6868805a07"
   integrity sha512-paQmd2cHAye7Zl/lA0avZN2efZxFkMehfoori1BiHKX//KQG4DVuy00yl4YHVQ6h1B4EsR+QDRCpVUtwvKUBRw==
 
-magic-string@^0.30.11:
+magic-string@^0.30.11, magic-string@^0.30.17:
   version "0.30.17"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453"
   integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==
@@ -1657,6 +1814,16 @@ minimatch@^9.0.4:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
+mlly@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.4.tgz#3d7295ea2358ec7a271eaa5d000a0f84febe100f"
+  integrity sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==
+  dependencies:
+    acorn "^8.14.0"
+    pathe "^2.0.1"
+    pkg-types "^1.3.0"
+    ufo "^1.5.4"
+
 ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -1672,14 +1839,14 @@ mz@^2.7.0:
     thenify-all "^1.0.0"
 
 nanoid@^3.3.8:
-  version "3.3.8"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
-  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
 
 nanoid@^5.0.7:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.2.tgz#b87c6cb6941d127a23b24dffc4659bba48b219d7"
-  integrity sha512-b+CiXQCNMUGe0Ri64S9SXFcP9hogjAJ2Rd6GdVxhPLRm7mhGaM7VgOvCAJ1ZshfHbqVDI3uqTI5C8/GaKuLI7g==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.5.tgz#f7597f9d9054eb4da9548cdd53ca70f1790e87de"
+  integrity sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==
 
 node-releases@^2.0.19:
   version "2.0.19"
@@ -1706,6 +1873,11 @@ object-hash@^3.0.0:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
+ohash@^1.1.4:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.6.tgz#9ff7b0271d7076290794537d68ec2b40a60d133e"
+  integrity sha512-TBu7PtV8YkAZn0tSxobKY2n2aAQva936lhRrj6957aDaCf9IEtqsKbgMzXE/F/sjqYOwmrukeORHNLe5glk7Cg==
+
 onetime@^5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -1738,6 +1910,13 @@ package-json-from-dist@^1.0.0:
   resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
   integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
 
+package-manager-detector@^0.2.8:
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/package-manager-detector/-/package-manager-detector-0.2.11.tgz#3af0b34f99d86d24af0a0620603d2e1180d05c9c"
+  integrity sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==
+  dependencies:
+    quansync "^0.2.7"
+
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -1756,7 +1935,12 @@ path-scurry@^1.11.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-picocolors@^1.0.1, picocolors@^1.1.1:
+pathe@^2.0.1, pathe@^2.0.2, pathe@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
+  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+
+picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -1766,6 +1950,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
+picomatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
+  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
+
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -1784,6 +1973,24 @@ pirates@^4.0.1:
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
   integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
+pkg-types@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.3.1.tgz#bd7cc70881192777eef5326c19deb46e890917df"
+  integrity sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==
+  dependencies:
+    confbox "^0.1.8"
+    mlly "^1.7.4"
+    pathe "^2.0.1"
+
+pkg-types@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-2.1.0.tgz#70c9e1b9c74b63fdde749876ee0aa007ea9edead"
+  integrity sha512-wmJwA+8ihJixSoHKxZJRBQG1oY8Yr9pGLzRmSsNms0iNWyHHAlZCa7mmKiFR10YPZuz/2k169JiS/inOjBCZ2A==
+  dependencies:
+    confbox "^0.2.1"
+    exsolve "^1.0.1"
+    pathe "^2.0.3"
+
 postcss-import@^15.1.0:
   version "15.1.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70"
@@ -1903,9 +2110,9 @@ prosemirror-history@^1.0.0, prosemirror-history@^1.4.1:
     rope-sequence "^1.3.0"
 
 prosemirror-inputrules@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.4.0.tgz#ef1519bb2cb0d1e0cec74bad1a97f1c1555068bb"
-  integrity sha512-6ygpPRuTJ2lcOXs9JkefieMst63wVJBgHZGl5QOytN7oSZs3Co/BYbc3Yx9zm9H37Bxw8kVzCnDsihsVsL4yEg==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.5.0.tgz#e22bfaf1d6ea4fe240ad447c184af3d520d43c37"
+  integrity sha512-K0xJRCmt+uSw7xesnHmcn72yBGTbY45vm8gXI4LZXbx2Z0jwh5aF9xrGQgrVPu0WbyFVFF3E/o9VhJYz6SQWnA==
   dependencies:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
@@ -1919,13 +2126,13 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.2.2:
     w3c-keyname "^2.2.0"
 
 prosemirror-markdown@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.13.1.tgz#23feb6652dacb3dd78ffd8f131da37c20e4e4cf8"
-  integrity sha512-Sl+oMfMtAjWtlcZoj/5L/Q39MpEnVZ840Xo330WJWUvgyhNmLBLN7MsHn07s53nG/KImevWHSE6fEj4q/GihHw==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.13.2.tgz#863eb3fd5f57a444e4378174622b562735b1c503"
+  integrity sha512-FPD9rHPdA9fqzNmIIDhhnYQ6WgNoSWX9StUZ8LEKapaXU9i6XgykaHKhp6XMyXlOWetmaFgGDS/nu/w9/vUc5g==
   dependencies:
     "@types/markdown-it" "^14.0.0"
     markdown-it "^14.0.0"
-    prosemirror-model "^1.20.0"
+    prosemirror-model "^1.25.0"
 
 prosemirror-menu@^1.2.4:
   version "1.2.4"
@@ -1937,19 +2144,19 @@ prosemirror-menu@^1.2.4:
     prosemirror-history "^1.0.0"
     prosemirror-state "^1.0.0"
 
-prosemirror-model@^1.0.0, prosemirror-model@^1.19.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.24.1:
-  version "1.24.1"
-  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.24.1.tgz#b445e4f9b9cfc8c1a699215057b506842ebff1a9"
-  integrity sha512-YM053N+vTThzlWJ/AtPtF1j0ebO36nvbmDy4U7qA2XQB8JVaQp1FmB9Jhrps8s+z+uxhhVTny4m20ptUvhk0Mg==
+prosemirror-model@^1.0.0, prosemirror-model@^1.20.0, prosemirror-model@^1.21.0, prosemirror-model@^1.23.0, prosemirror-model@^1.24.1, prosemirror-model@^1.25.0:
+  version "1.25.0"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.0.tgz#c147113edc0718a14f03881e4c20367d0221f7af"
+  integrity sha512-/8XUmxWf0pkj2BmtqZHYJipTBMHIdVjuvFzMvEoxrtyGNmfvdhBiRwYt/eFwy2wA9DtBW3RLqvZnjurEkHaFCw==
   dependencies:
     orderedmap "^2.0.0"
 
 prosemirror-schema-basic@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.3.tgz#649c349bb21c61a56febf9deb71ac68fca4cedf2"
-  integrity sha512-h+H0OQwZVqMon1PNn0AG9cTfx513zgIG2DY00eJ00Yvgb3UD+GQ/VlWW5rcaxacpCGT1Yx8nuhwXk4+QbXUfJA==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.4.tgz#389ce1ec09b8a30ea9bbb92c58569cb690c2d695"
+  integrity sha512-ELxP4TlX3yr2v5rM7Sb70SqStq5NvI15c0j9j/gjsrO5vaw+fnnpovCLEGIcpeGfifkuqJwl4fon6b+KdrODYQ==
   dependencies:
-    prosemirror-model "^1.19.0"
+    prosemirror-model "^1.25.0"
 
 prosemirror-schema-list@^1.4.1:
   version "1.5.1"
@@ -2009,6 +2216,11 @@ punycode.js@^2.3.1:
   resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
   integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==
 
+quansync@^0.2.7, quansync@^0.2.8:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/quansync/-/quansync-0.2.10.tgz#32053cf166fa36511aae95fc49796116f2dc20e1"
+  integrity sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -2054,6 +2266,22 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
+reka-ui@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/reka-ui/-/reka-ui-2.1.0.tgz#ad298840b582f388d281cf0e1a46ad8775915d82"
+  integrity sha512-w4kEDEyXhIqv4QeFJeiuBc4mQP37hH/UTRpEb9dMbPdR49JG5TcV/s0+ntNRONUUW4LDLX7E1ZPcwBw5hnu0yw==
+  dependencies:
+    "@floating-ui/dom" "^1.6.13"
+    "@floating-ui/vue" "^1.1.6"
+    "@internationalized/date" "^3.5.0"
+    "@internationalized/number" "^3.5.0"
+    "@tanstack/vue-virtual" "^3.12.0"
+    "@vueuse/core" "^12.5.0"
+    "@vueuse/shared" "^12.5.0"
+    aria-hidden "^1.2.4"
+    defu "^6.1.4"
+    ohash "^1.1.4"
+
 resolve@^1.1.7, resolve@^1.22.8:
   version "1.22.10"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
@@ -2077,31 +2305,31 @@ reusify@^1.0.4:
   integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
 
 rollup@^4.20.0:
-  version "4.34.9"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.34.9.tgz#e1eb397856476778aeb6ac2ac3d09b2ce177a558"
-  integrity sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==
+  version "4.36.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.36.0.tgz#f40f4db47ba3b4f5846d32a47e580c0ed7cd8f02"
+  integrity sha512-zwATAXNQxUcd40zgtQG0ZafcRK4g004WtEl7kbuhTWPvf07PsfohXl39jVUvPF7jvNAIkKPQ2XrsDlWuxBd++Q==
   dependencies:
     "@types/estree" "1.0.6"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.34.9"
-    "@rollup/rollup-android-arm64" "4.34.9"
-    "@rollup/rollup-darwin-arm64" "4.34.9"
-    "@rollup/rollup-darwin-x64" "4.34.9"
-    "@rollup/rollup-freebsd-arm64" "4.34.9"
-    "@rollup/rollup-freebsd-x64" "4.34.9"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.34.9"
-    "@rollup/rollup-linux-arm-musleabihf" "4.34.9"
-    "@rollup/rollup-linux-arm64-gnu" "4.34.9"
-    "@rollup/rollup-linux-arm64-musl" "4.34.9"
-    "@rollup/rollup-linux-loongarch64-gnu" "4.34.9"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.34.9"
-    "@rollup/rollup-linux-riscv64-gnu" "4.34.9"
-    "@rollup/rollup-linux-s390x-gnu" "4.34.9"
-    "@rollup/rollup-linux-x64-gnu" "4.34.9"
-    "@rollup/rollup-linux-x64-musl" "4.34.9"
-    "@rollup/rollup-win32-arm64-msvc" "4.34.9"
-    "@rollup/rollup-win32-ia32-msvc" "4.34.9"
-    "@rollup/rollup-win32-x64-msvc" "4.34.9"
+    "@rollup/rollup-android-arm-eabi" "4.36.0"
+    "@rollup/rollup-android-arm64" "4.36.0"
+    "@rollup/rollup-darwin-arm64" "4.36.0"
+    "@rollup/rollup-darwin-x64" "4.36.0"
+    "@rollup/rollup-freebsd-arm64" "4.36.0"
+    "@rollup/rollup-freebsd-x64" "4.36.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.36.0"
+    "@rollup/rollup-linux-arm-musleabihf" "4.36.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.36.0"
+    "@rollup/rollup-linux-arm64-musl" "4.36.0"
+    "@rollup/rollup-linux-loongarch64-gnu" "4.36.0"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.36.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.36.0"
+    "@rollup/rollup-linux-s390x-gnu" "4.36.0"
+    "@rollup/rollup-linux-x64-gnu" "4.36.0"
+    "@rollup/rollup-linux-x64-musl" "4.36.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.36.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.36.0"
+    "@rollup/rollup-win32-x64-msvc" "4.36.0"
     fsevents "~2.3.2"
 
 rope-sequence@^1.3.0:
@@ -2300,6 +2528,19 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
+tinyexec@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
+  integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
+
+tinyglobby@^0.2.12:
+  version "0.2.12"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.12.tgz#ac941a42e0c5773bd0b5d08f32de82e74a1a61b5"
+  integrity sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==
+  dependencies:
+    fdir "^6.4.3"
+    picomatch "^4.0.2"
+
 tippy.js@^6.3.7:
   version "6.3.7"
   resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c"
@@ -2334,6 +2575,52 @@ uc.micro@^2.0.0, uc.micro@^2.1.0:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
   integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
 
+ufo@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.4.tgz#16d6949674ca0c9e0fbbae1fa20a71d7b1ded754"
+  integrity sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==
+
+unplugin-icons@^22.1.0:
+  version "22.1.0"
+  resolved "https://registry.yarnpkg.com/unplugin-icons/-/unplugin-icons-22.1.0.tgz#5a6fe3d751e50f1c937e289857b0418e6855d92a"
+  integrity sha512-ect2ZNtk1Zgwb0NVHd0C1IDW/MV+Jk/xaq4t8o6rYdVS3+L660ZdD5kTSQZvsgdwCvquRw+/wYn75hsweRjoIA==
+  dependencies:
+    "@antfu/install-pkg" "^1.0.0"
+    "@iconify/utils" "^2.3.0"
+    debug "^4.4.0"
+    local-pkg "^1.0.0"
+    unplugin "^2.2.0"
+
+unplugin-utils@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/unplugin-utils/-/unplugin-utils-0.2.4.tgz#56e4029a6906645a10644f8befc404b06d5d24d0"
+  integrity sha512-8U/MtpkPkkk3Atewj1+RcKIjb5WBimZ/WSLhhR3w6SsIj8XJuKTacSP8g+2JhfSGw0Cb125Y+2zA/IzJZDVbhA==
+  dependencies:
+    pathe "^2.0.2"
+    picomatch "^4.0.2"
+
+unplugin-vue-components@^28.4.1:
+  version "28.4.1"
+  resolved "https://registry.yarnpkg.com/unplugin-vue-components/-/unplugin-vue-components-28.4.1.tgz#9d6d9555bbe98ea41d673b886e1e638f36200501"
+  integrity sha512-niGSc0vJD9ueAnsqcfAldmtpkppZ09B6p2G1dL7X5S8KPdgbk1P+txPwaaDCe7N+eZh2VG1aAypLXkuJs3OSUg==
+  dependencies:
+    chokidar "^3.6.0"
+    debug "^4.4.0"
+    local-pkg "^1.0.0"
+    magic-string "^0.30.17"
+    mlly "^1.7.4"
+    tinyglobby "^0.2.12"
+    unplugin "^2.2.0"
+    unplugin-utils "^0.2.4"
+
+unplugin@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-2.2.1.tgz#c25a44f7761a86f16f8ff3b08a4b394d52b4d941"
+  integrity sha512-Q0YDhwViJaSnHf1cxLf+/VKhmfdr/ZAS/RL2GQVO0cAbAfJAVUef2bvNu+veyWcEPNwsTlFmMiFLjf8Xeqog8g==
+  dependencies:
+    acorn "^8.14.1"
+    webpack-virtual-modules "^0.6.2"
+
 update-browserslist-db@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
@@ -2415,6 +2702,11 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+webpack-virtual-modules@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz#057faa9065c8acf48f24cb57ac0e77739ab9a7e8"
+  integrity sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==
+
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
diff --git a/lms/hooks.py b/lms/hooks.py
index 3fde3094..d26b2b3c 100644
--- a/lms/hooks.py
+++ b/lms/hooks.py
@@ -242,6 +242,8 @@ profile_url_prefix = "/users/"
 
 signup_form_template = "lms.plugins.show_custom_signup"
 
+on_login = "lms.lms.user.on_login"
+
 add_to_apps_screen = [
 	{
 		"name": "lms",
diff --git a/lms/install.py b/lms/install.py
index 23fdc584..c9cc6c43 100644
--- a/lms/install.py
+++ b/lms/install.py
@@ -4,7 +4,6 @@ from lms.lms.api import give_dicussions_permission
 
 
 def after_install():
-	add_pages_to_nav()
 	create_batch_source()
 	give_dicussions_permission()
 
@@ -15,37 +14,6 @@ def after_sync():
 	add_all_roles_to("Administrator")
 
 
-def add_pages_to_nav():
-	pages = [
-		{"label": "Explore", "idx": 1},
-		{"label": "Courses", "url": "/lms/courses", "parent": "Explore", "idx": 2},
-		{"label": "Batches", "url": "/lms/batches", "parent": "Explore", "idx": 3},
-		{"label": "Statistics", "url": "/lms/statistics", "parent": "Explore", "idx": 4},
-		{"label": "Jobs", "url": "/lms/job-openings", "parent": "Explore", "idx": 5},
-	]
-
-	for page in pages:
-		filters = frappe._dict()
-		if page.get("url"):
-			filters["url"] = ["like", "%" + page.get("url") + "%"]
-		else:
-			filters["label"] = page.get("label")
-
-		if not frappe.db.exists("Top Bar Item", filters):
-			frappe.get_doc(
-				{
-					"doctype": "Top Bar Item",
-					"label": page.get("label"),
-					"url": page.get("url"),
-					"parent_label": page.get("parent"),
-					"idx": page.get("idx"),
-					"parent": "Website Settings",
-					"parenttype": "Website Settings",
-					"parentfield": "top_bar_items",
-				}
-			).save()
-
-
 def before_uninstall():
 	delete_custom_fields()
 	delete_lms_roles()
diff --git a/lms/lms/api.py b/lms/lms/api.py
index f1cf7fef..83af8015 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -229,6 +229,12 @@ def validate_billing_access(billing_type, name):
 			access = False
 			message = _("You are already enrolled for this batch.")
 
+		seat_count = frappe.get_cached_value("LMS Batch", name, "seat_count")
+		number_of_students = frappe.db.count("LMS Batch Enrollment", {"batch": name})
+		if seat_count <= number_of_students:
+			access = False
+			message = _("Batch is sold out.")
+
 	elif access and billing_type == "certificate":
 		purchased_certificate = frappe.db.exists(
 			"LMS Enrollment",
@@ -1295,13 +1301,23 @@ def get_certification_details(course):
 		membership = frappe.db.get_value(
 			"LMS Enrollment",
 			filters,
-			["name", "certificate", "purchased_certificate"],
+			["name", "purchased_certificate"],
 			as_dict=1,
 		)
 
 	paid_certificate = frappe.db.get_value("LMS Course", course, "paid_certificate")
+	certificate = frappe.db.get_value(
+		"LMS Certificate",
+		{"member": frappe.session.user, "course": course},
+		["name", "template"],
+		as_dict=1,
+	)
 
-	return {"membership": membership, "paid_certificate": paid_certificate}
+	return {
+		"membership": membership,
+		"paid_certificate": paid_certificate,
+		"certificate": certificate,
+	}
 
 
 @frappe.whitelist()
diff --git a/lms/lms/doctype/lms_batch/lms_batch.py b/lms/lms/doctype/lms_batch/lms_batch.py
index e293c794..10f7afa0 100644
--- a/lms/lms/doctype/lms_batch/lms_batch.py
+++ b/lms/lms/doctype/lms_batch/lms_batch.py
@@ -408,14 +408,14 @@ def send_batch_start_reminder():
 
 	for batch in batches:
 		students = frappe.get_all(
-			"LMS Batch Enrollment", {"batch": batch}, ["member", "member_name"]
+			"LMS Batch Enrollment", {"batch": batch.name}, ["member", "member_name"]
 		)
 		for student in students:
 			send_mail(batch, student)
 
 
 def send_mail(batch, student):
-	subject = _("Batch Start Reminder")
+	subject = _("Your batch {0} is starting tomorrow").format(batch.title)
 	template = "batch_start_reminder"
 
 	args = {
diff --git a/lms/lms/doctype/lms_category/lms_category.json b/lms/lms/doctype/lms_category/lms_category.json
index 15b9b29c..8dd8ce23 100644
--- a/lms/lms/doctype/lms_category/lms_category.json
+++ b/lms/lms/doctype/lms_category/lms_category.json
@@ -21,7 +21,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-23 19:33:49.593950",
+ "modified": "2025-03-19 12:12:23.723432",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Category",
@@ -51,6 +51,26 @@
    "role": "Moderator",
    "share": 1,
    "write": 1
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Course Creator",
+   "select": 1,
+   "share": 1
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Batch Evaluator",
+   "select": 1,
+   "share": 1
   }
  ],
  "sort_field": "modified",
diff --git a/lms/lms/doctype/lms_course/lms_course.json b/lms/lms/doctype/lms_course/lms_course.json
index 90e900d0..6cf01f8e 100644
--- a/lms/lms/doctype/lms_course/lms_course.json
+++ b/lms/lms/doctype/lms_course/lms_course.json
@@ -277,28 +277,20 @@
  "is_published_field": "published",
  "links": [
   {
-   "group": "Chapters",
+   "link_doctype": "LMS Enrollment",
+   "link_fieldname": "course"
+  },
+  {
    "link_doctype": "Course Chapter",
    "link_fieldname": "course"
   },
   {
-   "group": "Batches",
-   "link_doctype": "LMS Batch Old",
-   "link_fieldname": "course"
-  },
-  {
-   "group": "Mentors",
-   "link_doctype": "LMS Course Mentor Mapping",
-   "link_fieldname": "course"
-  },
-  {
-   "group": "Interests",
-   "link_doctype": "LMS Course Interest",
+   "link_doctype": "Course Lesson",
    "link_fieldname": "course"
   }
  ],
  "make_attachments_public": 1,
- "modified": "2025-03-04 15:43:25.151554",
+ "modified": "2025-03-13 16:01:19.105212",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Course",
diff --git a/lms/lms/doctype/lms_live_class/lms_live_class.py b/lms/lms/doctype/lms_live_class/lms_live_class.py
index 8251e3c4..610c2b9b 100644
--- a/lms/lms/doctype/lms_live_class/lms_live_class.py
+++ b/lms/lms/doctype/lms_live_class/lms_live_class.py
@@ -84,7 +84,7 @@ def send_live_class_reminder():
 
 
 def send_mail(live_class, student):
-	subject = f"Your class on {live_class.title} is tomorrow"
+	subject = _("Your class on {0} is today").format(live_class.title)
 	template = "live_class_reminder"
 
 	args = {
diff --git a/lms/lms/doctype/lms_payment/lms_payment.json b/lms/lms/doctype/lms_payment/lms_payment.json
index cca8ae66..d66f0183 100644
--- a/lms/lms/doctype/lms_payment/lms_payment.json
+++ b/lms/lms/doctype/lms_payment/lms_payment.json
@@ -44,13 +44,15 @@
    "fieldtype": "Currency",
    "in_list_view": 1,
    "label": "Amount",
-   "options": "currency"
+   "options": "currency",
+   "reqd": 1
   },
   {
    "fieldname": "currency",
    "fieldtype": "Link",
    "label": "Currency",
-   "options": "Currency"
+   "options": "Currency",
+   "reqd": 1
   },
   {
    "fieldname": "column_break_rqkd",
@@ -70,7 +72,8 @@
    "fieldname": "address",
    "fieldtype": "Link",
    "label": "Address",
-   "options": "Address"
+   "options": "Address",
+   "reqd": 1
   },
   {
    "default": "0",
@@ -124,13 +127,15 @@
    "fieldname": "payment_for_document_type",
    "fieldtype": "Select",
    "label": "Payment for Document Type",
-   "options": "\nLMS Course\nLMS Batch"
+   "options": "\nLMS Course\nLMS Batch",
+   "reqd": 1
   },
   {
    "fieldname": "payment_for_document",
    "fieldtype": "Dynamic Link",
    "label": "Payment for Document",
-   "options": "payment_for_document_type"
+   "options": "payment_for_document_type",
+   "reqd": 1
   },
   {
    "fieldname": "source",
@@ -156,7 +161,7 @@
    "link_fieldname": "payment"
   }
  ],
- "modified": "2025-02-21 18:29:55.436611",
+ "modified": "2025-03-13 15:31:38.019002",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Payment",
diff --git a/lms/lms/doctype/lms_payment/lms_payment.py b/lms/lms/doctype/lms_payment/lms_payment.py
index 1378f4e3..0966ad1b 100644
--- a/lms/lms/doctype/lms_payment/lms_payment.py
+++ b/lms/lms/doctype/lms_payment/lms_payment.py
@@ -36,6 +36,9 @@ def send_payment_reminder():
 		if has_paid_later(payment):
 			continue
 
+		if is_batch_sold_out(payment):
+			continue
+
 		send_mail(payment)
 
 
@@ -51,6 +54,21 @@ def has_paid_later(payment):
 	)
 
 
+def is_batch_sold_out(payment):
+	if payment.payment_for_document_type == "LMS Batch":
+		seat_count = frappe.get_cached_value(
+			"LMS Batch", payment.payment_for_document, "seat_count"
+		)
+		number_of_students = frappe.db.count(
+			"LMS Batch Enrollment", {"batch": payment.payment_for_document}
+		)
+
+		if seat_count <= number_of_students:
+			return True
+
+	return False
+
+
 def send_mail(payment):
 	subject = _("Complete Your Enrollment - Don't miss out!")
 	template = "payment_reminder"
diff --git a/lms/lms/user.py b/lms/lms/user.py
index ade66c82..64aaeafe 100644
--- a/lms/lms/user.py
+++ b/lms/lms/user.py
@@ -83,3 +83,9 @@ def set_country_from_ip(login_manager=None, user=None):
 	#    return
 	frappe.db.set_value("User", user, "country", get_country_code())
 	return
+
+
+def on_login(login_manager):
+	default_app = frappe.db.get_single_value("System Settings", "default_app")
+	if default_app == "lms":
+		frappe.local.response["home_page"] = "/lms"
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index b1a73e86..a0e7789a 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1889,16 +1889,16 @@ def update_payment_record(doctype, docname):
 
 		try:
 			if payment_for_certificate:
-				update_certificate_purchase(docname)
+				update_certificate_purchase(docname, data.payment)
 			elif doctype == "LMS Course":
-				enroll_in_course(data.payment, docname)
+				enroll_in_course(docname, data.payment)
 			else:
 				enroll_in_batch(docname, data.payment)
 		except Exception as e:
 			frappe.log_error(frappe.get_traceback(), _("Enrollment Failed"))
 
 
-def enroll_in_course(payment_name, course):
+def enroll_in_course(course, payment_name):
 	if not frappe.db.exists(
 		"LMS Enrollment", {"member": frappe.session.user, "course": course}
 	):
@@ -1950,12 +1950,14 @@ def enroll_in_batch(batch, payment_name=None):
 		new_student.save()
 
 
-def update_certificate_purchase(course):
+def update_certificate_purchase(course, payment_name):
 	frappe.db.set_value(
 		"LMS Enrollment",
 		{"member": frappe.session.user, "course": course},
-		"purchased_certificate",
-		1,
+		{
+			"purchased_certificate": 1,
+			"payment": payment_name,
+		},
 	)
 
 
diff --git a/lms/locale/ar.po b/lms/locale/ar.po
index fdff06c0..3866de42 100644
--- a/lms/locale/ar.po
+++ b/lms/locale/ar.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "الكل"
 
@@ -370,15 +370,15 @@ msgstr ""
 msgid "Apps"
 msgstr "التطبيقات"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "أرشفة"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "وصف الباتش"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "تفاصيل الدفعة"
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "الدفعات:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -705,12 +697,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr ""
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "أكد"
 
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "أنشأ"
 
@@ -1498,7 +1488,7 @@ msgstr "تاريخ"
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "التاريخ:"
 
@@ -1815,8 +1805,7 @@ msgstr "وقت الانتهاء"
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr "فائدة"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "الإهتمامات او الفوائد"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr "وظائف"
 msgid "Join"
 msgstr "انضم"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr "دخول"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "متوسط:"
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "جديد"
 
@@ -3952,7 +3930,7 @@ msgstr "يرجى التحقق من بريدك الالكتروني للتحقق"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "بداية"
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "تاريخ البدء:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/bs.po b/lms/locale/bs.po
index 031308e1..2445fc34 100644
--- a/lms/locale/bs.po
+++ b/lms/locale/bs.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Bosnian\n"
 "MIME-Version: 1.0\n"
@@ -149,7 +149,7 @@ msgstr "Dodaj Poglavlje"
 
 #: frontend/src/components/Modals/BatchCourseModal.vue:5
 msgid "Add a course"
-msgstr "Doda Kurs"
+msgstr "Dodaj Kurs"
 
 #: frontend/src/pages/CourseForm.vue:136
 msgid "Add a keyword and then press enter"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Sve"
 
@@ -370,15 +370,15 @@ msgstr "Odobreno"
 msgid "Apps"
 msgstr "Aplikacije"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "Arhivirano"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "Jeste li sigurni da želite otkazati ovo ocjenjivanje? Ova radnja se ne može poništiti."
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr "Jeste li sigurni da se želite prijaviti na svoju Frappe Cloud Nadzornu Tablu?"
 
@@ -538,7 +538,7 @@ msgstr "Slika Značke"
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Batch"
-msgstr "Šarža"
+msgstr "Grupa"
 
 #. Label of the batch_confirmation_template (Link) field in DocType 'LMS
 #. Settings'
@@ -559,17 +559,15 @@ msgstr "Grupa Kreirana"
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Batch Description"
-msgstr "Opis Šarže"
+msgstr "Opis Grupe"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:236
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
-msgstr "Detalji Šarže"
+msgstr "Detalji Grupe"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -612,10 +610,6 @@ msgstr "Postavke Grupe"
 msgid "Batch Start Date:"
 msgstr "Datum Početka Grupe:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr "Podsjetnik Početka Grupe"
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -633,12 +627,10 @@ msgstr "Datum završetka grupe ne može biti prije datuma početka grupe"
 
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
-msgstr "Šarža:"
+msgstr "Grupa:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr "Grupe"
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "Datum Početka"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "Srdačan Pozdrav"
 
@@ -705,12 +697,12 @@ msgstr "Od"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr "Otkaži ovo ocjenjivanje?"
 
@@ -794,7 +786,7 @@ msgstr "Certifikati su uspješno generirani"
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr "Poglavlje je uspješno ažurirano"
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "Poglavlja"
@@ -1125,7 +1116,7 @@ msgstr "Uslov mora biti važeći Python kod."
 msgid "Conduct Evaluation"
 msgstr "Provedi Ocjenjivanje"
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Potvrdi"
 
@@ -1381,8 +1372,8 @@ msgstr "Kurs {0} je već dodan ovoj grupi."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr "Kreiraj kurs"
 msgid "Create a new question"
 msgstr "Kreiraj novo pitanje"
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "Kreirano"
 
@@ -1498,7 +1488,7 @@ msgstr "Datum"
 msgid "Date and Time"
 msgstr "Datum i Vrijeme"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Datum:"
 
@@ -1815,8 +1805,7 @@ msgstr "Vrijeme Završetka"
 msgid "Enroll Now"
 msgstr "Upišite se sada"
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr "Upisan"
 
@@ -2198,8 +2187,8 @@ msgstr "Generiraj Google Meet Vezu"
 msgid "Get Certificate"
 msgstr "Preuzmi Certifikat"
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "Certificiraj se"
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr "Ako imate bilo kakvih pitanja ili vam je potrebna pomoć, slobodno se obratite našem timu za podršku."
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "Ako imate bilo kakvih pitanja ili vam je potrebna pomoć, slobodno nas kontaktirajte."
 
@@ -2499,11 +2488,6 @@ msgstr "Komentari Instruktora"
 msgid "Interest"
 msgstr "Kamata"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "Interesi"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr "Nevažeći Pozivni Kod"
@@ -2644,7 +2628,7 @@ msgstr "Poslovi"
 msgid "Join"
 msgstr "Pridružite se"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr "Pridružite se Pozivu"
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr "Lista Kvizova"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Uživo"
 
@@ -3046,7 +3030,7 @@ msgstr "Preferenca Lokacije"
 msgid "Login"
 msgstr "Prijava"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr "Prijavi se na Frappe Cloud?"
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr "Medium ID"
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Srednje:"
 
@@ -3314,11 +3298,6 @@ msgstr "Šablon Kreiranje Zahtjeva za Mentora"
 msgid "Mentor Request Status Update Template"
 msgstr "Status Šablona Kreiranja Zahtjeva za Mentora"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr "Mentori"
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "Moj Kalendar"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Novi"
 
@@ -3952,7 +3930,7 @@ msgstr "Provjeri e-poštu za potvrdu"
 msgid "Please click on the following button to set your new password"
 msgstr "Klikni na sljedeće dugme da postavite novu lozinku"
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "Završite prethodne kurseve u programu da biste se upisali na ovaj kurs."
 
@@ -4022,7 +4000,7 @@ msgstr "Prijavi se da nastaviš s plaćanjem."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Dobro se pripremi i dođi na vrijeme za ocjenjivanje."
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr "Zakaži ocjenjvanje kako biste dobili certifikat."
 
@@ -4881,7 +4859,7 @@ msgstr "Start"
 msgid "Start Date"
 msgstr "Start Datum"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Datum Početka:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "Vremenska Zona"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr "Vremena:"
 
@@ -5547,7 +5525,7 @@ msgstr "Pod Recenzijom"
 msgid "Unlisted"
 msgstr "Neizlistane"
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr "Neobjavljeno"
 
@@ -5569,9 +5547,8 @@ msgstr "Nestrukturirana Uloga"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr "Ugradiva Video Veza"
 msgid "View"
 msgstr "Pogled"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr "Prikaži Certifikat"
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr "Posjeti Grupu"
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr "Posjeti sljedeću vezu da vidite svoje "
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr "Posjeti svoju grupu"
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr "YouTube video će se pojaviti na vrhu lekcije."
 msgid "Your Account has been successfully created!"
 msgstr "Vaš račun je uspješno kreiran!"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr "Vaša grupa {0} počinje sutra"
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr "Vaš kalendar je postavljen."
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr "Vaš čas {0} je danas"
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/de.po b/lms/locale/de.po
index bd455baf..534b6f8c 100644
--- a/lms/locale/de.po
+++ b/lms/locale/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Alle"
 
@@ -370,15 +370,15 @@ msgstr "Genehmigt"
 msgid "Apps"
 msgstr "Apps"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "Archiviert"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "Chargenbeschreibung"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "Chargendetails"
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "Charge:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "Anfangsdatum"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "Herzliche Grüße"
 
@@ -705,12 +697,12 @@ msgstr "Von"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "Kapitel"
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "Erstellt"
 
@@ -1498,7 +1488,7 @@ msgstr "Datum"
 msgid "Date and Time"
 msgstr "Datum und Uhrzeit"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Datum:"
 
@@ -1815,8 +1805,7 @@ msgstr "Endzeit"
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr "Google Meet-Link generieren"
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "Wenn Sie Fragen haben oder Hilfe benötigen, können Sie uns gerne kontaktieren."
 
@@ -2499,11 +2488,6 @@ msgstr "Kommentare der Dozenten"
 msgid "Interest"
 msgstr "Zinsen"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "Interessen"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr "Ungültiger Einladungscode."
@@ -2644,7 +2628,7 @@ msgstr "freie Stellen"
 msgid "Join"
 msgstr "Beitreten"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr "Anmelden"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr "Melden Sie sich bei Frappe Cloud an?"
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Mittel:"
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "Mein Kalender"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Neu"
 
@@ -3952,7 +3930,7 @@ msgstr "Bitte überprüfen Sie Ihren Posteingang. Wir haben Ihnen eine E-Mail mi
 msgid "Please click on the following button to set your new password"
 msgstr "Bitte klicken Sie auf die folgende Schaltfläche, um Ihr neues Passwort festzulegen"
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr "Bitte loggen Sie sich ein, um mit der Zahlung fortzufahren."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Bitte bereiten Sie sich gut vor und erscheinen Sie pünktlich zu den Prüfungen."
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "Starten"
 msgid "Start Date"
 msgstr "Startdatum"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Startdatum:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "Zeitzone"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr "Wird überprüft"
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr "Video-Einbettungslink"
 msgid "View"
 msgstr "Ansicht"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr "Das YouTube-Video wird oben in der Lektion angezeigt."
 msgid "Your Account has been successfully created!"
 msgstr "Ihr Konto wurde erfolgreich erstellt!"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr "Ihr Kalender ist eingestellt."
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/eo.po b/lms/locale/eo.po
index 6c5916dd..943f7b55 100644
--- a/lms/locale/eo.po
+++ b/lms/locale/eo.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "crwdns149248:0crwdne149248:0"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "crwdns149250:0crwdne149250:0"
 
@@ -370,15 +370,15 @@ msgstr "crwdns149292:0crwdne149292:0"
 msgid "Apps"
 msgstr "crwdns149294:0crwdne149294:0"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "crwdns152268:0crwdne152268:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "crwdns152463:0crwdne152463:0"
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr "crwdns152465:0crwdne152465:0"
 
@@ -566,8 +566,6 @@ msgstr "crwdns149354:0crwdne149354:0"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "crwdns149356:0crwdne149356:0"
 
@@ -612,10 +610,6 @@ msgstr "crwdns149366:0crwdne149366:0"
 msgid "Batch Start Date:"
 msgstr "crwdns149368:0crwdne149368:0"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr "crwdns152467:0crwdne152467:0"
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr "crwdns149376:0crwdne149376:0"
 msgid "Batch:"
 msgstr "crwdns152469:0crwdne152469:0"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr "crwdns149380:0crwdne149380:0"
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "crwdns149382:0crwdne149382:0"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "crwdns149384:0crwdne149384:0"
 
@@ -705,12 +697,12 @@ msgstr "crwdns149406:0crwdne149406:0"
 msgid "CGPA/4"
 msgstr "crwdns149408:0crwdne149408:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "crwdns152471:0crwdne152471:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr "crwdns152473:0crwdne152473:0"
 
@@ -794,7 +786,7 @@ msgstr "crwdns151924:0crwdne151924:0"
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr "crwdns151622:0crwdne151622:0"
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "crwdns149446:0crwdne149446:0"
@@ -1125,7 +1116,7 @@ msgstr "crwdns149530:0crwdne149530:0"
 msgid "Conduct Evaluation"
 msgstr "crwdns154203:0crwdne154203:0"
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "crwdns152479:0crwdne152479:0"
 
@@ -1381,8 +1372,8 @@ msgstr "crwdns149596:0{0}crwdne149596:0"
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr "crwdns151738:0crwdne151738:0"
 msgid "Create a new question"
 msgstr "crwdns149616:0crwdne149616:0"
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "crwdns152116:0crwdne152116:0"
 
@@ -1498,7 +1488,7 @@ msgstr "crwdns149632:0crwdne149632:0"
 msgid "Date and Time"
 msgstr "crwdns149634:0crwdne149634:0"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "crwdns152483:0crwdne152483:0"
 
@@ -1815,8 +1805,7 @@ msgstr "crwdns149720:0crwdne149720:0"
 msgid "Enroll Now"
 msgstr "crwdns149722:0crwdne149722:0"
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr "crwdns152272:0crwdne152272:0"
 
@@ -2198,8 +2187,8 @@ msgstr "crwdns149836:0crwdne149836:0"
 msgid "Get Certificate"
 msgstr "crwdns149838:0crwdne149838:0"
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "crwdns152432:0crwdne152432:0"
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr "crwdns152436:0crwdne152436:0"
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "crwdns149904:0crwdne149904:0"
 
@@ -2499,11 +2488,6 @@ msgstr "crwdns149944:0crwdne149944:0"
 msgid "Interest"
 msgstr "crwdns149946:0crwdne149946:0"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "crwdns149948:0crwdne149948:0"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr "crwdns149950:0crwdne149950:0"
@@ -2644,7 +2628,7 @@ msgstr "crwdns149994:0crwdne149994:0"
 msgid "Join"
 msgstr "crwdns149996:0crwdne149996:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr "crwdns152499:0crwdne152499:0"
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr "crwdns150104:0crwdne150104:0"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "crwdns150106:0crwdne150106:0"
 
@@ -3046,7 +3030,7 @@ msgstr "crwdns150120:0crwdne150120:0"
 msgid "Login"
 msgstr "crwdns150122:0crwdne150122:0"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr "crwdns152505:0crwdne152505:0"
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr "crwdns150156:0crwdne150156:0"
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "crwdns150158:0crwdne150158:0"
 
@@ -3314,11 +3298,6 @@ msgstr "crwdns150184:0crwdne150184:0"
 msgid "Mentor Request Status Update Template"
 msgstr "crwdns150186:0crwdne150186:0"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr "crwdns150188:0crwdne150188:0"
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "crwdns150212:0crwdne150212:0"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "crwdns150214:0crwdne150214:0"
 
@@ -3952,7 +3930,7 @@ msgstr "crwdns150404:0crwdne150404:0"
 msgid "Please click on the following button to set your new password"
 msgstr "crwdns150406:0crwdne150406:0"
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "crwdns151772:0crwdne151772:0"
 
@@ -4022,7 +4000,7 @@ msgstr "crwdns150428:0crwdne150428:0"
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "crwdns150430:0crwdne150430:0"
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr "crwdns152615:0crwdne152615:0"
 
@@ -4881,7 +4859,7 @@ msgstr "crwdns150712:0crwdne150712:0"
 msgid "Start Date"
 msgstr "crwdns150714:0crwdne150714:0"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "crwdns152515:0crwdne152515:0"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "crwdns150846:0crwdne150846:0"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr "crwdns150848:0crwdne150848:0"
 
@@ -5547,7 +5525,7 @@ msgstr "crwdns150890:0crwdne150890:0"
 msgid "Unlisted"
 msgstr "crwdns150892:0crwdne150892:0"
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr "crwdns152296:0crwdne152296:0"
 
@@ -5569,9 +5547,8 @@ msgstr "crwdns150898:0crwdne150898:0"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr "crwdns150936:0crwdne150936:0"
 msgid "View"
 msgstr "crwdns150938:0crwdne150938:0"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr "crwdns150940:0crwdne150940:0"
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr "crwdns150944:0crwdne150944:0"
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr "crwdns150946:0crwdne150946:0"
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr "crwdns154220:0crwdne154220:0"
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr "crwdns151032:0crwdne151032:0"
 msgid "Your Account has been successfully created!"
 msgstr "crwdns151034:0crwdne151034:0"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr "crwdns154222:0{0}crwdne154222:0"
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr "crwdns151036:0crwdne151036:0"
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr "crwdns154224:0{0}crwdne154224:0"
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/es.po b/lms/locale/es.po
index 9728fe03..95d17ff6 100644
--- a/lms/locale/es.po
+++ b/lms/locale/es.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Todos"
 
@@ -370,15 +370,15 @@ msgstr "Aprobado"
 msgid "Apps"
 msgstr "Apps"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "Archivado"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "Descripción de Lotes"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "Detalles del lote"
 
@@ -612,10 +610,6 @@ msgstr "Configuración de lotes"
 msgid "Batch Start Date:"
 msgstr "Fecha de inicio del lote:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr "La fecha de finalización del grupo no puede ser anterior a la fecha de
 msgid "Batch:"
 msgstr "Lote:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr "Lotes"
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "Fecha de comienzo"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "Atentamente,"
 
@@ -705,12 +697,12 @@ msgstr "Por"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "Capítulos"
@@ -1125,7 +1116,7 @@ msgstr "La condición debe ser un código Python válido."
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1381,8 +1372,8 @@ msgstr "El curso {0} ya se ha agregado a este lote."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr "Crear una nueva pregunta"
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "Creado"
 
@@ -1498,7 +1488,7 @@ msgstr "Fecha"
 msgid "Date and Time"
 msgstr "Fecha y hora"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Fecha:"
 
@@ -1815,8 +1805,7 @@ msgstr "Hora de finalización"
 msgid "Enroll Now"
 msgstr "Inscribirse ahora"
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr "Generar enlace de Google Meet"
 msgid "Get Certificate"
 msgstr "Obtener certificado"
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "Si tiene alguna pregunta o necesita ayuda, no dude en ponerse en contacto con nosotros."
 
@@ -2499,11 +2488,6 @@ msgstr "Comentarios del instructor"
 msgid "Interest"
 msgstr "Interesar"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "Intereses"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr "Código de invitación inválido."
@@ -2644,7 +2628,7 @@ msgstr "Trabajos"
 msgid "Join"
 msgstr "Unirse"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr "Lista de cuestionarios"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "En vivo"
 
@@ -3046,7 +3030,7 @@ msgstr "Preferencia de ubicación"
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr "ID de Medium"
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Medio:"
 
@@ -3314,11 +3298,6 @@ msgstr "Plantilla de creación de solicitud de mentor"
 msgid "Mentor Request Status Update Template"
 msgstr "Plantilla de actualización del estado de la solicitud de mentor"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr "Mentores"
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "Mi calendario"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Nuevo"
 
@@ -3952,7 +3930,7 @@ msgstr "Por favor, consultar su correo electrónico para la verificación"
 msgid "Please click on the following button to set your new password"
 msgstr "Haga clic en el siguiente botón para establecer su nueva contraseña"
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr "Por favor inicie sesión para continuar con el pago."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Por favor, prepárese bien y llegue a tiempo a las evaluaciones."
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "Iniciar"
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Fecha de inicio:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "Zona Horaria"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr "Horarios:"
 
@@ -5547,7 +5525,7 @@ msgstr "En Revisión"
 msgid "Unlisted"
 msgstr "No listado"
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr "Rol no estructurado"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr "Enlace de incrustación de vídeo"
 msgid "View"
 msgstr "Ver"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr "Ver certificado"
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr "Visitar el Grupo"
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr "Visita el siguiente enlace para ver tu "
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr "El vídeo de YouTube aparecerá en la parte superior de la lección."
 msgid "Your Account has been successfully created!"
 msgstr "¡Su cuenta ha sido creada satisfactoriamente!"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr "Su calendario está configurado."
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/fa.po b/lms/locale/fa.po
index d529c6aa..139dc5fe 100644
--- a/lms/locale/fa.po
+++ b/lms/locale/fa.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-16 00:19\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "ادمین"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "همه"
 
@@ -370,15 +370,15 @@ msgstr "تایید شده"
 msgid "Apps"
 msgstr "برنامه ها"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "بایگانی شد"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "توضیحات دسته"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "جزئیات دسته"
 
@@ -612,10 +610,6 @@ msgstr "تنظمات دسته"
 msgid "Batch Start Date:"
 msgstr "تاریخ شروع دسته:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "دسته:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "با احترام"
 
@@ -705,12 +697,12 @@ msgstr "توسط"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "لغو"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr "فصل با موفقیت به روز شد"
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "فصل‌ها"
@@ -892,7 +883,7 @@ msgstr "یک تصویر انتخاب کن"
 
 #: frontend/src/components/Quiz.vue:611 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
-msgstr "یک پاسخ را انتخاب کردن کنید"
+msgstr "یک پاسخ را انتخاب کنید"
 
 #. Label of the city (Data) field in DocType 'User'
 #: frontend/src/pages/Billing.vue:81 lms/fixtures/custom_field.json
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "تایید"
 
@@ -1381,8 +1372,8 @@ msgstr "دوره {0} قبلاً به این دسته اضافه شده است."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "ایجاد شده"
 
@@ -1498,7 +1488,7 @@ msgstr "تاریخ"
 msgid "Date and Time"
 msgstr "تاریخ و زمان"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "تاریخ:"
 
@@ -1815,8 +1805,7 @@ msgstr "زمان پایان"
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr "لینک Google Meet را ایجاد کنید"
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "گواهینامه دریافت کنید"
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr "اگر سوالی دارید یا نیاز به کمک دارید، با تیم پشتیبانی ما تماس بگیرید."
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "اگر سوالی دارید یا نیاز به کمک دارید، با ما تماس بگیرید."
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr "علاقه"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "علاقمندی ها"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr "شغل ها"
 msgid "Join"
 msgstr "پیوستن"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "فعال"
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr "وارد شدن"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr "ورود به Frappe Cloud?"
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "متوسط:"
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr "مربیان"
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "تقویم من"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "جدید"
 
@@ -3656,7 +3634,7 @@ msgstr ""
 
 #: lms/templates/assignment.html:6
 msgid "Only files of type {0} will be accepted."
-msgstr "فقط فایل هایی از نوع {0} پذیرفته می شوند."
+msgstr "فقط فایل هایی از نوع {0} پذیرفته می‌شوند."
 
 #: frontend/src/pages/CourseForm.vue:506 frontend/src/utils/index.js:552
 msgid "Only image file is allowed."
@@ -3952,7 +3930,7 @@ msgstr "لطفا ایمیل خود را برای تایید بررسی کنید"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "شروع"
 msgid "Start Date"
 msgstr "تاریخ شروع"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "تاریخ شروع:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "منطقه زمانی"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr "تحت بررسی"
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr "منتشر نشده"
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr "نما"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr "کلاس شما در {0} امروز است"
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/fr.po b/lms/locale/fr.po
index 140568a0..3985f953 100644
--- a/lms/locale/fr.po
+++ b/lms/locale/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "Administrateur"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Tout"
 
@@ -370,15 +370,15 @@ msgstr "Approuvé"
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "Archivé"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "Description du Lot"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "Détails du lot"
 
@@ -612,10 +610,6 @@ msgstr "Paramètres de lot"
 msgid "Batch Start Date:"
 msgstr "Date de début du lot :"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "Lot:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr "Lots"
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "Date de début"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "Cordialement"
 
@@ -705,12 +697,12 @@ msgstr "Par"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Annuler"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "Chapitres"
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1381,8 +1372,8 @@ msgstr "Le cours {0} a déjà été ajouté à ce lot."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "Créé"
 
@@ -1498,7 +1488,7 @@ msgstr ""
 msgid "Date and Time"
 msgstr "Date et heure"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Date:"
 
@@ -1815,8 +1805,7 @@ msgstr "Heure de Fin"
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr "Intérêt"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "Intérêts"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr "Emplois"
 msgid "Join"
 msgstr "Joindre"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr "Connexion"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Moyen:"
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Nouveau"
 
@@ -3952,7 +3930,7 @@ msgstr "Veuillez vérifier votre email pour validation"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Veuillez bien vous préparer et être à temps pour les évaluations."
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "Démarrer"
 msgid "Start Date"
 msgstr "Date de Début"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Date de Début:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr "En cours de révision"
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/hr.po b/lms/locale/hr.po
index 090b4ecf..9c8ecbc6 100644
--- a/lms/locale/hr.po
+++ b/lms/locale/hr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
@@ -20,60 +20,60 @@ msgstr ""
 
 #: lms/templates/emails/assignment_submission.html:5
 msgid " Please evaluate and grade it."
-msgstr ""
+msgstr "Procjeni i Ocjeni"
 
 #: frontend/src/pages/Programs.vue:39
 #, python-format
 msgid "% completed"
-msgstr ""
+msgstr "% dovršeno"
 
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/lms-settings/LMS%20Settings\">LMS Settings</a>"
-msgstr ""
+msgstr "<a href=\"/app/lms-settings/LMS%20Settings\">Postavke</a>"
 
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/app/web-page/new-web-page-1\">Setup a Home Page</a>"
-msgstr ""
+msgstr "<a href=\"/app/web-page/new-web-page-1\">Postavi Početnu Stranicu</a>"
 
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/lms/courses\">Visit LMS Portal</a>"
-msgstr ""
+msgstr "<a href=\"/lms/courses\">Posjeti Portal</a>"
 
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"/lms/courses/new/edit\">Create a Course</a>"
-msgstr ""
+msgstr "<a href=\"/lms/courses/new/edit\">Stvori Tečaj</a>"
 
 #. Paragraph text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<a href=\"https://docs.frappe.io/learning\">Documentation</a>"
-msgstr ""
+msgstr "<a href=\"https://docs.frappe.io/learning\">Dokumentacija</a>"
 
 #. Header text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<span class=\"h4\"><b>Get Started</b></span>"
-msgstr ""
+msgstr "<span class=\"h4\"><b>Započni</b></span>"
 
 #. Header text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<span class=\"h4\"><b>Master</b></span>"
-msgstr ""
+msgstr "<span class=\"h4\"><b>Postavke</b></span>"
 
 #. Header text in the LMS Workspace
 #: lms/lms/workspace/lms/lms.json
 msgid "<span style=\"font-size: 18px;\"><b>Statistics</b></span>"
-msgstr ""
+msgstr "<span style=\"font-size: 18px;\"><b>Statistika</b></span>"
 
 #: lms/lms/doctype/lms_course/lms_course.py:58
 msgid "A course cannot have both paid certificate and certificate of completion."
-msgstr ""
+msgstr "Tečaj ne može imati i plaćenu potvrdu i potvrdu o završetku."
 
 #: frontend/src/pages/CourseForm.vue:40
 msgid "A one line introduction to the course that appears on the course card"
-msgstr ""
+msgstr "Uvod u tečaj u jednom redu koji se pojavljuje na kartici tečaja"
 
 #: frontend/src/pages/ProfileAbout.vue:4
 msgid "About"
@@ -81,31 +81,31 @@ msgstr "O"
 
 #: frontend/src/pages/Batch.vue:100
 msgid "About this batch"
-msgstr ""
+msgstr "O ovoj Grupi"
 
 #. Label of the verify_terms (Check) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Acceptance for Terms and/or Policies"
-msgstr ""
+msgstr "Prihvaćanje Uvjeta i/ili Pravila"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort Join Request'
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 msgid "Accepted"
-msgstr ""
+msgstr "Prihvaćeno"
 
 #. Label of the account_id (Data) field in DocType 'Zoom Settings'
 #: lms/lms/doctype/zoom_settings/zoom_settings.json
 msgid "Account ID"
-msgstr ""
+msgstr "Račun"
 
 #: frontend/src/pages/ProfileAbout.vue:17
 msgid "Achievements"
-msgstr ""
+msgstr "Dostignuća"
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
@@ -121,90 +121,90 @@ msgstr "Dodaj"
 #: frontend/src/components/CreateOutline.vue:18
 #: frontend/src/components/Modals/ChapterModal.vue:5
 msgid "Add Chapter"
-msgstr ""
+msgstr "Dodaj Poglavlje"
 
 #: frontend/src/components/CourseOutline.vue:129
 msgid "Add Lesson"
-msgstr ""
+msgstr "Dodaj Lekciju"
 
 #: frontend/src/pages/ProfileEvaluator.vue:75
 msgid "Add Slot"
-msgstr ""
+msgstr "Dodaj Vrijeme"
 
 #: lms/templates/onboarding_header.html:26
 msgid "Add a Chapter"
-msgstr ""
+msgstr "Dodaj Poglavlje"
 
 #: lms/templates/onboarding_header.html:33
 msgid "Add a Lesson"
-msgstr ""
+msgstr "Dodaj Lekciju"
 
 #: frontend/src/components/Modals/StudentModal.vue:5
 msgid "Add a Student"
-msgstr ""
+msgstr "Dodaj Studenta"
 
 #: frontend/src/components/OnboardingBanner.vue:56
 msgid "Add a chapter"
-msgstr ""
+msgstr "Dodaj Poglavlje"
 
 #: frontend/src/components/Modals/BatchCourseModal.vue:5
 msgid "Add a course"
-msgstr ""
+msgstr "Dodaj Tečaj"
 
 #: frontend/src/pages/CourseForm.vue:136
 msgid "Add a keyword and then press enter"
-msgstr ""
+msgstr "Dodaj ključnu riječ, a zatim pritisnite enter"
 
 #: frontend/src/components/OnboardingBanner.vue:81
 msgid "Add a lesson"
-msgstr ""
+msgstr "Dodaj Lekciju"
 
 #: frontend/src/components/Modals/Question.vue:144
 #: frontend/src/pages/QuizForm.vue:183
 msgid "Add a new question"
-msgstr ""
+msgstr "Dodaj novo pitanje"
 
 #: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
-msgstr ""
+msgstr "Dodaj kviz svojoj lekciji"
 
 #: frontend/src/components/Modals/AssessmentModal.vue:5
 msgid "Add an assessment"
-msgstr ""
+msgstr "Dodaj Procjenu"
 
 #: frontend/src/components/AssessmentPlugin.vue:14
 msgid "Add an assignment to your lesson"
-msgstr ""
+msgstr "Dodaj zadatak svojoj lekciji"
 
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
-msgstr ""
+msgstr "Dodaj postojeće pitanje"
 
 #: lms/lms/doctype/lms_question/lms_question.py:66
 msgid "Add at least one possible answer for this question: {0}"
-msgstr ""
+msgstr "Dodaj barem jedan mogući odgovor na ovo pitanje: {0}"
 
 #: frontend/src/components/Modals/PageModal.vue:6
 msgid "Add web page to sidebar"
-msgstr ""
+msgstr "Dodaj web stranicu na bočnu traku"
 
 #: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
-msgstr ""
+msgstr "Dodaj zadatak kao {0}"
 
 #. Label of the address (Link) field in DocType 'LMS Payment'
 #: frontend/src/pages/Billing.vue:64
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Address"
-msgstr ""
+msgstr "Adresa"
 
 #: frontend/src/pages/Billing.vue:74
 msgid "Address Line 1"
-msgstr ""
+msgstr "Adresna Linija 1"
 
 #: frontend/src/pages/Billing.vue:78
 msgid "Address Line 2"
-msgstr ""
+msgstr "Adresna Linija 2"
 
 #. Option for the 'Role' (Select) field in DocType 'Cohort Staff'
 #. Option for the 'Required Role' (Select) field in DocType 'Cohort Web Page'
@@ -213,32 +213,32 @@ msgstr ""
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Admin"
-msgstr ""
+msgstr "Administrator"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
-msgstr ""
+msgstr "Sve"
 
 #: frontend/src/pages/Batches.vue:26
 msgid "All Batches"
-msgstr ""
+msgstr "Sve Grupe"
 
 #: frontend/src/pages/CertifiedParticipants.vue:20
 msgid "All Certified Participants"
-msgstr ""
+msgstr "Svi Certificirani Sudionici"
 
 #: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
-msgstr ""
+msgstr "Svi Tečajevi"
 
 #: frontend/src/components/BatchFeedback.vue:51
 msgid "All Feedback"
-msgstr ""
+msgstr "Sve Povratne Informacije"
 
 #: lms/templates/quiz/quiz.html:141
 msgid "All Submissions"
-msgstr ""
+msgstr "Svi Podnesci"
 
 #: lms/lms/doctype/lms_quiz/lms_quiz.py:46
 msgid "All questions should have the same marks if the limit is set."
@@ -281,7 +281,7 @@ msgstr ""
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/public/js/common_functions.js:379
 msgid "Amount"
-msgstr ""
+msgstr "Iznos"
 
 #. Label of the amount_usd (Currency) field in DocType 'LMS Batch'
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
@@ -289,7 +289,7 @@ msgstr ""
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
-msgstr ""
+msgstr "Iznos (USD)"
 
 #: lms/lms/doctype/lms_batch/lms_batch.py:60
 msgid "Amount and currency are required for paid batches."
@@ -310,7 +310,7 @@ msgstr ""
 
 #: frontend/src/components/Modals/AnnouncementModal.vue:33
 msgid "Announcement"
-msgstr ""
+msgstr "Objava"
 
 #: frontend/src/components/Modals/AnnouncementModal.vue:100
 msgid "Announcement has been sent successfully"
@@ -325,7 +325,7 @@ msgstr ""
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
-msgstr ""
+msgstr "Odgovor"
 
 #: frontend/src/pages/CourseForm.vue:84 frontend/src/pages/CourseForm.vue:102
 msgid "Appears on the course card in the course list"
@@ -341,7 +341,7 @@ msgstr ""
 
 #: frontend/src/pages/JobDetail.vue:42
 msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
 
 #. Label of the apply_gst (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -370,15 +370,15 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -425,7 +425,7 @@ msgstr ""
 
 #: lms/lms/doctype/lms_badge/lms_badge.js:50
 msgid "Assign"
-msgstr ""
+msgstr "Dodijeli"
 
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
@@ -436,7 +436,7 @@ msgstr ""
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
 msgid "Assignment"
-msgstr ""
+msgstr "Dodjela"
 
 #. Label of the assignment_attachment (Attach) field in DocType 'LMS Assignment
 #. Submission'
@@ -471,7 +471,7 @@ msgstr ""
 
 #: frontend/src/pages/AssignmentForm.vue:174
 msgid "Assignments"
-msgstr ""
+msgstr "Dodjele"
 
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
@@ -489,7 +489,7 @@ msgstr ""
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Auto Assign"
-msgstr ""
+msgstr "Automatski Dodjeli"
 
 #. Label of the auto_recording (Select) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:77
@@ -500,7 +500,7 @@ msgstr ""
 #: frontend/src/components/CourseCard.vue:51
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
-msgstr ""
+msgstr "Prosječna Ocjena"
 
 #: frontend/src/components/BatchFeedback.vue:38
 msgid "Average of Feedback Received"
@@ -566,16 +566,14 @@ msgstr ""
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
-msgstr ""
+msgstr "Detalji Grupe"
 
 #. Label of the batch_details_raw (HTML Editor) field in DocType 'LMS Batch'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:356
 msgid "Batch Details Raw"
-msgstr ""
+msgstr "Detalji Grupe"
 
 #. Name of a role
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
@@ -583,12 +581,12 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Batch Evaluator"
-msgstr ""
+msgstr "Ocjenjivač Grupe"
 
 #. Label of the batch_name (Link) field in DocType 'LMS Certificate Evaluation'
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Batch Name"
-msgstr ""
+msgstr "Naziv Grupe"
 
 #. Label of the batch_old (Link) field in DocType 'Exercise Latest Submission'
 #. Label of the batch_old (Link) field in DocType 'Exercise Submission'
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr ""
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -694,23 +686,23 @@ msgstr ""
 
 #: frontend/src/components/CourseCardOverlay.vue:47
 msgid "Buy this course"
-msgstr ""
+msgstr "Kupi ovaj tečaj"
 
 #: lms/templates/emails/lms_message.html:11
 msgid "By"
-msgstr ""
+msgstr "Od"
 
 #. Option for the 'Grade Type' (Select) field in DocType 'Education Detail'
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "CGPA/4"
-msgstr ""
+msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -721,7 +713,7 @@ msgstr ""
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazano"
 
 #. Label of the carrer_preference_details (Section Break) field in DocType
 #. 'User'
@@ -732,7 +724,7 @@ msgstr ""
 #. Option for the 'Attire Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Casual Wear"
-msgstr ""
+msgstr "Ležerna Odjeća"
 
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
@@ -745,11 +737,11 @@ msgstr ""
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #: frontend/src/components/Categories.vue:22
 msgid "Category Name"
-msgstr ""
+msgstr "Naziv Kategorije"
 
 #. Label of the certificate (Link) field in DocType 'LMS Enrollment'
 #. Label of a shortcut in the LMS Workspace
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -821,11 +813,11 @@ msgstr ""
 #: frontend/src/pages/CertifiedParticipants.vue:161
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Certified Participants"
-msgstr ""
+msgstr "Certificirani Sudionici"
 
 #: lms/templates/assignment.html:13
 msgid "Change"
-msgstr ""
+msgstr "Promjeni"
 
 #: frontend/src/components/Assignment.vue:334
 msgid "Changes saved successfully"
@@ -838,7 +830,7 @@ msgstr ""
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/workspace/lms/lms.json
 msgid "Chapter"
-msgstr ""
+msgstr "Poglavlje"
 
 #. Name of a DocType
 #: lms/lms/doctype/chapter_reference/chapter_reference.json
@@ -854,10 +846,9 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
-msgstr ""
+msgstr "Poglavlja"
 
 #: frontend/src/components/Quiz.vue:205 lms/templates/quiz/quiz.html:120
 msgid "Check"
@@ -905,7 +896,7 @@ msgstr ""
 
 #: frontend/src/components/Controls/Link.vue:49
 msgid "Clear"
-msgstr ""
+msgstr "Očisti"
 
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
@@ -936,12 +927,12 @@ msgstr ""
 #. Option for the 'Auto Recording' (Select) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Cloud"
-msgstr ""
+msgstr "Cloud"
 
 #. Label of the code (Code) field in DocType 'LMS Exercise'
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. Name of a DocType
 #. Label of the cohort (Link) field in DocType 'Cohort Join Request'
@@ -958,32 +949,32 @@ msgstr ""
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Cohort"
-msgstr ""
+msgstr "Grupa"
 
 #. Name of a DocType
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 msgid "Cohort Join Request"
-msgstr ""
+msgstr "Zahtjev za pridruživanje Grupi"
 
 #. Name of a DocType
 #: lms/lms/doctype/cohort_mentor/cohort_mentor.json
 msgid "Cohort Mentor"
-msgstr ""
+msgstr "Mentor Grupe"
 
 #. Name of a DocType
 #: lms/lms/doctype/cohort_staff/cohort_staff.json
 msgid "Cohort Staff"
-msgstr ""
+msgstr "Osoblje Grupe"
 
 #. Name of a DocType
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 msgid "Cohort Subgroup"
-msgstr ""
+msgstr "Podgrupa Grupe"
 
 #. Name of a DocType
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 msgid "Cohort Web Page"
-msgstr ""
+msgstr "Web stranica Grupe"
 
 #. Label of the collaboration (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
@@ -1002,7 +993,7 @@ msgstr ""
 #. Label of the color (Color) field in DocType 'LMS Timetable Legend'
 #: lms/lms/doctype/lms_timetable_legend/lms_timetable_legend.json
 msgid "Color"
-msgstr ""
+msgstr "Boja"
 
 #. Label of the comments (Small Text) field in DocType 'Exercise Latest
 #. Submission'
@@ -1016,7 +1007,7 @@ msgstr ""
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_mentor_request/lms_mentor_request.json
 msgid "Comments"
-msgstr ""
+msgstr "Komentari"
 
 #: frontend/src/components/Assignment.vue:139
 msgid "Comments by Evaluator"
@@ -1070,7 +1061,7 @@ msgstr ""
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
-msgstr ""
+msgstr "Završeno"
 
 #: lms/templates/emails/lms_invite_request_approved.html:7
 msgid "Complete Sign Up"
@@ -1111,7 +1102,7 @@ msgstr ""
 #. Label of the condition (Code) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Condition"
-msgstr ""
+msgstr "Uvjet"
 
 #: lms/lms/doctype/lms_badge/lms_badge.py:16
 msgid "Condition must be in valid JSON format."
@@ -1125,9 +1116,9 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
-msgstr ""
+msgstr "Potvrdi"
 
 #. Label of the confirmation_email_sent (Check) field in DocType 'LMS Batch
 #. Enrollment'
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr ""
 
@@ -1498,7 +1488,7 @@ msgstr ""
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr ""
 
@@ -1815,8 +1805,7 @@ msgstr ""
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr ""
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
@@ -3952,7 +3930,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr ""
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/hu.po b/lms/locale/hu.po
index d9e524e3..8bb0b0ae 100644
--- a/lms/locale/hu.po
+++ b/lms/locale/hu.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
@@ -370,15 +370,15 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "Archivált"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr ""
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr ""
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "Köteg:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -705,12 +697,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr ""
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Megerősítés"
 
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "Alkotó"
 
@@ -1498,7 +1488,7 @@ msgstr ""
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Dátum:"
 
@@ -1815,8 +1805,7 @@ msgstr "Befejezés dátuma"
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr "Érdek"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "Érdekek"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Közepes:"
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
@@ -3952,7 +3930,7 @@ msgstr "Kérjük, ellenőrizze e-mail a vizsgálathoz"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Kezdés dátuma:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/main.pot b/lms/locale/main.pot
index 48ff6fa6..7a927a39 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: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-07 16:04+0000\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -214,7 +214,7 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
@@ -368,15 +368,15 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -564,8 +564,6 @@ msgstr ""
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr ""
 
@@ -610,10 +608,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -633,10 +627,8 @@ msgstr ""
 msgid "Batch:"
 msgstr ""
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -647,9 +639,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -703,12 +695,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -792,7 +784,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -852,7 +844,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr ""
@@ -1123,7 +1114,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
 
@@ -1379,8 +1370,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1425,8 +1416,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr ""
 
@@ -1496,7 +1486,7 @@ msgstr ""
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr ""
 
@@ -1813,8 +1803,7 @@ msgstr ""
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2196,8 +2185,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2353,8 +2342,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2497,11 +2486,6 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr ""
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2642,7 +2626,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2993,7 +2977,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3044,7 +3028,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3145,7 +3129,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
 
@@ -3312,11 +3296,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3394,9 +3373,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
@@ -3950,7 +3928,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4020,7 +3998,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4879,7 +4857,7 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr ""
 
@@ -5378,8 +5356,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5545,7 +5523,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5567,9 +5545,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5679,6 +5656,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5693,11 +5671,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5940,10 +5921,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/pl.po b/lms/locale/pl.po
index 98a4e82d..e0c179b7 100644
--- a/lms/locale/pl.po
+++ b/lms/locale/pl.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
@@ -370,15 +370,15 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "Opis partii"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "Szczegóły partii"
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "Grupa:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -705,12 +697,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr ""
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
 
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr ""
 
@@ -1498,7 +1488,7 @@ msgstr ""
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Data:"
 
@@ -1815,8 +1805,7 @@ msgstr "Godzina zakończenia"
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr "Odsetki"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr ""
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Średni:"
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
@@ -3952,7 +3930,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Data rozpoczęcia:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/pt.po b/lms/locale/pt.po
index 2468938f..1d81815c 100644
--- a/lms/locale/pt.po
+++ b/lms/locale/pt.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Todos"
 
@@ -370,15 +370,15 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr ""
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr ""
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr ""
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -705,12 +697,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr ""
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
 
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr ""
 
@@ -1498,7 +1488,7 @@ msgstr "Data"
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr ""
 
@@ -1815,8 +1805,7 @@ msgstr ""
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr ""
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Novo"
 
@@ -3952,7 +3930,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "Iniciar"
 msgid "Start Date"
 msgstr "Data de Início"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr ""
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr "Visão"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/ru.po b/lms/locale/ru.po
index 8495bf0c..e829cf0d 100644
--- a/lms/locale/ru.po
+++ b/lms/locale/ru.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "Админ"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
@@ -370,15 +370,15 @@ msgstr "Утвержден"
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "Описание группы"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "Подробности группы"
 
@@ -612,10 +610,6 @@ msgstr "Настройки группы"
 msgid "Batch Start Date:"
 msgstr "Дата начала группы:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "Партия:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr "Группы"
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "Дата начала"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "С наилучшими пожеланиями"
 
@@ -705,12 +697,12 @@ msgstr "От"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Отмена"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "Главы"
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -1381,8 +1372,8 @@ msgstr "Курс {0} уже добавлен в группу."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr ""
 
@@ -1498,7 +1488,7 @@ msgstr ""
 msgid "Date and Time"
 msgstr "Дата и время"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Дата:"
 
@@ -1815,8 +1805,7 @@ msgstr "Время окончания"
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr "Сгенерировать ссылку Google Meet"
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "Если у вас возникнут какие-либо вопросы или вам понадобится помощь, свяжитесь с нами."
 
@@ -2499,11 +2488,6 @@ msgstr "Комментарии инструкторов"
 msgid "Interest"
 msgstr "Процент"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "Проценты"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr "Неверный код приглашения."
@@ -2644,7 +2628,7 @@ msgstr "Вакансии"
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Live"
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr "Логин"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Средний:"
 
@@ -3314,11 +3298,6 @@ msgstr "Шаблон создания запроса на наставничес
 msgid "Mentor Request Status Update Template"
 msgstr "Шаблон обновления статуса запроса наставника"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr "Наставник"
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "Мой календарь"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
@@ -3952,7 +3930,7 @@ msgstr "Пожалуйста, проверьте свой email для подт
 msgid "Please click on the following button to set your new password"
 msgstr "Нажмите на следующую кнопку, чтобы установить новый пароль."
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr "Пожалуйста, войдите в систему, чтобы пр
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Пожалуйста, хорошо подготовьтесь и приходите на оценку вовремя."
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Дата начала:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "Часовой пояс"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr "Сроки:"
 
@@ -5547,7 +5525,7 @@ msgstr "На рассмотрении"
 msgid "Unlisted"
 msgstr "Не публиковать"
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr "Ссылка для вставки видео"
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr "Перейдите по следующей ссылке, чтобы просмотреть ваш "
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr "Видео YouTube появится в верхней части уро
 msgid "Your Account has been successfully created!"
 msgstr "Ваш аккаунт был успешно создан!"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr "Ваш календарь настроен."
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/sv.po b/lms/locale/sv.po
index 49e5ce91..13580b02 100644
--- a/lms/locale/sv.po
+++ b/lms/locale/sv.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "Administratör"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Alla"
 
@@ -370,15 +370,15 @@ msgstr "Godkänd"
 msgid "Apps"
 msgstr "Appar"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "Arkiverad"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr "Är du säker på att du vill avbryta denna utvärdering? Denna åtgärd kan inte ångras."
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr "Är du säker på att du vill logga in på din Översikt Panel i Frappe Cloud?"
 
@@ -566,8 +566,6 @@ msgstr "Parti Beskrivning"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "Parti Detaljer"
 
@@ -612,10 +610,6 @@ msgstr "Grupp Inställningar"
 msgid "Batch Start Date:"
 msgstr "Grupp Start Datum:"
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr "Grupp Start Påminnelse"
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr "Grupp slutdatum får inte vara före grupp startdatum"
 msgid "Batch:"
 msgstr "Parti:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr "Grupper"
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "Start Datum"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr "Vänliga hälsningar,"
 
@@ -705,12 +697,12 @@ msgstr "Av"
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "Annullera"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr "Avbryt denna utvärdering?"
 
@@ -794,7 +786,7 @@ msgstr "Certifikat genererade"
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr "Kapitel uppdaterad"
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "Kapitel"
@@ -1125,7 +1116,7 @@ msgstr "Villkoret måste vara giltig python kod."
 msgid "Conduct Evaluation"
 msgstr "Genomför Utvärdering"
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -1381,8 +1372,8 @@ msgstr "Kurs {0} har redan lagts till i denna omgång."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr "Skapa Kurs"
 msgid "Create a new question"
 msgstr "Skapa ny fråga"
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "Skapad"
 
@@ -1498,7 +1488,7 @@ msgstr "Datum"
 msgid "Date and Time"
 msgstr "Datum och Tid"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Datum:"
 
@@ -1815,8 +1805,7 @@ msgstr "Slut Tid"
 msgid "Enroll Now"
 msgstr "Registrera Nu"
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr "Inskriven"
 
@@ -2198,8 +2187,8 @@ msgstr "Skapa Google Meet länk"
 msgid "Get Certificate"
 msgstr "Hämta Certifikat"
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr "Bli Certifierad"
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr "Om du har några frågor eller behöver hjälp är du välkommen att kontakta vårt supportteam."
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "Om du har några frågor eller behöver hjälp är du välkommen att kontakta oss."
 
@@ -2499,11 +2488,6 @@ msgstr "Lärare Kommentarer"
 msgid "Interest"
 msgstr "Intresse"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "Intresse"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr "Ogiltig Inbjudan Kod."
@@ -2644,7 +2628,7 @@ msgstr "Jobb"
 msgid "Join"
 msgstr "Anslut"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr "Delta i Samtal"
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr "Lista över frågesporter"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Live"
 
@@ -3046,7 +3030,7 @@ msgstr "Platspreferens"
 msgid "Login"
 msgstr "Logga In"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr "Logga in på Frappe Cloud?"
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr "Medium ID"
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Medium:"
 
@@ -3314,11 +3298,6 @@ msgstr "Mentor Begäran Skapande Mall"
 msgid "Mentor Request Status Update Template"
 msgstr "Mentor Begäran Status Uppdatering Mall"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr "Mentorer"
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "Min kalender"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Ny"
 
@@ -3952,7 +3930,7 @@ msgstr "Kontrollera din E-post för verifiering"
 msgid "Please click on the following button to set your new password"
 msgstr "Klicka på följande knapp för att ange ditt nya lösenord"
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "Slutför tidigare kurser i program för att anmäla dig till denna kurs."
 
@@ -4022,7 +4000,7 @@ msgstr "Logga in för att fortsätta med betalning."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Förbered dig väl och kom i tid till utvärderingarna."
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr "Boka gärna utvärdering för att bli certifierad."
 
@@ -4881,7 +4859,7 @@ msgstr "Start"
 msgid "Start Date"
 msgstr "Start Datum"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Start Datum:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "Tidszon"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr "Tidpunkter:"
 
@@ -5547,7 +5525,7 @@ msgstr "Under Recension"
 msgid "Unlisted"
 msgstr "Ej Listad"
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr "Opublicerad"
 
@@ -5569,9 +5547,8 @@ msgstr "Ostrukturerad Roll"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr "Videoinbäddning Länk"
 msgid "View"
 msgstr "Visa"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr "Visa Certifikat"
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr "Besök Omgång"
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr "Besök följande länk för att se din "
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr "Besök din grupp"
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr "YouTube Video visas överst i lektion."
 msgid "Your Account has been successfully created!"
 msgstr "Ditt konto är skapad!"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr "Din grupp {0} börjar imorgon"
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr "Din kalender är konfigurerad."
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr "Din lektion {0} är idag"
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/th.po b/lms/locale/th.po
index a3e0929c..1a21d176 100644
--- a/lms/locale/th.po
+++ b/lms/locale/th.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Thai\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr ""
 
@@ -370,15 +370,15 @@ msgstr ""
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr ""
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr ""
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr ""
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -705,12 +697,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr ""
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr ""
 
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr ""
 
@@ -1498,7 +1488,7 @@ msgstr ""
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr ""
 
@@ -1815,8 +1805,7 @@ msgstr ""
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr ""
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr ""
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
@@ -3952,7 +3930,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr ""
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/tr.po b/lms/locale/tr.po
index 6e4df9a5..1a98227e 100644
--- a/lms/locale/tr.po
+++ b/lms/locale/tr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-14 23:46\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr "Yönetici"
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Tümü"
 
@@ -370,15 +370,15 @@ msgstr "Onaylandı"
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr "Arşivlendi"
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr "Parti Açıklaması"
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr "Parti Detayları"
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "Parti:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr "Sınıflar"
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr "Başlangıç Tarihi"
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -705,12 +697,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr "CGPA/4"
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "İptal"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr "Bölüm başarıyla güncellendi"
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr "Bölümler"
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -1381,8 +1372,8 @@ msgstr "Kurs {0} bu gruba zaten eklenmiştir."
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr "Bir Kurs Oluştur"
 msgid "Create a new question"
 msgstr "Yeni bir soru oluştur"
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr "Oluşturdu"
 
@@ -1498,7 +1488,7 @@ msgstr "Tarih"
 msgid "Date and Time"
 msgstr "Tarih ve Saat"
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "Tarih:"
 
@@ -1815,8 +1805,7 @@ msgstr "Bitiş Zamanı"
 msgid "Enroll Now"
 msgstr "Hemen Kaydol"
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr "Kayıtlı"
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr "Sertifika Al"
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr "Herhangi bir sorunuz veya yardıma ihtiyacınız varsa bizimle iletişime geçmekten çekinmeyin."
 
@@ -2499,11 +2488,6 @@ msgstr "Eğitmen Yorumları"
 msgid "Interest"
 msgstr "İlgi Alanı"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr "İlgi Alanları"
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr "Geçersiz Davetiye Kodu."
@@ -2644,7 +2628,7 @@ msgstr "İşler"
 msgid "Join"
 msgstr "Katıl"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr "Sınavların listesi"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr "Canlı"
 
@@ -3046,7 +3030,7 @@ msgstr "Konum Tercihi"
 msgid "Login"
 msgstr "Giriş"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr "Frappe Cloud'a Giriş Yapın?"
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr "Medium"
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "Orta:"
 
@@ -3314,11 +3298,6 @@ msgstr "Mentor Talebi Oluşturma Şablonu"
 msgid "Mentor Request Status Update Template"
 msgstr "Mentor Talebi Durum Güncelleme Şablonu"
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr "Mentorlar"
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr "Takvimim"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Yeni"
 
@@ -3952,7 +3930,7 @@ msgstr "Doğrulama için lütfen e-postanızı kontrol edin"
 msgid "Please click on the following button to set your new password"
 msgstr "Yeni şifrenizi belirlemek için lütfen aşağıdaki linke tıklayınız"
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr "Ödeme işlemine devam etmek için lütfen giriş yapın."
 msgid "Please prepare well and be on time for the evaluations."
 msgstr "Lütfen iyi hazırlanın ve değerlendirmelere zamanında katılın."
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "Başlangıç"
 msgid "Start Date"
 msgstr "Başlangıç Tarihi"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "Başlangıç Tarihi:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr "Zaman Dilimi"
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr "İnceleniyor"
 msgid "Unlisted"
 msgstr "Listelenmemiş"
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr "Ayarlanmamış Rol"
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr "Video Gömme Bağlantısı"
 msgid "View"
 msgstr "Göster"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr "Sertifikayı Görüntüle"
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr "Görüntülemek için aşağıdaki bağlantıyı ziyaret edin "
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr "YouTube Videosu dersin en üstünde görünecektir."
 msgid "Your Account has been successfully created!"
 msgstr "Hesabınız başarıyla oluşturuldu!"
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr "Takviminiz hazır."
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/locale/zh.po b/lms/locale/zh.po
index d3385cf8..d1bf485c 100644
--- a/lms/locale/zh.po
+++ b/lms/locale/zh.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-03-07 16:04+0000\n"
-"PO-Revision-Date: 2025-03-10 22:46\n"
+"POT-Creation-Date: 2025-03-14 16:04+0000\n"
+"PO-Revision-Date: 2025-03-17 00:24\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Active"
-msgstr "活动"
+msgstr "启用"
 
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
@@ -216,7 +216,7 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:288 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "所有"
 
@@ -370,15 +370,15 @@ msgstr "已批准"
 msgid "Apps"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:277 frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:292
 msgid "Archived"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:135
+#: frontend/src/components/UpcomingEvaluations.vue:170
 msgid "Are you sure you want to cancel this evaluation? This action cannot be undone."
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:169
+#: frontend/src/components/UserDropdown.vue:175
 msgid "Are you sure you want to login to your Frappe Cloud dashboard?"
 msgstr ""
 
@@ -566,8 +566,6 @@ msgstr ""
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:349
 #: lms/templates/emails/batch_confirmation.html:24
-#: lms/templates/emails/batch_start_reminder.html:27
-#: lms/templates/emails/live_class_reminder.html:23
 msgid "Batch Details"
 msgstr ""
 
@@ -612,10 +610,6 @@ msgstr ""
 msgid "Batch Start Date:"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:418
-msgid "Batch Start Reminder"
-msgstr ""
-
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate'
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate/lms_certificate.json
@@ -635,10 +629,8 @@ msgstr ""
 msgid "Batch:"
 msgstr "批次:"
 
-#. Group in LMS Course's connections
 #. Label of the batches (Check) field in DocType 'LMS Settings'
-#: frontend/src/pages/Batches.vue:303
-#: lms/lms/doctype/lms_course/lms_course.json
+#: frontend/src/pages/Batches.vue:300
 #: lms/lms/doctype/lms_settings/lms_settings.json lms/www/lms.py:63
 msgid "Batches"
 msgstr ""
@@ -649,9 +641,9 @@ msgid "Begin Date"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:31
-#: lms/templates/emails/batch_start_reminder.html:34
+#: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
-#: lms/templates/emails/live_class_reminder.html:30
+#: lms/templates/emails/live_class_reminder.html:28
 msgid "Best Regards"
 msgstr ""
 
@@ -705,12 +697,12 @@ msgstr ""
 msgid "CGPA/4"
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:61
-#: frontend/src/components/UpcomingEvaluations.vue:140
+#: frontend/src/components/UpcomingEvaluations.vue:60
+#: frontend/src/components/UpcomingEvaluations.vue:175
 msgid "Cancel"
 msgstr "取消"
 
-#: frontend/src/components/UpcomingEvaluations.vue:134
+#: frontend/src/components/UpcomingEvaluations.vue:169
 msgid "Cancel this evaluation?"
 msgstr ""
 
@@ -794,7 +786,7 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:371
 #: frontend/src/pages/BatchForm.vue:37 frontend/src/pages/Batches.vue:38
 #: frontend/src/pages/CourseCertification.vue:10
-#: frontend/src/pages/CourseCertification.vue:114
+#: frontend/src/pages/CourseCertification.vue:133
 #: frontend/src/pages/Courses.vue:38 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -854,7 +846,6 @@ msgid "Chapter updated successfully"
 msgstr ""
 
 #. Label of the chapters (Table) field in DocType 'LMS Course'
-#. Group in LMS Course's connections
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Chapters"
 msgstr ""
@@ -1125,7 +1116,7 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
-#: frontend/src/components/UserDropdown.vue:174
+#: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "确认"
 
@@ -1381,8 +1372,8 @@ msgstr ""
 #: frontend/src/components/BatchStudents.vue:92
 #: frontend/src/components/Modals/BatchStudentProgress.vue:79
 #: frontend/src/pages/BatchDetail.vue:21 frontend/src/pages/BatchDetail.vue:70
-#: frontend/src/pages/CourseCertification.vue:106
-#: frontend/src/pages/Courses.vue:314 frontend/src/pages/Statistics.vue:21
+#: frontend/src/pages/CourseCertification.vue:125
+#: frontend/src/pages/Courses.vue:306 frontend/src/pages/Statistics.vue:21
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1427,8 +1418,7 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:287
-#: frontend/src/pages/Courses.vue:307
+#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/Courses.vue:299
 msgid "Created"
 msgstr ""
 
@@ -1498,7 +1488,7 @@ msgstr "日期"
 msgid "Date and Time"
 msgstr ""
 
-#: lms/templates/emails/live_class_reminder.html:14
+#: lms/templates/emails/live_class_reminder.html:13
 msgid "Date:"
 msgstr "日期:"
 
@@ -1815,8 +1805,7 @@ msgstr ""
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:292 frontend/src/pages/Courses.vue:285
-#: frontend/src/pages/Courses.vue:305
+#: frontend/src/pages/Batches.vue:289 frontend/src/pages/Courses.vue:297
 msgid "Enrolled"
 msgstr ""
 
@@ -2198,8 +2187,8 @@ msgstr ""
 msgid "Get Certificate"
 msgstr ""
 
-#: frontend/src/components/CertificationLinks.vue:24
-#: frontend/src/components/CertificationLinks.vue:40
+#: frontend/src/components/CertificationLinks.vue:34
+#: frontend/src/components/CertificationLinks.vue:50
 #: frontend/src/pages/CertifiedParticipants.vue:11
 msgid "Get Certified"
 msgstr ""
@@ -2355,8 +2344,8 @@ msgid "If you have any questions or need assistance, feel free to reach out to o
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:27
-#: lms/templates/emails/batch_start_reminder.html:30
-#: lms/templates/emails/live_class_reminder.html:26
+#: lms/templates/emails/batch_start_reminder.html:27
+#: lms/templates/emails/live_class_reminder.html:24
 msgid "If you have any questions or require assistance, feel free to contact us."
 msgstr ""
 
@@ -2499,11 +2488,6 @@ msgstr ""
 msgid "Interest"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Interests"
-msgstr ""
-
 #: lms/lms/doctype/invite_request/invite_request.py:83
 msgid "Invalid Invite Code."
 msgstr ""
@@ -2644,7 +2628,7 @@ msgstr "工作"
 msgid "Join"
 msgstr "加入"
 
-#: frontend/src/components/UpcomingEvaluations.vue:51
+#: frontend/src/components/UpcomingEvaluations.vue:94
 msgid "Join Call"
 msgstr ""
 
@@ -2995,7 +2979,7 @@ msgid "List of quizzes"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:295 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:287 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3046,7 +3030,7 @@ msgstr ""
 msgid "Login"
 msgstr "登录"
 
-#: frontend/src/components/UserDropdown.vue:168
+#: frontend/src/components/UserDropdown.vue:174
 msgid "Login to Frappe Cloud?"
 msgstr "登录 Frappe Cloud?"
 
@@ -3147,7 +3131,7 @@ msgid "Medium ID"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:15
-#: lms/templates/emails/batch_start_reminder.html:22
+#: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr "中:"
 
@@ -3314,11 +3298,6 @@ msgstr ""
 msgid "Mentor Request Status Update Template"
 msgstr ""
 
-#. Group in LMS Course's connections
-#: lms/lms/doctype/lms_course/lms_course.json
-msgid "Mentors"
-msgstr ""
-
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #: frontend/src/pages/BatchForm.vue:44 lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/public/js/common_functions.js:362
@@ -3396,9 +3375,8 @@ msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
 #: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:281
-#: frontend/src/pages/Courses.vue:298 frontend/src/pages/Programs.vue:14
-#: lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:290
+#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "新"
 
@@ -3952,7 +3930,7 @@ msgstr "请检查您的电子邮件验证"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:2030 lms/lms/utils.py:2034
+#: lms/lms/utils.py:2032 lms/lms/utils.py:2036
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -4022,7 +4000,7 @@ msgstr ""
 msgid "Please prepare well and be on time for the evaluations."
 msgstr ""
 
-#: frontend/src/components/UpcomingEvaluations.vue:69
+#: frontend/src/components/UpcomingEvaluations.vue:102
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
@@ -4881,7 +4859,7 @@ msgstr "开始"
 msgid "Start Date"
 msgstr "开始日期"
 
-#: lms/templates/emails/batch_start_reminder.html:14
+#: lms/templates/emails/batch_start_reminder.html:13
 msgid "Start Date:"
 msgstr "开始日期:"
 
@@ -5380,8 +5358,8 @@ msgid "Timezone"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:19
-#: lms/templates/emails/batch_start_reminder.html:18
-#: lms/templates/emails/live_class_reminder.html:18
+#: lms/templates/emails/batch_start_reminder.html:16
+#: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
 msgstr ""
 
@@ -5547,7 +5525,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:280 frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:293
 msgid "Unpublished"
 msgstr ""
 
@@ -5569,9 +5547,8 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
 #. 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:276 frontend/src/pages/Batches.vue:294
-#: frontend/src/pages/CourseForm.vue:184 frontend/src/pages/Courses.vue:282
-#: frontend/src/pages/Courses.vue:301 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:291 frontend/src/pages/CourseForm.vue:184
+#: frontend/src/pages/Courses.vue:293 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Upcoming"
@@ -5681,6 +5658,7 @@ msgstr ""
 msgid "View"
 msgstr "查看"
 
+#: frontend/src/components/CertificationLinks.vue:10
 #: frontend/src/components/Modals/Event.vue:67
 msgid "View Certificate"
 msgstr ""
@@ -5695,11 +5673,14 @@ msgid "Visit Batch"
 msgstr ""
 
 #: lms/templates/emails/batch_confirmation.html:23
-#: lms/templates/emails/batch_start_reminder.html:26
-#: lms/templates/emails/live_class_reminder.html:22
 msgid "Visit the following link to view your "
 msgstr ""
 
+#: lms/templates/emails/batch_start_reminder.html:23
+#: lms/templates/emails/live_class_reminder.html:20
+msgid "Visit your batch"
+msgstr ""
+
 #. Label of the internship (Table) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Volunteering or Internship"
@@ -5942,10 +5923,18 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:418
+msgid "Your batch {0} is starting tomorrow"
+msgstr ""
+
 #: frontend/src/pages/ProfileEvaluator.vue:120
 msgid "Your calendar is set."
 msgstr ""
 
+#: lms/lms/doctype/lms_live_class/lms_live_class.py:87
+msgid "Your class on {0} is today"
+msgstr ""
+
 #: lms/lms/notification/certificate_request_reminder/certificate_request_reminder.html:3
 #: lms/templates/emails/certificate_request_notification.html:3
 msgid "Your evaluation for the course {0} has been scheduled on {1} at {2} {3}."
diff --git a/lms/templates/emails/batch_start_reminder.html b/lms/templates/emails/batch_start_reminder.html
index bd98170c..de240de6 100644
--- a/lms/templates/emails/batch_start_reminder.html
+++ b/lms/templates/emails/batch_start_reminder.html
@@ -9,23 +9,20 @@
 <p>
     <b>{{ _("Batch:") }}</b> {{ title }}
 </p>
-<br>
 <p>
-    <b>{{ _("Start Date:") }}</b> {{ frappe.utils.format_date(start_date, "medium") }}
+    <b>{{ _("Start Date:") }}</b> {{ frappe.utils.format_date(start_date, "long") }}
 </p>
-<br>
 <p>
     <b>{{ _("Timings:") }}</b> {{ frappe.utils.format_time(start_time, "hh:mm a") }}
 </p>
-<br>
 <p>
     <b>{{ _("Medium:") }}</b> {{ medium }}
 </p>
 <br>
 <p>
-    {{ _("Visit the following link to view your ") }}
-    <a href="/lms/batches/{{ name }}">{{ _("Batch Details") }}</a>
+    <a href="/lms/batches/{{ name }}">👉 {{ _("Visit your batch") }}</a>
 </p>
+<br>
 <p>
     {{ _("If you have any questions or require assistance, feel free to contact us.") }}
 </p>
diff --git a/lms/templates/emails/live_class_reminder.html b/lms/templates/emails/live_class_reminder.html
index 6081c15c..cd1db5ef 100644
--- a/lms/templates/emails/live_class_reminder.html
+++ b/lms/templates/emails/live_class_reminder.html
@@ -9,19 +9,17 @@
 <p>
     <b>{{ _("Class:") }}</b> {{ title }}
 </p>
-<br>
 <p>
-    <b>{{ _("Date:") }}</b> {{ frappe.utils.format_date(date, "medium") }}
+    <b>{{ _("Date:") }}</b> {{ frappe.utils.format_date(date, "long") }}
 </p>
-<br>
 <p>
     <b>{{ _("Timings:") }}</b> {{ frappe.utils.format_time(time, "hh:mm a") }}
 </p>
 <br>
 <p>
-    {{ _("Visit the following link to view your ") }}
-    <a href="/lms/live_classes/{{ batch_name }}">{{ _("Batch Details") }}</a>
+    <a href="/lms/batches/{{ batch_name }}">👉 {{ _("Visit your batch") }}</a>
 </p>
+<br>
 <p>
     {{ _("If you have any questions or require assistance, feel free to contact us.") }}
 </p>
diff --git a/setup.py b/setup.py
index d283d03c..7f6e3f26 100644
--- a/setup.py
+++ b/setup.py
@@ -9,9 +9,9 @@ from lms import __version__ as version
 setup(
 	name="lms",
 	version=version,
-	description="LMS App",
-	author="Frappe",
-	author_email="school@frappe.io",
+	description="Learning Management System",
+	author="Jannat",
+	author_email="jannat@frappe.io",
 	packages=find_packages(),
 	zip_safe=False,
 	include_package_data=True,
diff --git a/yarn.lock b/yarn.lock
index c04c0795..8759970c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,9 +40,9 @@
     lodash.once "^4.1.1"
 
 "@types/node@*":
-  version "22.13.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.9.tgz#5d9a8f7a975a5bd3ef267352deb96fb13ec02eca"
-  integrity sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==
+  version "22.13.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.10.tgz#df9ea358c5ed991266becc3109dc2dc9125d77e4"
+  integrity sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==
   dependencies:
     undici-types "~6.20.0"
 
@@ -222,9 +222,9 @@ check-more-types@^2.24.0:
   integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
 
 ci-info@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83"
-  integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.2.0.tgz#cbd21386152ebfe1d56f280a3b5feccbd96764c7"
+  integrity sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==
 
 clean-stack@^2.0.0:
   version "2.2.0"
@@ -1206,17 +1206,17 @@ through@^2.3.8:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
-tldts-core@^6.1.83:
-  version "6.1.83"
-  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.83.tgz#8f31172cb5763cc1128d4e18ee5095aa2f990eb8"
-  integrity sha512-I2wb9OJc6rXyh9d4aInhSNWChNI+ra6qDnFEGEwe9OoA68lE4Temw29bOkf1Uvwt8VZS079t1BFZdXVBmmB4dw==
+tldts-core@^6.1.84:
+  version "6.1.84"
+  resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.84.tgz#f8ac2af9969bf9c2f7a99fa05d9c667b5e5b768c"
+  integrity sha512-NaQa1W76W2aCGjXybvnMYzGSM4x8fvG2AN/pla7qxcg0ZHbooOPhA8kctmOZUDfZyhDL27OGNbwAeig8P4p1vg==
 
 tldts@^6.1.32:
-  version "6.1.83"
-  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.83.tgz#2ba9aa8db0cbcc2d75291f148f8acf9ac469429a"
-  integrity sha512-FHxxNJJ0WNsEBPHyC1oesQb3rRoxpuho/z2g3zIIAhw1WHJeQsUzK1jYK8TI1/iClaa4fS3Z2TCA9mtxXsENSg==
+  version "6.1.84"
+  resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.84.tgz#fb58b1ceb70972a1ecd683606cea3d06c78f7238"
+  integrity sha512-aRGIbCIF3teodtUFAYSdQONVmDRy21REM3o6JnqWn5ZkQBJJ4gHxhw6OfwQ+WkSAi3ASamrS4N4nyazWx6uTYg==
   dependencies:
-    tldts-core "^6.1.83"
+    tldts-core "^6.1.84"
 
 tmp@~0.2.3:
   version "0.2.3"