diff --git a/lms/locale/sr_CS.po b/lms/locale/sr_CS.po
index 77f78820..3da3d411 100644
--- a/lms/locale/sr_CS.po
+++ b/lms/locale/sr_CS.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2025-05-09 16:04+0000\n"
-"PO-Revision-Date: 2025-05-18 16:07\n"
+"POT-Creation-Date: 2025-05-16 16:04+0000\n"
+"PO-Revision-Date: 2025-05-19 16:03\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Serbian (Latin)\n"
 "MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@ msgstr ""
 msgid "A course cannot have both paid certificate and certificate of completion."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:37
+#: frontend/src/pages/CourseForm.vue:82
 msgid "A one line introduction to the course that appears on the course card"
 msgstr ""
 
@@ -114,10 +114,10 @@ msgstr ""
 #: frontend/src/components/Assessments.vue:11
 #: frontend/src/components/BatchCourses.vue:11
 #: frontend/src/components/BatchStudents.vue:117
-#: frontend/src/components/Categories.vue:26
-#: frontend/src/components/Evaluators.vue:37
+#: frontend/src/components/Categories.vue:27
+#: frontend/src/components/Evaluators.vue:38
 #: frontend/src/components/LiveClass.vue:11
-#: frontend/src/components/Members.vue:43 frontend/src/pages/ProgramForm.vue:30
+#: frontend/src/components/Members.vue:44 frontend/src/pages/ProgramForm.vue:30
 #: frontend/src/pages/ProgramForm.vue:92 frontend/src/pages/ProgramForm.vue:137
 msgid "Add"
 msgstr "Dodaj"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a course"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:133
+#: frontend/src/pages/CourseForm.vue:67
 msgid "Add a keyword and then press enter"
 msgstr ""
 
@@ -233,15 +233,15 @@ msgid "Admin"
 msgstr ""
 
 #. Name of a role
-#: frontend/src/pages/Batches.vue:285 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Batches.vue:277 lms/lms/doctype/lms_badge/lms_badge.json
 msgid "All"
 msgstr "Sve"
 
-#: frontend/src/pages/Batches.vue:26
+#: frontend/src/pages/Batches.vue:27
 msgid "All Batches"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:26 lms/lms/widgets/BreadCrumb.html:3
+#: frontend/src/pages/Courses.vue:27 lms/lms/widgets/BreadCrumb.html:3
 msgid "All Courses"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Allow accessing future dates"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:43
+#: frontend/src/pages/BatchForm.vue:57
 msgid "Allow self enrollment"
 msgstr ""
 
@@ -288,11 +288,10 @@ msgstr "Već registrovan"
 #. Label of the amount (Currency) field in DocType 'LMS Batch'
 #. Label of the course_price (Currency) field in DocType 'LMS Course'
 #. Label of the amount (Currency) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:224 frontend/src/pages/CourseForm.vue:217
+#: frontend/src/pages/BatchForm.vue:250 frontend/src/pages/CourseForm.vue:230
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:379
 msgid "Amount"
 msgstr "Iznos"
 
@@ -300,11 +299,10 @@ msgstr "Iznos"
 #. Label of the amount_usd (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:397
 msgid "Amount (USD)"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:65
+#: lms/lms/doctype/lms_batch/lms_batch.py:70
 msgid "Amount and currency are required for paid batches."
 msgstr ""
 
@@ -325,29 +323,37 @@ msgstr ""
 msgid "Announcement"
 msgstr ""
 
-#: frontend/src/components/Modals/AnnouncementModal.vue:100
+#: frontend/src/components/Modals/AnnouncementModal.vue:101
 msgid "Announcement has been sent successfully"
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:96
+msgid "Announcement is required"
+msgstr ""
+
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment'
 #. Label of the answer (Text Editor) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the answer (Code) field in DocType 'LMS Exercise'
-#: frontend/src/pages/QuizSubmission.vue:61
+#: frontend/src/pages/QuizSubmission.vue:60
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 msgid "Answer"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:81 frontend/src/pages/CourseForm.vue:99
+#: frontend/src/pages/CourseForm.vue:112 frontend/src/pages/CourseForm.vue:131
 msgid "Appears on the course card in the course list"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:75 frontend/src/pages/BatchForm.vue:96
+#: frontend/src/pages/BatchForm.vue:225
 msgid "Appears when the batch URL is shared on any online platform"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:206
+msgid "Appears when the batch URL is shared on socials"
+msgstr ""
+
 #: frontend/src/pages/JobDetail.vue:51
 msgid "Apply"
 msgstr ""
@@ -379,7 +385,7 @@ msgstr ""
 msgid "Apps"
 msgstr "Aplikacije"
 
-#: frontend/src/pages/Batches.vue:295
+#: frontend/src/pages/Batches.vue:287
 msgid "Archived"
 msgstr ""
 
@@ -394,7 +400,7 @@ msgstr ""
 #. Label of the assessment_tab (Tab Break) field in DocType 'LMS Batch'
 #. Label of the assessment (Table) field in DocType 'LMS Batch'
 #: frontend/src/components/Modals/AssessmentModal.vue:27
-#: frontend/src/components/Modals/BatchStudentProgress.vue:32
+#: frontend/src/components/Modals/BatchStudentProgress.vue:41
 #: lms/lms/doctype/lms_batch/lms_batch.json lms/templates/assessments.html:11
 msgid "Assessment"
 msgstr ""
@@ -410,11 +416,11 @@ msgstr ""
 msgid "Assessment Type"
 msgstr ""
 
-#: frontend/src/components/Modals/AssessmentModal.vue:73
+#: frontend/src/components/Modals/AssessmentModal.vue:91
 msgid "Assessment added successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:75
+#: lms/lms/doctype/lms_batch/lms_batch.py:80
 msgid "Assessment {0} has already been added to this batch."
 msgstr ""
 
@@ -459,7 +465,7 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:128
+#: frontend/src/components/Modals/AssignmentForm.vue:125
 msgid "Assignment created successfully"
 msgstr ""
 
@@ -467,7 +473,11 @@ msgstr ""
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
-#: frontend/src/components/Modals/AssignmentForm.vue:145
+#: frontend/src/components/Assignment.vue:356
+msgid "Assignment submitted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/AssignmentForm.vue:138
 msgid "Assignment updated successfully"
 msgstr ""
 
@@ -477,7 +487,7 @@ msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:574
-#: frontend/src/pages/Assignments.vue:201 lms/www/lms.py:273
+#: frontend/src/pages/Assignments.vue:211 lms/www/lms.py:273
 msgid "Assignments"
 msgstr "Dodeljeni zadaci"
 
@@ -505,6 +515,10 @@ msgstr ""
 msgid "Auto Recording"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:224
+msgid "Availability updated successfully"
+msgstr ""
+
 #: frontend/src/components/CourseCard.vue:55
 #: frontend/src/pages/CourseDetail.vue:20
 msgid "Average Rating"
@@ -559,10 +573,6 @@ msgstr ""
 msgid "Batch Course"
 msgstr ""
 
-#: lms/public/js/common_functions.js:428
-msgid "Batch Created"
-msgstr ""
-
 #. Label of the section_break_5 (Section Break) field in DocType 'LMS Batch
 #. Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
@@ -570,16 +580,14 @@ msgid "Batch Description"
 msgstr "Opis šarže"
 
 #. Label of the batch_details (Text Editor) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:250
+#: frontend/src/pages/BatchForm.vue:126
 #: 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_confirmation.html:26
 msgid "Batch Details"
 msgstr "Detalji šarže"
 
 #. 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 ""
 
@@ -626,10 +634,6 @@ msgstr ""
 msgid "Batch Title"
 msgstr ""
 
-#: lms/public/js/common_functions.js:427
-msgid "Batch Updated"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch/lms_batch.py:41
 msgid "Batch end date cannot be before the batch start date"
 msgstr ""
@@ -642,6 +646,10 @@ msgstr ""
 msgid "Batch is sold out."
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:46
+msgid "Batch start time cannot be greater than or equal to end time."
+msgstr ""
+
 #: lms/templates/emails/batch_start_reminder.html:10
 msgid "Batch:"
 msgstr ""
@@ -657,7 +665,7 @@ msgstr ""
 msgid "Begin Date"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:31
+#: lms/templates/emails/batch_confirmation.html:33
 #: lms/templates/emails/batch_start_reminder.html:31
 #: lms/templates/emails/certification.html:20
 #: lms/templates/emails/live_class_reminder.html:28
@@ -666,7 +674,7 @@ msgstr ""
 
 #. Label of the billing_details_section (Section Break) field in DocType 'LMS
 #. Payment'
-#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:363
+#: frontend/src/pages/Billing.vue:8 frontend/src/pages/Billing.vue:356
 #: lms/lms/doctype/lms_payment/lms_payment.json
 msgid "Billing Details"
 msgstr "Detalji fakturisanja"
@@ -746,17 +754,16 @@ msgstr ""
 #. Label of the category (Link) field in DocType 'LMS Batch'
 #. Label of the category (Data) field in DocType 'LMS Category'
 #. Label of the category (Link) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:198 frontend/src/pages/Batches.vue:55
+#: frontend/src/pages/BatchForm.vue:177 frontend/src/pages/Batches.vue:57
 #: frontend/src/pages/CertifiedParticipants.vue:38
-#: frontend/src/pages/CourseForm.vue:144 frontend/src/pages/Courses.vue:51
+#: frontend/src/pages/CourseForm.vue:36 frontend/src/pages/Courses.vue:53
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_category/lms_category.json
-#: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:316 lms/templates/signup-form.html:22
+#: lms/lms/doctype/lms_course/lms_course.json lms/templates/signup-form.html:22
 msgid "Category"
 msgstr "Kategorija"
 
-#: frontend/src/components/Categories.vue:22
+#: frontend/src/components/Categories.vue:23
 msgid "Category Name"
 msgstr ""
 
@@ -780,7 +787,7 @@ msgstr ""
 msgid "Certificate of Completion"
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:310
+#: frontend/src/components/Modals/Event.vue:311
 msgid "Certificate saved successfully"
 msgstr ""
 
@@ -788,7 +795,7 @@ msgstr ""
 msgid "Certificates"
 msgstr ""
 
-#: frontend/src/components/Modals/BulkCertificates.vue:121
+#: frontend/src/components/Modals/BulkCertificates.vue:120
 msgid "Certificates generated successfully"
 msgstr ""
 
@@ -801,11 +808,11 @@ msgstr ""
 #. Label of a Link in the LMS Workspace
 #: frontend/src/components/AppSidebar.vue:578
 #: frontend/src/components/CourseCard.vue:115
-#: frontend/src/components/Modals/Event.vue:371
-#: frontend/src/pages/BatchForm.vue:48 frontend/src/pages/Batches.vue:38
+#: frontend/src/components/Modals/Event.vue:372
+#: frontend/src/pages/BatchForm.vue:62 frontend/src/pages/Batches.vue:40
 #: frontend/src/pages/CourseCertification.vue:10
 #: frontend/src/pages/CourseCertification.vue:135
-#: frontend/src/pages/Courses.vue:34 lms/fixtures/custom_field.json
+#: frontend/src/pages/Courses.vue:36 lms/fixtures/custom_field.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
@@ -827,8 +834,8 @@ msgstr ""
 msgid "Certified"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:196
-#: frontend/src/pages/CertifiedParticipants.vue:203
+#: frontend/src/pages/CertifiedParticipants.vue:182
+#: frontend/src/pages/CertifiedParticipants.vue:189
 #: frontend/src/pages/Statistics.vue:40
 msgid "Certified Members"
 msgstr ""
@@ -842,7 +849,7 @@ msgstr ""
 msgid "Change"
 msgstr "Promena"
 
-#: frontend/src/components/Assignment.vue:341
+#: frontend/src/components/Assignment.vue:342
 msgid "Changes saved successfully"
 msgstr ""
 
@@ -860,11 +867,15 @@ msgstr ""
 msgid "Chapter Reference"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:155
+#: frontend/src/components/Modals/ChapterModal.vue:154
 msgid "Chapter added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:199
+#: frontend/src/components/CourseOutline.vue:290
+msgid "Chapter deleted successfully"
+msgstr ""
+
+#: frontend/src/components/Modals/ChapterModal.vue:196
 msgid "Chapter updated successfully"
 msgstr ""
 
@@ -900,7 +911,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:613 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:608 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -912,13 +923,13 @@ msgstr ""
 msgid "Choose an icon"
 msgstr "Izaberi ikonicu"
 
-#: frontend/src/components/Quiz.vue:614 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:609 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
 #. Label of the city (Data) field in DocType 'User'
 #. Label of the location (Data) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:25
+#: frontend/src/pages/Billing.vue:81 frontend/src/pages/JobForm.vue:34
 #: lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "City"
@@ -951,6 +962,12 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24
+msgid "Close"
+msgstr "Zatvori"
+
 #. Option for the 'Status' (Select) field in DocType 'Job Opportunity'
 #. Option for the 'Membership' (Select) field in DocType 'LMS Batch Old'
 #: lms/job/doctype/job_opportunity/job_opportunity.json
@@ -1097,7 +1114,7 @@ msgid "Company Website"
 msgstr ""
 
 #. Option for the 'Status' (Select) field in DocType 'LMS Course Progress'
-#: frontend/src/components/Modals/BatchStudentProgress.vue:18
+#: frontend/src/components/Modals/BatchStudentProgress.vue:24
 #: lms/lms/doctype/lms_course_progress/lms_course_progress.json
 #: lms/lms/widgets/CourseCard.html:75 lms/templates/reviews.html:48
 msgid "Complete"
@@ -1125,12 +1142,12 @@ msgstr ""
 msgid "Completed"
 msgstr "Završeno"
 
-#: frontend/src/components/BatchStudents.vue:371
+#: frontend/src/components/BatchStudents.vue:373
 msgid "Completed by Students"
 msgstr ""
 
 #. Label of the enable_certification (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:209
+#: frontend/src/pages/CourseForm.vue:217
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Completion Certificate"
 msgstr ""
@@ -1152,6 +1169,10 @@ msgstr ""
 msgid "Conduct Evaluation"
 msgstr ""
 
+#: frontend/src/pages/BatchForm.vue:141
+msgid "Configurations"
+msgstr ""
+
 #: frontend/src/components/UserDropdown.vue:180
 msgid "Confirm"
 msgstr "Potvrdi"
@@ -1189,7 +1210,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:198
+#: frontend/src/pages/Jobs.vue:187
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Ugovor"
@@ -1223,8 +1244,8 @@ msgstr ""
 #. Label of the country (Link) field in DocType 'User'
 #. Label of the country (Link) field in DocType 'Job Opportunity'
 #. Label of the country (Link) field in DocType 'Payment Country'
-#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:31
-#: frontend/src/pages/Jobs.vue:55 lms/fixtures/custom_field.json
+#: frontend/src/pages/Billing.vue:92 frontend/src/pages/JobForm.vue:40
+#: frontend/src/pages/Jobs.vue:57 lms/fixtures/custom_field.json
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/payment_country/payment_country.json
 msgid "Country"
@@ -1325,7 +1346,7 @@ msgstr ""
 msgid "Course Data"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:46
+#: frontend/src/pages/CourseForm.vue:181
 msgid "Course Description"
 msgstr ""
 
@@ -1338,7 +1359,7 @@ msgstr ""
 msgid "Course Evaluator"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:59
+#: frontend/src/pages/CourseForm.vue:90
 msgid "Course Image"
 msgstr ""
 
@@ -1360,7 +1381,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:237
+#: frontend/src/pages/CourseDetail.vue:76 frontend/src/pages/CourseForm.vue:257
 msgid "Course Outline"
 msgstr ""
 
@@ -1392,23 +1413,27 @@ msgstr ""
 msgid "Course Title"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:232
+#: frontend/src/pages/ProgramForm.vue:234
 msgid "Course added to program"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:270
-msgid "Course already added to the batch."
+#: frontend/src/pages/CourseForm.vue:468
+msgid "Course created successfully"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:470
+#: frontend/src/pages/CourseForm.vue:489
 msgid "Course deleted successfully"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:301
+#: frontend/src/pages/ProgramForm.vue:303
 msgid "Course moved successfully"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:49
+#: frontend/src/pages/CourseForm.vue:451
+msgid "Course updated successfully"
+msgstr ""
+
+#: lms/lms/doctype/lms_batch/lms_batch.py:54
 #: lms/lms/doctype/lms_program/lms_program.py:19
 msgid "Course {0} has already been added to this batch."
 msgstr ""
@@ -1417,13 +1442,13 @@ msgstr ""
 #. Label of the show_courses (Check) field in DocType 'LMS Settings'
 #. Label of the courses (Check) field in DocType 'LMS Settings'
 #: frontend/src/components/BatchCourses.vue:5
-#: frontend/src/components/BatchOverlay.vue:32
+#: frontend/src/components/BatchOverlay.vue:37
 #: frontend/src/components/BatchStudents.vue:52
 #: frontend/src/components/BatchStudents.vue:92
-#: frontend/src/components/Modals/BatchStudentProgress.vue:79
-#: frontend/src/pages/BatchDetail.vue:24 frontend/src/pages/BatchDetail.vue:73
+#: frontend/src/components/Modals/BatchStudentProgress.vue:91
+#: frontend/src/pages/BatchDetail.vue:51
 #: frontend/src/pages/CourseCertification.vue:127
-#: frontend/src/pages/Courses.vue:337 frontend/src/pages/Courses.vue:344
+#: frontend/src/pages/Courses.vue:329 frontend/src/pages/Courses.vue:336
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Courses"
@@ -1444,7 +1469,7 @@ msgid "Cover Image"
 msgstr ""
 
 #: frontend/src/components/Modals/ChapterModal.vue:9
-#: frontend/src/pages/Programs.vue:108
+#: frontend/src/pages/Programs.vue:93
 msgid "Create"
 msgstr "Kreiraj"
 
@@ -1452,6 +1477,11 @@ msgstr "Kreiraj"
 msgid "Create Certificate"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:37
+#: frontend/src/components/Controls/MultiSelect.vue:65
+msgid "Create New"
+msgstr "Kreiraj novi"
+
 #: lms/templates/onboarding_header.html:19
 msgid "Create a Course"
 msgstr ""
@@ -1488,7 +1518,7 @@ msgstr ""
 msgid "Create your first quiz"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:174 frontend/src/pages/Courses.vue:328
+#: frontend/src/pages/Assignments.vue:176 frontend/src/pages/Courses.vue:320
 msgid "Created"
 msgstr "Kreirano"
 
@@ -1503,11 +1533,10 @@ msgstr ""
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
 #. Label of the currency (Link) field in DocType 'LMS Payment'
-#: frontend/src/pages/BatchForm.vue:231 frontend/src/pages/CourseForm.vue:222
+#: frontend/src/pages/BatchForm.vue:257 frontend/src/pages/CourseForm.vue:247
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
 #: lms/lms/doctype/lms_payment/lms_payment.json
-#: lms/public/js/common_functions.js:387
 msgid "Currency"
 msgstr "Valuta"
 
@@ -1565,7 +1594,7 @@ msgstr "Datum"
 
 #. Label of the section_break_glxh (Section Break) field in DocType 'LMS Live
 #. Class'
-#: frontend/src/pages/BatchForm.vue:111
+#: frontend/src/pages/BatchForm.vue:69
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Date and Time"
 msgstr ""
@@ -1606,9 +1635,9 @@ msgstr "Podrazumevana valuta"
 msgid "Degree Type"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:245
-#: frontend/src/components/CourseOutline.vue:303
-#: frontend/src/pages/CourseForm.vue:483
+#: frontend/src/components/CourseOutline.vue:244
+#: frontend/src/components/CourseOutline.vue:302
+#: frontend/src/pages/CourseForm.vue:502
 msgid "Delete"
 msgstr "Obriši"
 
@@ -1616,27 +1645,27 @@ msgstr "Obriši"
 msgid "Delete Chapter"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:477
+#: frontend/src/pages/CourseForm.vue:496
 msgid "Delete Course"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:297
+#: frontend/src/components/CourseOutline.vue:296
 msgid "Delete this chapter?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:239
+#: frontend/src/components/CourseOutline.vue:238
 msgid "Delete this lesson?"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:478
+#: frontend/src/pages/CourseForm.vue:497
 msgid "Deleting the course will also delete all its chapters and lessons. Are you sure you want to delete this course?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:298
+#: frontend/src/components/CourseOutline.vue:297
 msgid "Deleting this chapter will also delete all its lessons and permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:240
+#: frontend/src/components/CourseOutline.vue:239
 msgid "Deleting this lesson will permanently remove it from the course. This action cannot be undone. Are you sure you want to continue?"
 msgstr ""
 
@@ -1653,7 +1682,7 @@ msgstr ""
 #. Label of the description (Text) field in DocType 'LMS Live Class'
 #. Label of the description (Small Text) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/LiveClassModal.vue:84
-#: frontend/src/pages/BatchForm.vue:238 frontend/src/pages/JobForm.vue:125
+#: frontend/src/pages/JobForm.vue:125
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/certification/certification.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -1665,7 +1694,6 @@ msgstr ""
 #: lms/lms/doctype/lms_exercise/lms_exercise.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:342
 msgid "Description"
 msgstr "Opis"
 
@@ -1679,7 +1707,7 @@ msgstr ""
 msgid "Details"
 msgstr "Detalji"
 
-#: frontend/src/pages/CourseForm.vue:191
+#: frontend/src/pages/CourseForm.vue:172
 msgid "Disable Self Enrollment"
 msgstr ""
 
@@ -1760,7 +1788,7 @@ msgstr ""
 msgid "E-mail"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:111
+#: frontend/src/components/BatchOverlay.vue:116
 #: frontend/src/components/CourseCardOverlay.vue:90
 #: frontend/src/components/Modals/ChapterModal.vue:9
 #: frontend/src/pages/JobDetail.vue:34 frontend/src/pages/Lesson.vue:135
@@ -1800,8 +1828,8 @@ msgstr ""
 msgid "Education Details"
 msgstr ""
 
-#: frontend/src/components/Evaluators.vue:32
-#: frontend/src/components/Members.vue:32 lms/templates/signup-form.html:10
+#: frontend/src/components/Evaluators.vue:33
+#: frontend/src/components/Members.vue:33 lms/templates/signup-form.html:10
 msgid "Email"
 msgstr "Imejl"
 
@@ -1814,7 +1842,7 @@ msgstr ""
 msgid "Email Sent"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:205
+#: frontend/src/pages/BatchForm.vue:154
 msgid "Email Template"
 msgstr "Imejl šablon"
 
@@ -1862,9 +1890,8 @@ msgstr ""
 
 #. Label of the end_date (Date) field in DocType 'Cohort'
 #. Label of the end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:124 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/BatchForm.vue:82 lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:282
 msgid "End Date"
 msgstr "Datum završetka"
 
@@ -1880,7 +1907,7 @@ msgstr ""
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the end_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the end_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:140
+#: frontend/src/pages/BatchForm.vue:98
 #: frontend/src/pages/ProfileEvaluator.vue:32
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -1889,15 +1916,14 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:299
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:98
+#: frontend/src/components/BatchOverlay.vue:103
 msgid "Enroll Now"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:298 frontend/src/pages/Courses.vue:330
+#: frontend/src/pages/Batches.vue:290 frontend/src/pages/Courses.vue:322
 msgid "Enrolled"
 msgstr ""
 
@@ -1907,10 +1933,6 @@ msgstr ""
 msgid "Enrolled Students"
 msgstr ""
 
-#: lms/public/js/common_functions.js:96
-msgid "Enrolled successfully"
-msgstr ""
-
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.py:93
 msgid "Enrollment Confirmation for {0}"
 msgstr ""
@@ -1947,31 +1969,13 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:287
-#: frontend/src/components/Modals/AnnouncementModal.vue:105
-#: frontend/src/components/Modals/BulkCertificates.vue:115
-#: frontend/src/components/Modals/ChapterModal.vue:160
-#: frontend/src/components/Modals/ChapterModal.vue:167
-#: frontend/src/components/Modals/ChapterModal.vue:203
-#: frontend/src/components/Modals/Question.vue:263
-#: frontend/src/components/Modals/Question.vue:286
-#: frontend/src/components/Modals/Question.vue:342
-#: frontend/src/components/Modals/StudentModal.vue:73
-#: frontend/src/components/Quiz.vue:592
-#: frontend/src/components/SettingDetails.vue:64
-#: frontend/src/pages/Billing.vue:262 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
-#: frontend/src/pages/QuizSubmission.vue:150
-msgid "Error"
-msgstr "Greška"
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:185
+#: lms/lms/doctype/lms_batch/lms_batch.py:193
 msgid "Error creating live class. Please try again. {0}"
 msgstr ""
 
 #. Label of a Link in the LMS Workspace
 #. Label of a shortcut in the LMS Workspace
-#: frontend/src/components/Modals/Event.vue:364 lms/lms/workspace/lms/lms.json
+#: frontend/src/components/Modals/Event.vue:365 lms/lms/workspace/lms/lms.json
 msgid "Evaluation"
 msgstr ""
 
@@ -1982,9 +1986,8 @@ msgid "Evaluation Details"
 msgstr ""
 
 #. Label of the evaluation_end_date (Date) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:174
+#: frontend/src/pages/BatchForm.vue:115
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:333
 msgid "Evaluation End Date"
 msgstr ""
 
@@ -1993,11 +1996,11 @@ msgstr ""
 msgid "Evaluation Request"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:82
+#: lms/lms/doctype/lms_batch/lms_batch.py:87
 msgid "Evaluation end date cannot be less than the batch end date."
 msgstr ""
 
-#: frontend/src/components/Modals/Event.vue:255
+#: frontend/src/components/Modals/Event.vue:256
 msgid "Evaluation saved successfully"
 msgstr ""
 
@@ -2008,9 +2011,9 @@ msgstr ""
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Evaluation'
 #. Label of the evaluator (Link) field in DocType 'LMS Certificate Request'
 #. Label of the evaluator (Link) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/BatchCourseModal.vue:26
+#: frontend/src/components/Modals/BatchCourseModal.vue:37
 #: frontend/src/components/Modals/BulkCertificates.vue:22
-#: frontend/src/pages/CourseForm.vue:228 frontend/src/pages/ProfileRoles.vue:32
+#: frontend/src/pages/CourseForm.vue:236 frontend/src/pages/ProfileRoles.vue:32
 #: lms/lms/doctype/batch_course/batch_course.json
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -2038,14 +2041,14 @@ msgstr ""
 msgid "Evaluator Schedule"
 msgstr ""
 
-#: frontend/src/components/Modals/EvaluationModal.vue:152
-msgid "Evaluator is Unavailable"
-msgstr ""
-
 #: lms/lms/doctype/lms_course/lms_course.py:67
 msgid "Evaluator is required for paid certificates."
 msgstr ""
 
+#: frontend/src/components/Modals/EvaluationModal.vue:151
+msgid "Evaluator is unavailable"
+msgstr ""
+
 #. Label of the event (Select) field in DocType 'LMS Badge'
 #. Label of the event (Link) field in DocType 'LMS Live Class'
 #: lms/lms/doctype/lms_badge/lms_badge.json
@@ -2053,7 +2056,7 @@ msgstr ""
 msgid "Event"
 msgstr "Događaj"
 
-#: frontend/src/pages/BatchForm.vue:151
+#: frontend/src/pages/BatchForm.vue:109
 msgid "Example: IST (+5:30)"
 msgstr ""
 
@@ -2120,7 +2123,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:356
+#: frontend/src/components/Modals/Event.vue:357
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Fail"
@@ -2128,7 +2131,7 @@ msgstr "Neuspeh"
 
 #. Label of the featured (Check) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:20
-#: frontend/src/pages/CourseForm.vue:186
+#: frontend/src/pages/CourseForm.vue:167
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Featured"
 msgstr "Istaknuto"
@@ -2158,7 +2161,7 @@ msgstr ""
 msgid "File Type"
 msgstr "Vrsta fajla"
 
-#: frontend/src/components/Members.vue:38
+#: frontend/src/components/Members.vue:39
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
 msgstr "Ime"
@@ -2183,7 +2186,7 @@ msgid "Free"
 msgstr "Besplatno"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:199
+#: frontend/src/pages/Jobs.vue:188
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2227,7 +2230,7 @@ msgid "Full Name"
 msgstr "Ime i prezime"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:196
+#: frontend/src/pages/Jobs.vue:185
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2387,10 +2390,6 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/pages/PersonaForm.vue:32
-msgid "How many students are you planning to teach?"
-msgstr ""
-
 #: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
@@ -2413,7 +2412,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:385
 msgid "ID"
 msgstr "ID"
 
@@ -2444,7 +2443,7 @@ msgstr ""
 msgid "If you have any questions or need assistance, feel free to reach out to our support team."
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:27
+#: lms/templates/emails/batch_confirmation.html:29
 #: 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."
@@ -2454,7 +2453,6 @@ msgstr ""
 #. Description of the 'Amount (USD)' (Currency) field in DocType 'LMS Course'
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:400
 msgid "If you set an amount here, then the USD equivalent setting will not get applied."
 msgstr ""
 
@@ -2484,7 +2482,7 @@ msgstr ""
 msgid "Image search powered by"
 msgstr ""
 
-#: lms/lms/doctype/lms_quiz/lms_quiz.py:219
+#: lms/lms/doctype/lms_quiz/lms_quiz.py:215
 msgid "Image: Corrupted Data Stream"
 msgstr "Slika: Oštećen tok podataka"
 
@@ -2492,7 +2490,7 @@ msgstr "Slika: Oštećen tok podataka"
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Course'
-#: frontend/src/components/Modals/Event.vue:348
+#: frontend/src/components/Modals/Event.vue:349
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2573,7 +2571,7 @@ msgstr ""
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Batch'
 #. Label of the instructors (Rating) field in DocType 'LMS Batch Feedback'
 #. Label of the instructors (Table MultiSelect) field in DocType 'LMS Course'
-#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:151
+#: frontend/src/pages/BatchForm.vue:27 frontend/src/pages/CourseForm.vue:44
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_feedback/lms_batch_feedback.json
 #: lms/lms/doctype/lms_course/lms_course.json
@@ -2682,7 +2680,7 @@ msgstr ""
 msgid "Items in Sidebar"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:275
+#: frontend/src/pages/ProgramForm.vue:277
 msgid "Items removed successfully"
 msgstr ""
 
@@ -2732,7 +2730,7 @@ msgstr ""
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
-#: frontend/src/pages/Jobs.vue:205
+#: frontend/src/pages/Jobs.vue:194
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Jobs"
 msgstr ""
@@ -3038,6 +3036,22 @@ msgstr ""
 msgid "Lesson Title"
 msgstr ""
 
+#: frontend/src/pages/LessonForm.vue:414
+msgid "Lesson created successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:217
+msgid "Lesson deleted successfully"
+msgstr ""
+
+#: frontend/src/components/CourseOutline.vue:232
+msgid "Lesson moved successfully"
+msgstr ""
+
+#: frontend/src/pages/LessonForm.vue:438
+msgid "Lesson updated successfully"
+msgstr ""
+
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Int) field in DocType 'LMS Course'
@@ -3088,7 +3102,7 @@ msgid "Links"
 msgstr "Linkovi"
 
 #. Option for the 'Status' (Select) field in DocType 'Cohort'
-#: frontend/src/pages/Courses.vue:314 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Courses.vue:306 lms/lms/doctype/cohort/cohort.json
 msgid "Live"
 msgstr ""
 
@@ -3103,12 +3117,12 @@ msgstr ""
 msgid "LiveCode URL"
 msgstr ""
 
-#: frontend/src/components/Members.vue:108
-#: frontend/src/pages/Assignments.vue:70 frontend/src/pages/Batches.vue:94
+#: frontend/src/components/Members.vue:109
+#: frontend/src/pages/Assignments.vue:69 frontend/src/pages/Batches.vue:82
 #: frontend/src/pages/CertifiedParticipants.vue:100
-#: frontend/src/pages/Courses.vue:90
+#: frontend/src/pages/Courses.vue:77
 #: frontend/src/pages/QuizSubmissionList.vue:39
-#: frontend/src/pages/Quizzes.vue:52
+#: frontend/src/pages/Quizzes.vue:55
 msgid "Load More"
 msgstr "Učitaj više"
 
@@ -3161,7 +3175,7 @@ msgstr ""
 msgid "Make sure to enter the correct billing name as the same will be used in your invoice."
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Manage Batch"
 msgstr ""
 
@@ -3196,8 +3210,8 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:40
 #: frontend/src/components/Modals/Question.vue:103
-#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:394
-#: frontend/src/pages/QuizSubmission.vue:65
+#: frontend/src/components/Quiz.vue:96 frontend/src/pages/QuizForm.vue:395
+#: frontend/src/pages/QuizSubmission.vue:64
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 #: lms/templates/quiz/quiz.html:59
@@ -3209,7 +3223,7 @@ msgid "Marks for question number {0} cannot be greater than the marks allotted f
 msgstr ""
 
 #. Label of the marks_out_of (Int) field in DocType 'LMS Quiz Result'
-#: frontend/src/pages/QuizSubmission.vue:68
+#: frontend/src/pages/QuizSubmission.vue:67
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
 msgid "Marks out of"
 msgstr ""
@@ -3224,9 +3238,8 @@ msgid "Maximum Attempts"
 msgstr ""
 
 #. Label of the medium (Select) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:193
+#: frontend/src/pages/BatchForm.vue:172
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:309
 msgid "Medium"
 msgstr "Srednje"
 
@@ -3235,7 +3248,7 @@ msgstr "Srednje"
 msgid "Medium ID"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:15
+#: lms/templates/emails/batch_confirmation.html:16
 #: lms/templates/emails/batch_start_reminder.html:19
 msgid "Medium:"
 msgstr ""
@@ -3258,7 +3271,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
-#: frontend/src/pages/QuizSubmissionList.vue:102
+#: frontend/src/pages/QuizSubmissionList.vue:91
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -3341,7 +3354,7 @@ msgstr ""
 msgid "Member Username"
 msgstr ""
 
-#: frontend/src/pages/ProgramForm.vue:254
+#: frontend/src/pages/ProgramForm.vue:256
 msgid "Member added to program"
 msgstr ""
 
@@ -3407,9 +3420,9 @@ msgstr "Meta opis"
 
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Batch'
 #. Label of the meta_image (Attach Image) field in DocType 'LMS Settings'
-#: frontend/src/pages/BatchForm.vue:54 lms/lms/doctype/lms_batch/lms_batch.json
+#: frontend/src/pages/BatchForm.vue:185
+#: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_settings/lms_settings.json
-#: lms/public/js/common_functions.js:362
 msgid "Meta Image"
 msgstr "Meta slika"
 
@@ -3443,6 +3456,7 @@ msgstr ""
 #: lms/lms/doctype/lms_program/lms_program.json
 #: lms/lms/doctype/lms_question/lms_question.json
 #: lms/lms/doctype/lms_quiz/lms_quiz.json
+#: lms/lms/doctype/lms_settings/lms_settings.json
 #: lms/lms/doctype/lms_source/lms_source.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 msgid "Moderator"
@@ -3489,17 +3503,20 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Assignments.vue:19 frontend/src/pages/Batches.vue:17
-#: frontend/src/pages/Courses.vue:17 frontend/src/pages/Courses.vue:317
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/components/Categories.vue:12
+#: frontend/src/components/Evaluators.vue:24
+#: frontend/src/components/Members.vue:24 frontend/src/pages/Assignments.vue:19
+#: frontend/src/pages/Batches.vue:17 frontend/src/pages/Courses.vue:17
+#: frontend/src/pages/Courses.vue:309 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Novi"
 
-#: lms/public/js/common_functions.js:255 lms/www/lms.py:151
+#: lms/www/lms.py:151
 msgid "New Batch"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:577 lms/www/lms.py:95
+#: frontend/src/pages/CourseForm.vue:590 lms/www/lms.py:95
 msgid "New Course"
 msgstr ""
 
@@ -3511,7 +3528,7 @@ msgstr ""
 msgid "New Job Applicant"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:105
+#: frontend/src/pages/Programs.vue:90
 msgid "New Program"
 msgstr ""
 
@@ -3527,7 +3544,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
+#: frontend/src/pages/QuizForm.vue:451 frontend/src/pages/QuizForm.vue:459
 #: frontend/src/pages/Quizzes.vue:19
 msgid "New Quiz"
 msgstr ""
@@ -3582,26 +3599,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:55
-msgid "No assignments found"
-msgstr ""
-
-#: frontend/src/pages/Batches.vue:79
-msgid "No batches found"
-msgstr ""
-
 #: lms/templates/certificates_section.html:23
 msgid "No certificates"
 msgstr ""
 
-#: frontend/src/pages/CertifiedParticipants.vue:110
-msgid "No certified members"
-msgstr ""
-
-#: frontend/src/pages/CertifiedParticipants.vue:114
-msgid "No certified members found. Please check again later or get certified yourself."
-msgstr ""
-
 #: frontend/src/components/BatchCourses.vue:67
 msgid "No courses added"
 msgstr ""
@@ -3610,10 +3611,6 @@ msgstr ""
 msgid "No courses created"
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:75
-msgid "No courses found"
-msgstr ""
-
 #: frontend/src/pages/Programs.vue:81
 msgid "No courses in this program"
 msgstr ""
@@ -3630,36 +3627,23 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:88
-msgid "No jobs found"
-msgstr ""
-
 #: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:91
-msgid "No programs found"
-msgstr ""
-
-#: frontend/src/pages/QuizSubmissionList.vue:52
-msgid "No quiz submissions found. Please check again later."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:62
-msgid "No quizzes found"
-msgstr ""
-
 #: frontend/src/components/Modals/EvaluationModal.vue:62
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:90
+msgid "No students in this batch"
+msgstr ""
+
 #: frontend/src/pages/AssignmentSubmissionList.vue:67
-#: frontend/src/pages/QuizSubmissionList.vue:49
 msgid "No submissions"
 msgstr ""
 
-#: lms/templates/course_list.html:13
+#: frontend/src/components/EmptyState.vue:5 lms/templates/course_list.html:13
 msgid "No {0}"
 msgstr "Nema {0}"
 
@@ -3716,7 +3700,7 @@ msgstr "Obaveštenja"
 msgid "Notify me when available"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:170
+#: frontend/src/pages/BatchForm.vue:150
 msgid "Number of seats available"
 msgstr ""
 
@@ -3756,11 +3740,11 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:507 frontend/src/utils/index.js:526
+#: frontend/src/pages/CourseForm.vue:526 frontend/src/utils/index.js:499
 msgid "Only image file is allowed."
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:221
+#: frontend/src/components/Modals/ChapterModal.vue:218
 msgid "Only zip files are allowed"
 msgstr ""
 
@@ -3860,14 +3844,13 @@ msgid "Pages"
 msgstr ""
 
 #. Label of the paid_batch (Check) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:219
+#: frontend/src/pages/BatchForm.vue:245
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:373
 msgid "Paid Batch"
 msgstr ""
 
 #. Label of the paid_certificate (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:214
+#: frontend/src/pages/CourseForm.vue:222
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Certificate"
 msgstr ""
@@ -3877,7 +3860,7 @@ msgid "Paid Certificate after Evaluation"
 msgstr ""
 
 #. Label of the paid_course (Check) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:204
+#: frontend/src/pages/CourseForm.vue:212
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Paid Course"
 msgstr ""
@@ -3887,7 +3870,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:197
+#: frontend/src/pages/Jobs.vue:186
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3901,7 +3884,7 @@ msgstr ""
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
-#: frontend/src/components/Modals/Event.vue:352
+#: frontend/src/components/Modals/Event.vue:353
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 msgid "Pass"
@@ -3920,13 +3903,12 @@ msgstr ""
 msgid "Password"
 msgstr "Lozinka"
 
-#: frontend/src/pages/CourseForm.vue:109
+#: frontend/src/pages/CourseForm.vue:197
 msgid "Paste the youtube link of a short video introducing the course"
 msgstr ""
 
 #. Label of the payment (Link) field in DocType 'LMS Batch Enrollment'
 #. Label of the payment (Link) field in DocType 'LMS Enrollment'
-#: frontend/src/pages/BatchForm.vue:214
 #: lms/lms/doctype/lms_batch_enrollment/lms_batch_enrollment.json
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 msgid "Payment"
@@ -4002,7 +3984,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'LMS Certificate
 #. Evaluation'
 #. Option for the 'Status' (Select) field in DocType 'LMS Mentor Request'
-#: frontend/src/components/Modals/Event.vue:344
+#: frontend/src/components/Modals/Event.vue:345
 #: lms/lms/doctype/cohort_join_request/cohort_join_request.json
 #: lms/lms/doctype/invite_request/invite_request.json
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4012,7 +3994,7 @@ msgstr "Na čekanju"
 
 #. Label of the percentage (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:44
-#: frontend/src/pages/QuizSubmissionList.vue:113
+#: frontend/src/pages/QuizSubmissionList.vue:102
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Percentage"
 msgstr ""
@@ -4022,7 +4004,7 @@ msgstr ""
 msgid "Percentage (e.g. 70%)"
 msgstr ""
 
-#: frontend/src/components/Modals/BatchStudentProgress.vue:35
+#: frontend/src/components/Modals/BatchStudentProgress.vue:44
 msgid "Percentage/Status"
 msgstr ""
 
@@ -4035,10 +4017,6 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Broj telefona"
 
-#: frontend/src/components/CourseCardOverlay.vue:176
-msgid "Please Login"
-msgstr ""
-
 #: lms/lms/doctype/lms_settings/lms_settings.py:34
 msgid "Please add <a href='{0}'>{1}</a> for <a href='{2}'>{3}</a> to send calendar invites for evaluations."
 msgstr ""
@@ -4059,11 +4037,11 @@ msgstr ""
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:192
+#: lms/lms/doctype/lms_batch/lms_batch.py:200
 msgid "Please enable Zoom Settings to use this feature."
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:322
+#: frontend/src/components/CourseOutline.vue:319
 msgid "Please enroll for this course to view this lesson"
 msgstr ""
 
@@ -4071,7 +4049,7 @@ msgstr ""
 msgid "Please ensure that you complete all the questions in {0} minutes."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:170
+#: frontend/src/components/Modals/LiveClassModal.vue:171
 msgid "Please enter a title."
 msgstr ""
 
@@ -4080,7 +4058,7 @@ msgstr ""
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:182
+#: frontend/src/components/Modals/LiveClassModal.vue:183
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
@@ -4092,7 +4070,7 @@ msgstr ""
 msgid "Please enter your answer"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:58
+#: lms/lms/doctype/lms_batch/lms_batch.py:63
 msgid "Please install the Payments App to create a paid batch. Refer to the documentation for more details. {0}"
 msgstr ""
 
@@ -4125,31 +4103,35 @@ msgstr ""
 msgid "Please schedule an evaluation to get certified."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:173
+#: frontend/src/components/Modals/LiveClassModal.vue:174
 msgid "Please select a date."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:197
+#: frontend/src/components/Modals/LiveClassModal.vue:198
 msgid "Please select a duration."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:194
+#: frontend/src/components/Modals/LiveClassModal.vue:195
 msgid "Please select a future date and time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:176
+#: frontend/src/components/Modals/LiveClassModal.vue:177
 msgid "Please select a time."
 msgstr ""
 
-#: frontend/src/components/Modals/LiveClassModal.vue:179
+#: frontend/src/components/Modals/LiveClassModal.vue:180
 msgid "Please select a timezone."
 msgstr ""
 
+#: frontend/src/components/Quiz.vue:497
+msgid "Please select an option"
+msgstr ""
+
 #: lms/templates/emails/job_report.html:6
 msgid "Please take appropriate action at {0}"
 msgstr ""
 
-#: frontend/src/components/Modals/ChapterModal.vue:178
+#: frontend/src/components/Modals/ChapterModal.vue:175
 msgid "Please upload a SCORM package"
 msgstr ""
 
@@ -4195,10 +4177,6 @@ msgstr ""
 msgid "Post"
 msgstr "Objavi"
 
-#: frontend/src/pages/Jobs.vue:94
-msgid "Post a new job or check again later."
-msgstr ""
-
 #: frontend/src/pages/Billing.vue:95
 msgid "Postal Code"
 msgstr "Poštanski broj"
@@ -4238,7 +4216,7 @@ msgstr ""
 msgid "Preview Image"
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:107
+#: frontend/src/pages/CourseForm.vue:195
 msgid "Preview Video"
 msgstr ""
 
@@ -4247,13 +4225,13 @@ msgid "Previous"
 msgstr "Prethodni"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Batch'
+#: frontend/src/pages/BatchForm.vue:240
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:368
 msgid "Pricing"
 msgstr "Cene"
 
 #. Label of the pricing_tab (Tab Break) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:198
+#: frontend/src/pages/CourseForm.vue:206
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Pricing and Certification"
 msgstr ""
@@ -4317,7 +4295,7 @@ msgstr ""
 msgid "Program Members"
 msgstr ""
 
-#: frontend/src/pages/Programs.vue:220 frontend/src/pages/Programs.vue:226
+#: frontend/src/pages/Programs.vue:206 frontend/src/pages/Programs.vue:212
 #: lms/www/lms.py:295
 msgid "Programs"
 msgstr ""
@@ -4325,7 +4303,7 @@ msgstr ""
 #. Label of the progress (Float) field in DocType 'LMS Enrollment'
 #. Label of the progress (Int) field in DocType 'LMS Program Member'
 #: frontend/src/components/BatchStudents.vue:75
-#: frontend/src/components/Modals/BatchStudentProgress.vue:82
+#: frontend/src/components/Modals/BatchStudentProgress.vue:94
 #: lms/lms/doctype/lms_enrollment/lms_enrollment.json
 #: lms/lms/doctype/lms_program_member/lms_program_member.json
 msgid "Progress"
@@ -4351,10 +4329,9 @@ msgstr ""
 #. Label of the published (Check) field in DocType 'LMS Course'
 #: frontend/src/components/Modals/BulkCertificates.vue:51
 #: frontend/src/components/Modals/Event.vue:108
-#: frontend/src/pages/BatchForm.vue:38 frontend/src/pages/CourseForm.vue:168
+#: frontend/src/pages/BatchForm.vue:52 frontend/src/pages/CourseForm.vue:150
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_course/lms_course.json
-#: lms/public/js/common_functions.js:266
 msgid "Published"
 msgstr "Objavljeno"
 
@@ -4365,7 +4342,7 @@ msgid "Published Courses"
 msgstr ""
 
 #. Label of the published_on (Date) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:172
+#: frontend/src/pages/CourseForm.vue:154
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Published On"
 msgstr ""
@@ -4385,7 +4362,7 @@ msgstr ""
 #: frontend/src/components/Assignment.vue:20
 #: frontend/src/components/Modals/AssignmentForm.vue:32
 #: frontend/src/components/Modals/Question.vue:27
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/QuizForm.vue:390 frontend/src/pages/QuizSubmission.vue:56
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4414,7 +4391,7 @@ msgstr ""
 msgid "Question added successfully"
 msgstr ""
 
-#: frontend/src/components/Modals/Question.vue:333
+#: frontend/src/components/Modals/Question.vue:331
 msgid "Question updated successfully"
 msgstr ""
 
@@ -4431,7 +4408,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:432
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4454,8 +4431,8 @@ msgid "Quiz Submission"
 msgstr ""
 
 #: frontend/src/pages/QuizSubmission.vue:131
-#: frontend/src/pages/QuizSubmissionList.vue:122
-#: frontend/src/pages/QuizSubmissionList.vue:127
+#: frontend/src/pages/QuizSubmissionList.vue:111
+#: frontend/src/pages/QuizSubmissionList.vue:116
 msgid "Quiz Submissions"
 msgstr ""
 
@@ -4468,7 +4445,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:344
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4476,7 +4453,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:363
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4486,7 +4463,7 @@ msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:573
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:142
+#: frontend/src/pages/QuizForm.vue:443 frontend/src/pages/Quizzes.vue:142
 #: frontend/src/pages/Quizzes.vue:152 lms/www/lms.py:251
 msgid "Quizzes"
 msgstr ""
@@ -4536,7 +4513,7 @@ msgstr "Vrsta referentnog dokumenta"
 msgid "Regards"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:84
+#: frontend/src/components/BatchOverlay.vue:89
 msgid "Register Now"
 msgstr ""
 
@@ -4565,7 +4542,7 @@ msgstr ""
 msgid "Related Courses"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:92 frontend/src/pages/CourseForm.vue:96
+#: frontend/src/pages/BatchForm.vue:221 frontend/src/pages/CourseForm.vue:127
 msgid "Remove"
 msgstr "Ukloni"
 
@@ -4634,6 +4611,10 @@ msgstr "Uloga"
 msgid "Role Preference"
 msgstr ""
 
+#: frontend/src/pages/ProfileRoles.vue:105
+msgid "Role updated successfully"
+msgstr ""
+
 #: frontend/src/components/AppSidebar.vue:601
 msgid "Roles"
 msgstr "Uloge"
@@ -4643,19 +4624,19 @@ msgstr "Uloge"
 msgid "Route"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:131
+#: lms/lms/doctype/lms_batch/lms_batch.py:139
 msgid "Row #{0} Date cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:126
+#: lms/lms/doctype/lms_batch/lms_batch.py:134
 msgid "Row #{0} End time cannot be outside the batch duration."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:108
+#: lms/lms/doctype/lms_batch/lms_batch.py:116
 msgid "Row #{0} Start time cannot be greater than or equal to end time."
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:117
+#: lms/lms/doctype/lms_batch/lms_batch.py:125
 msgid "Row #{0} Start time cannot be outside the batch duration."
 msgstr ""
 
@@ -4705,7 +4686,6 @@ msgstr ""
 #: frontend/src/pages/JobForm.vue:8 frontend/src/pages/LessonForm.vue:14
 #: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
 #: frontend/src/pages/QuizSubmission.vue:14
-#: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Sačuvaj"
 
@@ -4731,7 +4711,7 @@ msgstr ""
 
 #. Label of the score (Int) field in DocType 'LMS Quiz Submission'
 #: frontend/src/pages/QuizSubmission.vue:39
-#: frontend/src/pages/QuizSubmissionList.vue:107
+#: frontend/src/pages/QuizSubmissionList.vue:96
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 #: lms/templates/quiz/quiz.html:148
 msgid "Score"
@@ -4743,7 +4723,7 @@ msgid "Score Out Of"
 msgstr ""
 
 #: frontend/src/components/Evaluators.vue:15
-#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:40
+#: frontend/src/components/Members.vue:15 frontend/src/pages/Jobs.vue:42
 msgid "Search"
 msgstr "Pretraga"
 
@@ -4751,11 +4731,11 @@ msgstr "Pretraga"
 msgid "Search by Name"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:45 frontend/src/pages/Courses.vue:41
+#: frontend/src/pages/Batches.vue:47 frontend/src/pages/Courses.vue:43
 msgid "Search by Title"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:25
+#: frontend/src/pages/Assignments.vue:37
 msgid "Search by title"
 msgstr ""
 
@@ -4764,19 +4744,22 @@ msgid "Search for an icon"
 msgstr ""
 
 #. Label of the seat_count (Int) field in DocType 'LMS Batch'
-#: frontend/src/pages/BatchForm.vue:167
+#: frontend/src/pages/BatchForm.vue:147
 #: lms/lms/doctype/lms_batch/lms_batch.json
-#: lms/public/js/common_functions.js:327
 msgid "Seat Count"
 msgstr ""
 
 #: frontend/src/components/BatchCard.vue:18
-#: frontend/src/components/BatchOverlay.vue:12
+#: frontend/src/components/BatchOverlay.vue:17
 msgid "Seat Left"
 msgstr ""
 
+#: lms/lms/doctype/lms_batch/lms_batch.py:103
+msgid "Seat count cannot be negative."
+msgstr ""
+
 #: frontend/src/components/BatchCard.vue:15
-#: frontend/src/components/BatchOverlay.vue:9
+#: frontend/src/components/BatchOverlay.vue:14
 msgid "Seats Left"
 msgstr ""
 
@@ -4825,7 +4808,7 @@ msgstr ""
 
 #: frontend/src/components/AppSidebar.vue:599
 #: frontend/src/components/Modals/Settings.vue:7
-#: frontend/src/pages/BatchForm.vue:161 frontend/src/pages/CourseForm.vue:158
+#: frontend/src/pages/BatchForm.vue:46 frontend/src/pages/CourseForm.vue:143
 #: frontend/src/pages/ProfileRoles.vue:4 frontend/src/pages/QuizForm.vue:79
 msgid "Settings"
 msgstr "Podešavanja"
@@ -4834,17 +4817,17 @@ msgstr "Podešavanja"
 msgid "Share on"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:242
+#: frontend/src/pages/BatchForm.vue:35
 msgid "Short Description"
 msgstr ""
 
 #. Label of the short_introduction (Small Text) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:35
+#: frontend/src/pages/CourseForm.vue:80
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Short Introduction"
 msgstr ""
 
-#: frontend/src/pages/BatchForm.vue:245
+#: frontend/src/pages/BatchForm.vue:38
 msgid "Short description of the batch"
 msgstr ""
 
@@ -4954,6 +4937,14 @@ msgstr "Preskoči"
 msgid "Slot Times are overlapping for some schedules."
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:201
+msgid "Slot added successfully"
+msgstr ""
+
+#: frontend/src/pages/ProfileEvaluator.vue:240
+msgid "Slot deleted successfully"
+msgstr ""
+
 #. Label of the slug (Data) field in DocType 'Cohort'
 #. Label of the slug (Data) field in DocType 'Cohort Subgroup'
 #. Label of the slug (Data) field in DocType 'Cohort Web Page'
@@ -4964,7 +4955,7 @@ msgid "Slug"
 msgstr "Slug"
 
 #: frontend/src/components/BatchCard.vue:25
-#: frontend/src/components/BatchOverlay.vue:19
+#: frontend/src/components/BatchOverlay.vue:24
 msgid "Sold Out"
 msgstr ""
 
@@ -5004,11 +4995,10 @@ msgstr "Početak"
 #. Label of the start_date (Date) field in DocType 'Education Detail'
 #. Label of the start_date (Date) field in DocType 'LMS Batch'
 #. Label of the start_date (Date) field in DocType 'LMS Batch Old'
-#: frontend/src/pages/BatchForm.vue:117
+#: frontend/src/pages/BatchForm.vue:75
 #: lms/lms/doctype/education_detail/education_detail.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
-#: lms/public/js/common_functions.js:275
 msgid "Start Date"
 msgstr "Datum početka"
 
@@ -5029,7 +5019,7 @@ msgstr ""
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Evaluation'
 #. Label of the start_time (Time) field in DocType 'LMS Certificate Request'
 #. Label of the start_time (Time) field in DocType 'Scheduled Flow'
-#: frontend/src/pages/BatchForm.vue:133
+#: frontend/src/pages/BatchForm.vue:91
 #: frontend/src/pages/ProfileEvaluator.vue:29
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
 #: lms/lms/doctype/lms_batch/lms_batch.json
@@ -5038,7 +5028,6 @@ msgstr ""
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
-#: lms/public/js/common_functions.js:292
 msgid "Start Time"
 msgstr ""
 
@@ -5126,7 +5115,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:326
+#: frontend/src/components/BatchStudents.vue:328
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -5148,6 +5137,10 @@ msgstr ""
 msgid "Subject"
 msgstr "Predmet"
 
+#: frontend/src/components/Modals/AnnouncementModal.vue:93
+msgid "Subject is required"
+msgstr ""
+
 #: frontend/src/components/Assignment.vue:32
 msgid "Submission"
 msgstr ""
@@ -5190,30 +5183,6 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
-#: frontend/src/components/Assignment.vue:341
-#: frontend/src/components/BatchCourses.vue:155
-#: frontend/src/components/BatchOverlay.vue:155
-#: frontend/src/components/BatchStudents.vue:326
-#: frontend/src/components/CourseCardOverlay.vue:196
-#: frontend/src/components/Modals/AnnouncementModal.vue:99
-#: frontend/src/components/Modals/AssessmentModal.vue:73
-#: frontend/src/components/Modals/AssignmentForm.vue:127
-#: frontend/src/components/Modals/AssignmentForm.vue:144
-#: frontend/src/components/Modals/BulkCertificates.vue:121
-#: frontend/src/components/Modals/ChapterModal.vue:154
-#: frontend/src/components/Modals/ChapterModal.vue:199
-#: frontend/src/components/Modals/Event.vue:255
-#: frontend/src/components/Modals/Event.vue:310
-#: frontend/src/components/Modals/Question.vue:281
-#: frontend/src/components/Modals/Question.vue:332
-#: frontend/src/pages/CourseForm.vue:470 frontend/src/pages/ProgramForm.vue:232
-#: frontend/src/pages/ProgramForm.vue:254
-#: frontend/src/pages/ProgramForm.vue:275
-#: frontend/src/pages/ProgramForm.vue:301 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
-msgid "Success"
-msgstr "Uspeh"
-
 #. Label of the summary (Small Text) field in DocType 'LMS Certificate
 #. Evaluation'
 #: frontend/src/components/Modals/Event.vue:97
@@ -5284,7 +5253,7 @@ msgid "System Manager"
 msgstr "Sistem menadžer"
 
 #. Label of the tags (Data) field in DocType 'LMS Course'
-#: frontend/src/pages/CourseForm.vue:117
+#: frontend/src/pages/CourseForm.vue:51
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Tags"
 msgstr "Oznake"
@@ -5377,27 +5346,11 @@ msgstr ""
 msgid "The status of your application has changed."
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:83
-msgid "There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
 #: frontend/src/components/CreateOutline.vue:12
 msgid "There are no chapters in this course. Create and manage chapters from here."
 msgstr ""
 
-#: frontend/src/pages/Courses.vue:79
-msgid "There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: frontend/src/pages/Jobs.vue:91
-msgid "There are no jobs available at the moment."
-msgstr ""
-
-#: frontend/src/pages/Programs.vue:95
-msgid "There are no programs available at the moment. Keep an eye out, fresh learning experiences are on the way soon!"
-msgstr ""
-
-#: lms/lms/doctype/lms_batch/lms_batch.py:99
+#: lms/lms/doctype/lms_batch/lms_batch.py:107
 msgid "There are no seats available in this batch."
 msgstr ""
 
@@ -5409,6 +5362,10 @@ msgstr ""
 msgid "There are no submissions for this assignment."
 msgstr ""
 
+#: frontend/src/components/EmptyState.vue:11
+msgid "There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!"
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
@@ -5530,14 +5487,14 @@ msgstr ""
 #. Label of the timezone (Data) field in DocType 'LMS Certificate Request'
 #. Label of the timezone (Data) field in DocType 'LMS Live Class'
 #: frontend/src/components/Modals/LiveClassModal.vue:45
-#: frontend/src/pages/BatchForm.vue:149
+#: frontend/src/pages/BatchForm.vue:107
 #: lms/lms/doctype/lms_batch/lms_batch.json
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_live_class/lms_live_class.json
 msgid "Timezone"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:19
+#: lms/templates/emails/batch_confirmation.html:21
 #: lms/templates/emails/batch_start_reminder.html:16
 #: lms/templates/emails/live_class_reminder.html:16
 msgid "Timings:"
@@ -5563,9 +5520,9 @@ msgstr ""
 #: frontend/src/components/Modals/AssignmentForm.vue:20
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/Assignments.vue:163 frontend/src/pages/BatchForm.vue:20
-#: frontend/src/pages/CourseForm.vue:29 frontend/src/pages/JobForm.vue:20
-#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:116
+#: frontend/src/pages/Assignments.vue:165 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:30 frontend/src/pages/JobForm.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:101
 #: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:120
 #: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -5584,11 +5541,10 @@ msgstr ""
 #: lms/lms/doctype/lms_sidebar_item/lms_sidebar_item.json
 #: lms/lms/doctype/lms_timetable_template/lms_timetable_template.json
 #: lms/lms/doctype/work_experience/work_experience.json
-#: lms/public/js/common_functions.js:259
 msgid "Title"
 msgstr "Naslov"
 
-#: frontend/src/components/Modals/ChapterModal.vue:175
+#: frontend/src/components/Modals/ChapterModal.vue:172
 msgid "Title is required"
 msgstr ""
 
@@ -5657,8 +5613,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:44
-#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:168
-#: frontend/src/pages/JobForm.vue:38 frontend/src/pages/Jobs.vue:63
+#: frontend/src/pages/Assignments.vue:43 frontend/src/pages/Assignments.vue:170
+#: frontend/src/pages/JobForm.vue:25 frontend/src/pages/Jobs.vue:65
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -5668,7 +5624,7 @@ msgstr ""
 msgid "Type"
 msgstr "Vrsta"
 
-#: frontend/src/components/Quiz.vue:615
+#: frontend/src/components/Quiz.vue:610
 msgid "Type your answer"
 msgstr ""
 
@@ -5690,6 +5646,10 @@ msgstr ""
 msgid "Unavailability"
 msgstr ""
 
+#: frontend/src/pages/ProfileEvaluator.vue:259
+msgid "Unavailability updated successfully"
+msgstr ""
+
 #: lms/lms/doctype/course_evaluator/course_evaluator.py:29
 msgid "Unavailable From Date cannot be greater than Unavailable To Date"
 msgstr ""
@@ -5704,7 +5664,7 @@ msgstr ""
 msgid "Unlisted"
 msgstr ""
 
-#: frontend/src/pages/Batches.vue:296
+#: frontend/src/pages/Batches.vue:288
 msgid "Unpublished"
 msgstr ""
 
@@ -5726,8 +5686,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:294 frontend/src/pages/CourseForm.vue:181
-#: frontend/src/pages/Courses.vue:320 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/Batches.vue:286 frontend/src/pages/CourseForm.vue:162
+#: frontend/src/pages/Courses.vue:312 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"
@@ -5752,7 +5712,7 @@ msgstr "Ažuriraj"
 msgid "Update Password"
 msgstr "Ažuriraj lozinku"
 
-#: frontend/src/pages/BatchForm.vue:71 frontend/src/pages/CourseForm.vue:77
+#: frontend/src/pages/BatchForm.vue:202 frontend/src/pages/CourseForm.vue:108
 msgid "Upload"
 msgstr "Otpremi"
 
@@ -5854,7 +5814,7 @@ msgstr ""
 msgid "Visibility"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:64
+#: frontend/src/components/BatchOverlay.vue:69
 msgid "Visit Batch"
 msgstr ""
 
@@ -5862,7 +5822,7 @@ msgstr ""
 msgid "Visit Website"
 msgstr ""
 
-#: lms/templates/emails/batch_confirmation.html:23
+#: lms/templates/emails/batch_confirmation.html:25
 msgid "Visit the following link to view your "
 msgstr ""
 
@@ -5894,6 +5854,10 @@ msgstr ""
 msgid "Web Page"
 msgstr "Veb-stranica"
 
+#: frontend/src/components/Modals/PageModal.vue:80
+msgid "Web page added to sidebar"
+msgstr ""
+
 #. Option for the 'Day' (Select) field in DocType 'Evaluator Schedule'
 #. Option for the 'Day' (Select) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/evaluator_schedule/evaluator_schedule.json
@@ -5906,12 +5870,16 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
+#: frontend/src/pages/PersonaForm.vue:32
+msgid "What best describes your role?"
+msgstr ""
+
 #: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
 #: frontend/src/pages/PersonaForm.vue:21
-msgid "What is your main use case for Frappe Learning?"
+msgid "What is your use case for Frappe Learning?"
 msgstr ""
 
 #: lms/templates/courses_under_review.html:15
@@ -5987,10 +5955,6 @@ msgstr ""
 msgid "You are not a mentor of the course {0}"
 msgstr ""
 
-#: frontend/src/components/CourseOutline.vue:321
-msgid "You are not enrolled"
-msgstr ""
-
 #: frontend/src/pages/SCORMChapter.vue:22
 msgid "You are not enrolled in this course. Please enroll to access this lesson."
 msgstr ""
@@ -6069,11 +6033,11 @@ msgstr ""
 msgid "You have applied"
 msgstr ""
 
-#: frontend/src/components/BatchOverlay.vue:156
+#: frontend/src/components/BatchOverlay.vue:159
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:197
+#: frontend/src/components/CourseCardOverlay.vue:191
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -6085,19 +6049,11 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
-#: frontend/src/pages/Assignments.vue:59
-msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
-msgstr ""
-
-#: frontend/src/pages/Quizzes.vue:66
-msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
-msgstr ""
-
-#: lms/lms/widgets/NoPreviewModal.html:12 lms/public/js/common_functions.js:126
+#: lms/lms/widgets/NoPreviewModal.html:12
 msgid "You have opted to be notified for this course. You will receive an email when the course becomes available."
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:177
+#: frontend/src/components/CourseCardOverlay.vue:175
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -6129,7 +6085,7 @@ msgstr ""
 msgid "Your Account has been successfully created!"
 msgstr ""
 
-#: lms/lms/doctype/lms_batch/lms_batch.py:423
+#: lms/lms/doctype/lms_batch/lms_batch.py:351
 msgid "Your batch {0} is starting tomorrow"
 msgstr ""
 
@@ -6183,11 +6139,11 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:102
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicant"
 msgstr ""
 
-#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:102
+#: frontend/src/components/JobCard.vue:26 frontend/src/pages/JobDetail.vue:108
 msgid "applicants"
 msgstr ""
 
@@ -6247,7 +6203,7 @@ msgstr "od"
 msgid "out of"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:391
 msgid "question_detail"
 msgstr ""
 
@@ -6267,10 +6223,18 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:35
+#: frontend/src/pages/Assignments.vue:29
+msgid "{0} Assignments"
+msgstr ""
+
+#: frontend/src/pages/Jobs.vue:33
 msgid "{0} Open Jobs"
 msgstr ""
 
+#: frontend/src/pages/Quizzes.vue:25
+msgid "{0} Quizzes"
+msgstr ""
+
 #: lms/lms/api.py:853 lms/lms/api.py:861
 msgid "{0} Settings not found"
 msgstr ""