chore: update POT file

2025-03-28 16:04:20 +00:00
206 changed files with 17196 additions and 41897 deletions
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -7,27 +7,8 @@ on:
    branches: [ main ]

 jobs:
-  commit-lint:
-    name: 'Semantic Commits'
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 200
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          check-latest: true
-
-      - name: Check commit titles
-        run: |
-          npm install @commitlint/cli @commitlint/config-conventional
-          npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}
-
  linters:
-    name: Semgrep Rules
+    name: Semantic Commits
    runs-on: ubuntu-latest
    if: github.event_name == 'pull_request'

@@ -39,17 +20,8 @@ jobs:
        with:
          python-version: '3.10'

-      - name: Cache pip
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
      - name: Install and Run Pre-commit
-        uses: pre-commit/action@v3.0.1
+        uses: pre-commit/action@v2.0.3

      - name: Download Semgrep rules
        run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
--- a/.github/workflows/make_release_pr.yml
+++ b/.github/workflows/make_release_pr.yml
@@ -1,7 +1,8 @@
 name: Create weekly release
 on:
  schedule:
-    - cron: '30 4 15 * *'
+    # 13:00 UTC -> 7pm IST on every Wednesday
+    - cron: '30 4 * * 3'
  workflow_dispatch:

 jobs:
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -70,7 +70,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

-      - uses: actions/cache@v4
+      - uses: actions/cache@v3
        id: yarn-cache
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -79,7 +79,7 @@ jobs:
            ${{ runner.os }}-yarn-ui-

      - name: Cache cypress binary
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: ~/.cache/Cypress
          key: ${{ runner.os }}-cypress
@@ -100,12 +100,11 @@ jobs:
          bench --site lms.test execute frappe.utils.install.complete_setup_wizard
          bench --site lms.test execute frappe.tests.ui_test_helpers.create_test_user
          bench --site lms.test set-password frappe@example.com admin
-          bench --site lms.test execute lms.lms.utils.persona_captured

      - name: cypress pre-requisites
        run: |
          cd ~/frappe-bench/apps/lms
-          yarn add cypress@^10 --no-lockfile -W
+          yarn add cypress@^10 --no-lockfile

      - name: UI Tests
        run: cd ~/frappe-bench/ && bench --site lms.test run-ui-tests lms --headless
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -1,26 +0,0 @@
-export default {
-	parserPreset: "conventional-changelog-conventionalcommits",
-	rules: {
-		"subject-empty": [2, "never"],
-		"type-case": [2, "always", "lower-case"],
-		"type-empty": [2, "never"],
-		"type-enum": [
-			2,
-			"always",
-			[
-				"build",
-				"chore",
-				"ci",
-				"docs",
-				"feat",
-				"fix",
-				"perf",
-				"refactor",
-				"revert",
-				"style",
-				"test",
-				"deprecate", // deprecation decision
-			],
-		],
-	},
-};
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -1,6 +1,6 @@
-import { defineConfig } from "cypress";
+const { defineConfig } = require("cypress");

-export default defineConfig({
+module.exports = defineConfig({
 	projectId: "vandxn",
 	adminPassword: "admin",
 	testUser: "frappe@example.com",
@@ -13,6 +13,6 @@ export default defineConfig({
 		openMode: 0,
 	},
 	e2e: {
-		baseUrl: "http://pertest:8000",
+		baseUrl: "http://testui:8000",
 	},
 });
--- a/cypress/e2e/batch_creation.cy.js
+++ b/cypress/e2e/batch_creation.cy.js
@@ -1,180 +0,0 @@
-describe("Batch Creation", () => {
-	it("creates a new batch", () => {
-		cy.login();
-		cy.wait(500);
-		cy.visit("/lms/batches");
-		cy.closeOnboardingModal();
-
-		// Open Settings
-		cy.get("span").contains("Learning").click();
-		cy.get("span").contains("Settings").click();
-
-		// Add a new member
-		cy.get('[id^="headlessui-dialog-panel-v-"]')
-			.find("span")
-			.contains(/^Members$/)
-			.click();
-		cy.get('[id^="headlessui-dialog-panel-v-"]')
-			.find("button")
-			.contains("New")
-			.click();
-
-		const dateNow = Date.now();
-		const randomEmail = `testuser_${dateNow}@example.com`;
-		const randomName = `Test User ${dateNow}`;
-
-		cy.get("input[placeholder='Email']").type(randomEmail);
-		cy.get("input[placeholder='First Name']").type(randomName);
-		cy.get("button").contains("Add").click();
-
-		// Add evaluator
-		cy.get('[id^="headlessui-dialog-panel-v-"]')
-			.find("span")
-			.contains(/^Evaluators$/)
-			.click();
-
-		cy.get('[id^="headlessui-dialog-panel-v-"]')
-			.find("button")
-			.contains("New")
-			.click();
-		const randomEvaluator = `evaluator${dateNow}@example.com`;
-
-		cy.get("input[placeholder='Email']").type(randomEvaluator);
-		cy.get("button").contains("Add").click();
-		cy.get("div").contains(randomEvaluator).should("be.visible").click();
-
-		cy.visit("/lms/batches");
-		cy.closeOnboardingModal();
-
-		// Create a batch
-		cy.get("button").contains("New").click();
-		cy.wait(500);
-		cy.url().should("include", "/batches/new/edit");
-		cy.get("label").contains("Title").type("Test Batch");
-
-		cy.get("label").contains("Start Date").type("2030-10-01");
-		cy.get("label").contains("End Date").type("2030-10-31");
-		cy.get("label").contains("Start Time").type("10:00");
-		cy.get("label").contains("End Time").type("11:00");
-		cy.get("label").contains("Timezone").type("IST");
-		cy.get("label").contains("Seat Count").type("10");
-		cy.get("label").contains("Published").click();
-
-		cy.get("label")
-			.contains("Short Description")
-			.type("Test Batch Short Description to test the UI");
-		cy.get("div[contenteditable=true").invoke(
-			"text",
-			"Test Batch Description. I need a very big description to test the UI. This is a very big description. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
-		);
-
-		/* Instructor */
-		cy.get("label")
-			.contains("Instructors")
-			.parent()
-			.within(() => {
-				cy.get("input").click().type("evaluator");
-				cy.get("input")
-					.invoke("attr", "aria-controls")
-					.as("instructor_list_id");
-			});
-		cy.get("@instructor_list_id").then((instructor_list_id) => {
-			cy.get(`[id^=${instructor_list_id}`)
-				.should("be.visible")
-				.within(() => {
-					cy.get("[id^=headlessui-combobox-option-").first().click();
-				});
-		});
-
-		cy.button("Save").click();
-		cy.wait(1000);
-		let batchName;
-		cy.url().then((url) => {
-			console.log(url);
-			batchName = url.split("/").pop();
-			cy.wrap(batchName).as("batchName");
-		});
-		cy.wait(500);
-
-		// View Batch
-		cy.wait(1000);
-		cy.visit("/lms/batches");
-		cy.closeOnboardingModal();
-
-		cy.url().should("include", "/lms/batches");
-
-		cy.get('[id^="headlessui-radiogroup-v-"]')
-			.find("span")
-			.contains("Upcoming")
-			.should("be.visible")
-			.click();
-
-		cy.get("@batchName").then((batchName) => {
-			cy.get(`a[href='/lms/batches/details/${batchName}'`).within(() => {
-				cy.get("div").contains("Test Batch").should("be.visible");
-				cy.get("div")
-					.contains("Test Batch Short Description to test the UI")
-					.should("be.visible");
-				cy.get("span")
-					.contains("01 Oct 2030 - 31 Oct 2030")
-					.should("be.visible");
-				cy.get("span")
-					.contains("10:00 AM - 11:00 AM")
-					.should("be.visible");
-				cy.get("span").contains("IST").should("be.visible");
-				cy.get("a").contains("Evaluator").should("be.visible");
-				cy.get("div")
-					.contains("10")
-					.should("be.visible")
-					.get("span")
-					.contains("Seats Left")
-					.should("be.visible");
-			});
-			cy.get(`a[href='/lms/batches/details/${batchName}'`).click();
-		});
-
-		cy.get("div").contains("Test Batch").should("be.visible");
-		cy.get("div")
-			.contains("Test Batch Short Description to test the UI")
-			.should("be.visible");
-		cy.get("a").contains("Evaluator").should("be.visible");
-		cy.get("span")
-			.contains("01 Oct 2030 - 31 Oct 2030")
-			.should("be.visible");
-		cy.get("span").contains("10:00 AM - 11:00 AM").should("be.visible");
-		cy.get("span").contains("IST").should("be.visible");
-		cy.get("div")
-			.contains("10")
-			.should("be.visible")
-			.get("span")
-			.contains("Seats Left")
-			.should("be.visible");
-
-		cy.get("p")
-			.contains(
-				"Test Batch Description. I need a very big description to test the UI. This is a very big description. It contains more than once sentence. Its meant to be this long as this is a UI test. Its unbearably long and I'm not sure why I'm typing this much. I'm just going to keep typing until I feel like its long enough. I think its long enough now. I'm going to stop typing now."
-			)
-			.should("be.visible");
-		cy.get("button").contains("Manage Batch").click();
-
-		/* Add student to batch */
-		cy.get("button").contains("Add").click();
-		cy.get('div[id^="headlessui-dialog-panel-v-"]')
-			.first()
-			.find("button")
-			.eq(1)
-			.click();
-		cy.get("input[id^='headlessui-combobox-input-v-']").type(randomEmail);
-		cy.get("div").contains(randomEmail).click();
-		cy.get("button").contains("Submit").click();
-
-		// Verify Seat Count
-		cy.get("span").contains("Details").click();
-		cy.get("div")
-			.contains("9")
-			.should("be.visible")
-			.get("span")
-			.contains("Seats Left")
-			.should("be.visible");
-	});
-});
--- a/cypress/e2e/course_creation.cy.js
+++ b/cypress/e2e/course_creation.cy.js
@@ -1,15 +1,12 @@
 describe("Course Creation", () => {
 	it("creates a new course", () => {
 		cy.login();
-		cy.wait(500);
+		cy.wait(1000);
 		cy.visit("/lms/courses");

-		// Close onboarding modal
-		cy.closeOnboardingModal();
-
 		// Create a course
 		cy.get("button").contains("New").click();
-		cy.wait(500);
+		cy.wait(1000);
 		cy.url().should("include", "/courses/new/edit");

 		cy.get("label").contains("Title").type("Test Course");
@@ -22,16 +19,12 @@ describe("Course Creation", () => {
 		);

 		cy.fixture("profile.png", "base64").then((fileContent) => {
-			cy.get("div")
-				.contains("Course Image")
-				.siblings("div")
-				.children('input[type="file"]')
-				.attachFile({
-					fileContent,
-					fileName: "profile.png",
-					mimeType: "image/png",
-					encoding: "base64",
-				});
+			cy.get('input[type="file"]').attachFile({
+				fileContent,
+				fileName: "profile.png",
+				mimeType: "image/png",
+				encoding: "base64",
+			});
 		});

 		cy.get("label")
@@ -99,8 +92,7 @@ describe("Course Creation", () => {
 		// View Course
 		cy.wait(1000);
 		cy.visit("/lms");
-		cy.closeOnboardingModal();
-
+		cy.wait(500);
 		cy.url().should("include", "/lms/courses");
 		cy.get(".grid a:first").within(() => {
 			cy.get("div").contains("Test Course");
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -25,7 +25,6 @@
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })

 import "cypress-file-upload";
-import "cypress-real-events";

 Cypress.Commands.add("login", (email, password) => {
 	if (!email) {
@@ -69,18 +68,3 @@ Cypress.Commands.add("paste", { prevSubject: true }, (subject, text) => {
 		element.dispatchEvent(event);
 	});
 });
-
-Cypress.Commands.add("closeOnboardingModal", () => {
-	cy.wait(500);
-	cy.get("body").then(($body) => {
-		// Check if any element with class including 'z-50' exists
-		if ($body.find('[class*="z-50"]').length > 0) {
-			cy.get('[class*="z-50"]')
-				.find('button:has(svg[class*="feather-x"])')
-				.realClick();
-			cy.wait(1000);
-		} else {
-			cy.log("Onboarding modal not found, skipping close.");
-		}
-	});
-});
--- a/docker/init.sh
+++ b/docker/init.sh
@@ -16,9 +16,9 @@ cd frappe-bench

 # Use containers instead of localhost
 bench set-mariadb-host mariadb
-bench set-redis-cache-host redis://redis:6379
-bench set-redis-queue-host redis://redis:6379
-bench set-redis-socketio-host redis://redis:6379
+bench set-redis-cache-host redis:6379
+bench set-redis-queue-host redis:6379
+bench set-redis-socketio-host redis:6379

 # Remove redis, watch from Procfile
 sed -i '/redis/d' ./Procfile
--- a/2
+++ b/2
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -16,7 +16,6 @@ declare module 'vue' {
    AssessmentPlugin: typeof import('./src/components/AssessmentPlugin.vue')['default']
    Assessments: typeof import('./src/components/Assessments.vue')['default']
    Assignment: typeof import('./src/components/Assignment.vue')['default']
-    AssignmentForm: typeof import('./src/components/Modals/AssignmentForm.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']
@@ -27,9 +26,9 @@ declare module 'vue' {
    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/Settings/BrandSettings.vue')['default']
+    BrandSettings: typeof import('./src/components/BrandSettings.vue')['default']
    BulkCertificates: typeof import('./src/components/Modals/BulkCertificates.vue')['default']
-    Categories: typeof import('./src/components/Settings/Categories.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']
@@ -47,14 +46,10 @@ declare module 'vue' {
    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']
-    EmailTemplateModal: typeof import('./src/components/Modals/EmailTemplateModal.vue')['default']
-    EmailTemplates: typeof import('./src/components/Settings/EmailTemplates.vue')['default']
-    EmptyState: typeof import('./src/components/EmptyState.vue')['default']
    EvaluationModal: typeof import('./src/components/Modals/EvaluationModal.vue')['default']
-    Evaluators: typeof import('./src/components/Settings/Evaluators.vue')['default']
+    Evaluators: typeof import('./src/components/Evaluators.vue')['default']
    Event: typeof import('./src/components/Modals/Event.vue')['default']
    ExplanationVideos: typeof import('./src/components/Modals/ExplanationVideos.vue')['default']
-    FeedbackModal: typeof import('./src/components/Modals/FeedbackModal.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']
@@ -65,30 +60,28 @@ declare module 'vue' {
    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']
-    LiveClassAttendance: typeof import('./src/components/Modals/LiveClassAttendance.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/Settings/Members.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']
    NoSidebarLayout: typeof import('./src/components/NoSidebarLayout.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/Settings/PaymentSettings.vue')['default']
-    Play: typeof import('./src/components/Icons/Play.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']
-    QuizInVideo: typeof import('./src/components/Modals/QuizInVideo.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/Settings/SettingDetails.vue')['default']
-    SettingFields: typeof import('./src/components/Settings/SettingFields.vue')['default']
-    Settings: typeof import('./src/components/Settings/Settings.vue')['default']
+    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']
@@ -99,7 +92,5 @@ declare module 'vue' {
    UserAvatar: typeof import('./src/components/UserAvatar.vue')['default']
    UserDropdown: typeof import('./src/components/UserDropdown.vue')['default']
    VideoBlock: typeof import('./src/components/VideoBlock.vue')['default']
-    ZoomAccountModal: typeof import('./src/components/Modals/ZoomAccountModal.vue')['default']
-    ZoomSettings: typeof import('./src/components/Settings/ZoomSettings.vue')['default']
  }
 }
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
 	<head>
 		<meta charset="UTF-8" />
-		<link rel="icon" href="{{ favicon }}" />
+		<link rel="icon" href="{{ favicon or '/assets/lms/frontend/favicon.png' }}" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>{{ title }}</title>
+		<title>Frappe Learning</title>
 		<meta name="title" content="{{ meta.title }}" />
 		<meta name="image" content="{{ meta.image }}" />
 		<meta name="description" content="{{ meta.description }}" />
@@ -23,10 +23,26 @@
 				<p>
 					{{ meta.description }}
 				</p>
+				<p>
+					The content here is just for seo purposes. The actual content will be loaded in a few seconds.
+				</p>
+				<p>
+					Seo checks if a page has more than 300 words. So, here are some more words to make it more than 300 words.
+					Page descriptions are the HTML meta tags that provide a brief summary of a web page.
+					Search engines use meta descriptions to help identify the page's topic - they don't use them to rank the page, but they do use them to determine whether or not to display the page in search results.
+					Meta descriptions are important because they're often the first thing people see when they're deciding which search result to click on.
+					They're also important because they can help improve your click-through rate (CTR) from search results.
+					A good meta description can entice people to click on your page instead of someone else's.
+				</p>
 				<a href="{{ meta.link }}">Know More</a>
 			</div>
 		</div>
+		<div id="modals"></div>
+		<div id="popovers"></div>
+
 		<script>
+			window.csrf_token = '{{ csrf_token }}'
+			window.setup_complete = '{{ setup_complete }}'
 			document.getElementById('seo-content').style.display = 'none';
 		</script>
 		<script type="module" src="/src/main.js"></script>
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -2,7 +2,6 @@
  "name": "frappe-ui-frontend",
  "private": true,
  "version": "0.0.0",
-  "type": "module",
  "scripts": {
    "dev": "vite",
    "serve": "vite preview",
@@ -27,12 +26,11 @@
    "codemirror-editor-vue3": "^2.8.0",
    "dayjs": "^1.11.6",
    "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.147",
+    "frappe-ui": "^0.1.122",
    "highlight.js": "^11.11.1",
    "lucide-vue-next": "^0.383.0",
    "markdown-it": "^14.0.0",
    "pinia": "^2.0.33",
-    "plyr": "^3.7.8",
    "socket.io-client": "^4.7.2",
    "tailwindcss": "3.4.15",
    "typescript": "^5.7.2",
--- a/frontend/postcss.config.js
+++ b/frontend/postcss.config.js
@@ -1,4 +1,4 @@
-export default {
+module.exports = {
 	plugins: {
 		tailwindcss: {},
 		autoprefixer: {},
--- a/frontend/public/learning.svg
+++ b/frontend/public/learning.svg
@@ -1,4 +0,0 @@
-<svg width="80" height="79" viewBox="0 0 80 79" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M57.1285 0.580383H22.8514C10.2309 0.580383 0 10.5649 0 22.8815V56.3332C0 68.6497 10.2309 78.6343 22.8514 78.6343H57.1285C69.749 78.6343 79.9799 68.6497 79.9799 56.3332V22.8815C79.9799 10.5649 69.749 0.580383 57.1285 0.580383Z" fill="#0E7159"/>
-<path d="M62.8434 23.6906L60.7869 23.1052C53.6744 21.0702 45.9048 22.4641 39.992 26.8128C35.8502 23.7742 30.7943 22.1854 25.7099 22.2133H17.1406V27.8163H25.7099C29.6232 27.8163 33.508 29.015 36.6787 31.3845L39.992 33.8377L43.3056 31.3845C47.2475 28.4575 52.3032 27.2588 57.1306 28.0393V50.647C51.1035 49.9223 44.9051 51.4834 39.992 55.0795C35.8502 52.0688 30.8515 50.4798 25.7671 50.4798C24.7959 50.4798 23.8247 50.5355 22.8535 50.647V35.0642H17.1406V57.0588H62.8434V23.7185V23.6906Z" fill="white"/>
-</svg>
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,30 +1,30 @@
 <template>
-	<FrappeUIProvider>
-		<Layout>
-			<router-view />
-		</Layout>
-		<Dialogs />
-	</FrappeUIProvider>
+	<Layout>
+		<router-view />
+	</Layout>
+	<Dialogs />
+	<Toasts />
 </template>
 <script setup>
-import { FrappeUIProvider } from 'frappe-ui'
+import { Toasts } from 'frappe-ui'
 import { Dialogs } from '@/utils/dialogs'
-import { computed, onUnmounted, ref, watch } from 'vue'
+import { computed, onMounted, onUnmounted, ref } from 'vue'
 import { useScreenSize } from './utils/composables'
 import DesktopLayout from './components/DesktopLayout.vue'
 import MobileLayout from './components/MobileLayout.vue'
 import NoSidebarLayout from './components/NoSidebarLayout.vue'
+import { stopSession } from '@/telemetry'
+import { init as initTelemetry } from '@/telemetry'
 import { usersStore } from '@/stores/user'
 import { useRouter } from 'vue-router'
-import { posthogSettings } from '@/telemetry'

 const screenSize = useScreenSize()
+let { userResource } = usersStore()
 const router = useRouter()
 const noSidebar = ref(false)
-const { userResource } = usersStore()

 router.beforeEach((to, from, next) => {
-	if (to.query.fromLesson || to.path === '/persona') {
+	if (to.query.fromLesson) {
 		noSidebar.value = true
 	} else {
 		noSidebar.value = false
@@ -38,18 +38,17 @@ const Layout = computed(() => {
 	}
 	if (screenSize.width < 640) {
 		return MobileLayout
+	} else {
+		return DesktopLayout
 	}
+})

-	return DesktopLayout
+onMounted(async () => {
+	if (userResource.data) await initTelemetry()
 })

 onUnmounted(() => {
 	noSidebar.value = false
-})
-
-watch(userResource, () => {
-	if (userResource.data) {
-		posthogSettings.reload()
-	}
+	stopSession()
 })
 </script>
--- a/frontend/src/components/AppSidebar.vue
+++ b/frontend/src/components/AppSidebar.vue
@@ -39,11 +39,7 @@
 							{{ __('More') }}
 						</span>
 					</div>
-					<Button
-						v-if="isModerator && !readOnlyMode"
-						variant="ghost"
-						@click="openPageModal()"
-					>
+					<Button v-if="isModerator" variant="ghost" @click="openPageModal()">
 						<template #icon>
 							<Plus class="h-4 w-4 text-ink-gray-7 stroke-1.5" />
 						</template>
@@ -67,16 +63,6 @@
 			</div>
 		</div>
 		<div class="m-2 flex flex-col gap-1">
-			<div
-				v-if="readOnlyMode && !sidebarStore.isSidebarCollapsed"
-				class="z-10 m-2 bg-surface-modal py-2.5 px-3 text-xs text-ink-gray-7 leading-5 rounded-md"
-			>
-				{{
-					__(
-						'This site is being updated. You will not be able to make any changes. Full access will be restored shortly.'
-					)
-				}}
-			</div>
 			<TrialBanner
 				v-if="
 					userResource.data?.is_system_manager && userResource.data?.is_fc_site
@@ -88,69 +74,43 @@
 				:isSidebarCollapsed="sidebarStore.isSidebarCollapsed"
 				appName="learning"
 			/>
-
-			<div
-				class="flex items-center mt-4"
-				:class="
-					sidebarStore.isSidebarCollapsed ? 'flex-col space-y-3' : 'flex-row'
+			<SidebarLink
+				v-if="isOnboardingStepsCompleted"
+				:link="{
+					label: __('Help'),
+				}"
+				:isCollapsed="sidebarStore.isSidebarCollapsed"
+				@click="
+					() => {
+						showHelpModal = minimize ? true : !showHelpModal
+						minimize = !showHelpModal
+					}
 				"
 			>
-				<div
-					class="flex items-center flex-1"
-					:class="
-						sidebarStore.isSidebarCollapsed
-							? 'flex-col space-y-3'
-							: 'flex-row space-x-3'
-					"
-				>
-					<Tooltip v-if="readOnlyMode && sidebarStore.isSidebarCollapsed">
-						<CircleAlert
-							class="size-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
+				<template #icon>
+					<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
+						<CircleHelp class="h-4 w-4 stroke-1.5" />
+					</span>
+				</template>
+			</SidebarLink>
+			<SidebarLink
+				:link="{
+					label: sidebarStore.isSidebarCollapsed ? 'Expand' : 'Collapse',
+				}"
+				:isCollapsed="sidebarStore.isSidebarCollapsed"
+				@click="toggleSidebar()"
+			>
+				<template #icon>
+					<span class="grid h-5 w-6 flex-shrink-0 place-items-center">
+						<CollapseSidebar
+							class="h-4 w-4 text-ink-gray-7 duration-300 ease-in-out"
+							:class="{
+								'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
+							}"
 						/>
-						<template #body>
-							<div
-								class="max-w-[30ch] rounded bg-surface-gray-7 px-2 py-1 text-center text-p-xs text-ink-white shadow-xl"
-							>
-								{{
-									__(
-										'This site is being updated. You will not be able to make any changes. Full access will be restored shortly.'
-									)
-								}}
-							</div>
-						</template>
-					</Tooltip>
-					<Tooltip :text="__('Powered by Learning')">
-						<Zap
-							class="size-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
-							@click="redirectToWebsite()"
-						/>
-					</Tooltip>
-					<Tooltip v-if="showOnboarding" :text="__('Help')">
-						<CircleHelp
-							class="size-4 stroke-1.5 text-ink-gray-7 cursor-pointer"
-							@click="
-								() => {
-									showHelpModal = minimize ? true : !showHelpModal
-									minimize = !showHelpModal
-								}
-							"
-						/>
-					</Tooltip>
-				</div>
-				<Tooltip
-					:text="
-						sidebarStore.isSidebarCollapsed ? __('Expand') : __('Collapse')
-					"
-				>
-					<CollapseSidebar
-						class="size-4 text-ink-gray-7 duration-300 stroke-1.5 ease-in-out cursor-pointer"
-						:class="{
-							'[transform:rotateY(180deg)]': sidebarStore.isSidebarCollapsed,
-						}"
-						@click="toggleSidebar()"
-					/>
-				</Tooltip>
-			</div>
+					</span>
+				</template>
+			</SidebarLink>
 		</div>
 		<HelpModal
 			v-if="showOnboarding && showHelpModal"
@@ -181,22 +141,14 @@
 import UserDropdown from '@/components/UserDropdown.vue'
 import CollapseSidebar from '@/components/Icons/CollapseSidebar.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
-import {
-	ref,
-	onMounted,
-	inject,
-	watch,
-	reactive,
-	markRaw,
-	h,
-	onUnmounted,
-} from 'vue'
+import { useStorage } from '@vueuse/core'
+import { ref, onMounted, inject, watch, reactive, markRaw, h } from 'vue'
 import { getSidebarLinks } from '../utils'
 import { usersStore } from '@/stores/user'
 import { sessionStore } from '@/stores/session'
 import { useSidebar } from '@/stores/sidebar'
 import { useSettings } from '@/stores/settings'
-import { Button, createResource, Tooltip } from 'frappe-ui'
+import { Button, createResource } from 'frappe-ui'
 import PageModal from '@/components/Modals/PageModal.vue'
 import { capture } from '@/telemetry'
 import LMSLogo from '@/components/Icons/LMSLogo.vue'
@@ -204,7 +156,6 @@ import { useRouter } from 'vue-router'
 import InviteIcon from './Icons/InviteIcon.vue'
 import {
 	BookOpen,
-	CircleAlert,
 	ChevronRight,
 	Plus,
 	CircleHelp,
@@ -213,7 +164,6 @@ import {
 	UserPlus,
 	Users,
 	BookText,
-	Zap,
 } from 'lucide-vue-next'
 import {
 	TrialBanner,
@@ -242,7 +192,6 @@ const currentStep = ref({})
 const router = useRouter()
 let onboardingDetails
 let isOnboardingStepsCompleted = false
-const readOnlyMode = window.read_only_mode
 const iconProps = {
 	strokeWidth: 1.5,
 	width: 16,
@@ -252,7 +201,6 @@ const iconProps = {
 onMounted(() => {
 	addNotifications()
 	setSidebarLinks()
-	setUpOnboarding()
 	socket.on('publish_lms_notifications', (data) => {
 		unreadNotifications.reload()
 	})
@@ -397,6 +345,10 @@ const deletePage = (link) => {
 	)
 }

+const getSidebarFromStorage = () => {
+	return useStorage('sidebar_is_collapsed', false)
+}
+
 const toggleSidebar = () => {
 	sidebarStore.isSidebarCollapsed = !sidebarStore.isSidebarCollapsed
 	localStorage.setItem(
@@ -443,7 +395,6 @@ const steps = reactive([
 		title: __('Add your first chapter'),
 		icon: markRaw(h(FolderTree, iconProps)),
 		completed: false,
-		dependsOn: 'create_first_course',
 		onClick: async () => {
 			minimize.value = true
 			let course = await getFirstCourse()
@@ -459,7 +410,6 @@ const steps = reactive([
 		title: __('Add your first lesson'),
 		icon: markRaw(h(FileText, iconProps)),
 		completed: false,
-		dependsOn: 'create_first_chapter',
 		onClick: async () => {
 			minimize.value = true
 			let course = await getFirstCourse()
@@ -478,7 +428,6 @@ const steps = reactive([
 		title: __('Create your first quiz'),
 		icon: markRaw(h(CircleHelp, iconProps)),
 		completed: false,
-		dependsOn: 'create_first_course',
 		onClick: () => {
 			minimize.value = true
 			router.push({ name: 'Quizzes' })
@@ -510,7 +459,6 @@ const steps = reactive([
 		title: __('Add students to your batch'),
 		icon: markRaw(h(UserPlus, iconProps)),
 		completed: false,
-		dependsOn: 'create_first_batch',
 		onClick: async () => {
 			minimize.value = true
 			let batch = await getFirstBatch()
@@ -531,7 +479,6 @@ const steps = reactive([
 		title: __('Add courses to your batch'),
 		icon: markRaw(h(BookText, iconProps)),
 		completed: false,
-		dependsOn: 'create_first_batch',
 		onClick: async () => {
 			minimize.value = true
 			let batch = await getFirstBatch()
@@ -631,12 +578,4 @@ watch(userResource, () => {
 		setUpOnboarding()
 	}
 })
-
-const redirectToWebsite = () => {
-	window.open('https://frappe.io/learning', '_blank')
-}
-
-onUnmounted(() => {
-	socket.off('publish_lms_notifications')
-})
 </script>
--- a/frontend/src/components/Apps.vue
+++ b/frontend/src/components/Apps.vue
@@ -3,7 +3,7 @@
 		<template #target="{ togglePopover }">
 			<button
 				:class="[
-					'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-ink-gray-7 hover:bg-surface-gray-2',
+					'group w-full flex h-7 items-center justify-between rounded px-2 text-base text-ink-gray-8 hover:bg-surface-gray-2',
 				]"
 				@click.prevent="togglePopover()"
 			>
--- a/frontend/src/components/Assessments.vue
+++ b/frontend/src/components/Assessments.vue
@@ -4,7 +4,7 @@
 			<div class="text-lg font-semibold text-ink-gray-9">
 				{{ __('Assessments') }}
 			</div>
-			<Button v-if="canAddAssessments()" @click="showModal = true">
+			<Button v-if="canSeeAddButton()" @click="showModal = true">
 				<template #prefix>
 					<Plus class="h-4 w-4" />
 				</template>
@@ -100,7 +100,6 @@ import { Plus, Trash2 } from 'lucide-vue-next'

 const user = inject('$user')
 const showModal = ref(false)
-const readOnlyMode = window.read_only_mode

 const props = defineProps({
 	batch: {
@@ -182,8 +181,7 @@ const getRowRoute = (row) => {
 	}
 }

-const canAddAssessments = () => {
-	if (readOnlyMode) return false
+const canSeeAddButton = () => {
 	return user.data?.is_moderator || user.data?.is_evaluator
 }

--- a/frontend/src/components/Assignment.vue
+++ b/frontend/src/components/Assignment.vue
@@ -191,11 +191,10 @@ import {
 	FileUploader,
 	FormControl,
 	TextEditor,
-	toast,
 } from 'frappe-ui'
 import { computed, inject, onMounted, onBeforeUnmount, ref, watch } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
-import { getFileSize } from '@/utils'
+import { showToast, getFileSize } from '@/utils'
 import { useRouter } from 'vue-router'

 const submissionFile = ref(null)
@@ -285,7 +284,7 @@ const submissionResource = createDocumentResource({
 	doctype: 'LMS Assignment Submission',
 	name: props.submissionName,
 	onError(err) {
-		toast.error(err.messages?.[0] || err)
+		showToast(__('Error'), __(err.messages?.[0] || err), 'x')
 	},
 	auto: false,
 	cache: [user.data?.name, props.assignmentID],
@@ -339,7 +338,7 @@ const submitAssignment = () => {
 			},
 			{
 				onSuccess(data) {
-					toast.success(__('Changes saved successfully'))
+					showToast(__('Success'), __('Changes saved successfully'), 'check')
 				},
 			}
 		)
@@ -353,7 +352,7 @@ const addNewSubmission = () => {
 		{},
 		{
 			onSuccess(data) {
-				toast.success(__('Assignment submitted successfully'))
+				showToast('Success', 'Assignment submitted successfully.', 'check')
 				if (router.currentRoute.value.name == 'AssignmentSubmission') {
 					router.push({
 						name: 'AssignmentSubmission',
@@ -371,7 +370,7 @@ const addNewSubmission = () => {
 				submissionResource.reload()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.messages?.[0] || err, 'x')
 			},
 		}
 	)
--- a/frontend/src/components/BatchCard.vue
+++ b/frontend/src/components/BatchCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<div
-		class="flex flex-col border hover:border-outline-gray-3 rounded-md p-4 h-full"
+		class="flex flex-col border-2 hover:bg-surface-gray-2 rounded-md p-4 h-full"
 		style="min-height: 150px"
 	>
 		<div class="text-lg leading-5 font-semibold mb-2 text-ink-gray-9">
--- a/frontend/src/components/BatchCourses.vue
+++ b/frontend/src/components/BatchCourses.vue
@@ -86,10 +86,9 @@ import {
 	ListRows,
 	ListView,
 	ListRowItem,
-	toast,
 } from 'frappe-ui'
 import { Plus, Trash2 } from 'lucide-vue-next'
-const readOnlyMode = window.read_only_mode
+import { showToast } from '@/utils'

 const showCourseModal = ref(false)
 const user = inject('$user')
@@ -106,6 +105,7 @@ const courses = createResource({
 	params: {
 		batch: props.batch,
 	},
+	cache: ['batchCourses', props.batchName],
 	auto: true,
 })

@@ -151,7 +151,7 @@ const removeCourses = (selections, unselectAll) => {
 		{
 			onSuccess(data) {
 				courses.reload()
-				toast.success(__('Courses deleted successfully'))
+				showToast(__('Success'), __('Courses deleted successfully'), 'check')
 				unselectAll()
 			},
 		}
@@ -159,9 +159,6 @@ const removeCourses = (selections, unselectAll) => {
 }

 const canSeeAddButton = () => {
-	if (readOnlyMode) {
-		return false
-	}
 	return user.data?.is_moderator || user.data?.is_evaluator
 }
 </script>
--- a/frontend/src/components/BatchFeedback.vue
+++ b/frontend/src/components/BatchFeedback.vue
@@ -1,49 +1,44 @@
 <template>
 	<div v-if="user.data?.is_student">
-		<div>
-			<div class="leading-5 mb-4">
-				<div v-if="readOnly">
-					{{ __('Thank you for providing your feedback.') }}
-					<span
-						@click="showFeedbackForm = !showFeedbackForm"
-						class="underline cursor-pointer"
-						>{{ __('Click here') }}</span
-					>
-					{{ __('to view your feedback.') }}
-				</div>
-				<div v-else>
-					{{ __('Help us improve by providing your feedback.') }}
-				</div>
+		<div
+			v-if="feedbackList.data?.length"
+			class="bg-surface-blue-2 text-blue-700 p-2 rounded-md mb-5"
+		>
+			{{ __('Thank you for providing your feedback!') }}
+		</div>
+		<div v-else class="flex justify-between items-center mb-5">
+			<div class="text-lg font-semibold">
+				{{ __('Help Us Improve') }}
 			</div>
-			<div class="space-y-4" :class="showFeedbackForm ? 'block' : 'hidden'">
-				<div class="space-y-4">
-					<Rating
-						v-for="key in ratingKeys"
-						v-model="feedback[key]"
-						:label="__(convertToTitleCase(key))"
-						:readonly="readOnly"
-					/>
-				</div>
-				<FormControl
-					v-model="feedback.feedback"
-					type="textarea"
-					:label="__('Feedback')"
-					:rows="9"
+			<Button @click="submitFeedback()">
+				{{ __('Submit') }}
+			</Button>
+		</div>
+		<div class="space-y-8">
+			<div class="flex items-center justify-between">
+				<Rating
+					v-for="key in ratingKeys"
+					v-model="feedback[key]"
+					:label="__(convertToTitleCase(key))"
 					:readonly="readOnly"
 				/>
-				<Button v-if="!readOnly" @click="submitFeedback">
-					{{ __('Submit Feedback') }}
-				</Button>
 			</div>
+			<FormControl
+				v-model="feedback.feedback"
+				type="textarea"
+				:label="__('Feedback')"
+				:rows="7"
+				:readonly="readOnly"
+			/>
 		</div>
 	</div>

 	<div v-else-if="feedbackList.data?.length">
-		<div class="leading-5 text-sm mb-2 mt-5">
-			{{ __('Average Feedback Received') }}
+		<div class="text-lg font-semibold mb-5">
+			{{ __('Average of Feedback Received') }}
 		</div>

-		<div class="space-y-4">
+		<div class="flex items-center justify-between mb-10">
 			<Rating
 				v-for="key in ratingKeys"
 				v-model="average[key]"
@@ -52,32 +47,82 @@
 			/>
 		</div>

-		<Button variant="outline" class="mt-5" @click="showAllFeedback = true">
-			{{ __('View all feedback') }}
-		</Button>
+		<div class="text-lg font-semibold mb-5">
+			{{ __('All Feedback') }}
+		</div>
+		<ListView
+			:columns="feedbackColumns"
+			:rows="feedbackList.data"
+			row-key="name"
+			:options="{
+				showTooltip: false,
+				rowHeight: 'h-16',
+				selectable: false,
+			}"
+		>
+			<ListHeader
+				class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
+			></ListHeader>
+			<ListRows>
+				<ListRow
+					:row="row"
+					v-for="row in feedbackList.data"
+					class="group cursor-pointer feedback-list"
+				>
+					<template #default="{ column, item }">
+						<ListRowItem
+							:item="row[column.key]"
+							:align="column.align"
+							class="text-sm"
+						>
+							<template #prefix>
+								<div v-if="column.key == 'member_name'">
+									<Avatar
+										class="flex"
+										:image="row['member_image']"
+										:label="item"
+										size="sm"
+									/>
+								</div>
+							</template>
+							<div v-if="ratingKeys.includes(column.key)">
+								<Rating v-model="row[column.key]" :readonly="true" />
+							</div>
+							<div v-else class="leading-5">
+								{{ row[column.key] }}
+							</div>
+						</ListRowItem>
+					</template>
+				</ListRow>
+			</ListRows>
+		</ListView>
 	</div>
-	<div v-else class="text-ink-gray-7 mt-5 leading-5">
+	<div v-else class="text-sm italic text-center text-ink-gray-7 mt-5">
 		{{ __('No feedback received yet.') }}
 	</div>
-	<FeedbackModal
-		v-if="feedbackList.data?.length"
-		v-model="showAllFeedback"
-		:feedbackList="feedbackList.data"
-	/>
 </template>
 <script setup>
-import { inject, onMounted, reactive, ref, watch } from 'vue'
+import { computed, inject, onMounted, reactive, ref, watch } from 'vue'
 import { convertToTitleCase } from '@/utils'
-import { Button, createListResource, FormControl, Rating } from 'frappe-ui'
-import FeedbackModal from '@/components/Modals/FeedbackModal.vue'
+import {
+	Avatar,
+	Button,
+	createListResource,
+	FormControl,
+	ListView,
+	ListHeader,
+	ListHeaderItem,
+	ListRows,
+	ListRow,
+	ListRowItem,
+	Rating,
+} from 'frappe-ui'

 const user = inject('$user')
 const ratingKeys = ['content', 'instructors', 'value']
 const readOnly = ref(false)
 const average = reactive({})
 const feedback = reactive({})
-const showFeedbackForm = ref(true)
-const showAllFeedback = ref(false)

 const props = defineProps({
 	batch: {
@@ -123,7 +168,6 @@ watch(
 		if (feedbackList.data.length) {
 			let data = feedbackList.data
 			readOnly.value = true
-			showFeedbackForm.value = false

 			ratingKeys.forEach((key) => {
 				average[key] = 0
@@ -158,11 +202,40 @@ const submitFeedback = () => {
 		{
 			onSuccess: () => {
 				feedbackList.reload()
-				showFeedbackForm.value = false
 			},
 		}
 	)
 }
+
+const feedbackColumns = computed(() => {
+	return [
+		{
+			label: 'Member',
+			key: 'member_name',
+			width: '10rem',
+		},
+		{
+			label: 'Feedback',
+			key: 'feedback',
+			width: '15rem',
+		},
+		{
+			label: 'Content',
+			key: 'content',
+			width: '9rem',
+		},
+		{
+			label: 'Instructors',
+			key: 'instructors',
+			width: '9rem',
+		},
+		{
+			label: 'Value',
+			key: 'value',
+			width: '9rem',
+		},
+	]
+})
 </script>
 <style>
 .feedback-list > button > div {
--- a/frontend/src/components/BatchOverlay.vue
+++ b/frontend/src/components/BatchOverlay.vue
@@ -2,12 +2,7 @@
 	<div v-if="batch.data" class="border-2 rounded-md p-5 lg:w-72">
 		<div
 			v-if="batch.data.seat_count && seats_left > 0"
-			class="text-sm bg-green-100 text-green-700 px-2 py-1 rounded-md"
-			:class="
-				batch.data.amount || batch.data.courses.length
-					? 'float-right'
-					: 'w-fit mb-4'
-			"
+			class="text-xs bg-green-100 text-green-700 float-right px-2 py-0.5 rounded-md"
 		>
 			{{ seats_left }}
 			<span v-if="seats_left > 1">
@@ -29,10 +24,7 @@
 		>
 			{{ formatNumberIntoCurrency(batch.data.amount, batch.data.currency) }}
 		</div>
-		<div
-			v-if="batch.data.courses.length"
-			class="flex items-center mb-3 text-ink-gray-7"
-		>
+		<div class="flex items-center mb-3 text-ink-gray-7">
 			<BookOpen class="h-4 w-4 stroke-1.5 mr-2" />
 			<span> {{ batch.data.courses.length }} {{ __('Courses') }} </span>
 		</div>
@@ -54,83 +46,81 @@
 				{{ batch.data.timezone }}
 			</span>
 		</div>
-		<div v-if="!readOnlyMode">
-			<router-link
-				v-if="isModerator || isStudent"
-				:to="{
-					name: 'Batch',
-					params: {
-						batchName: batch.data.name,
-					},
-				}"
-			>
-				<Button variant="solid" class="w-full mt-4">
-					<span>
-						{{ isModerator ? __('Manage Batch') : __('Visit Batch') }}
-					</span>
-				</Button>
-			</router-link>
-			<router-link
-				:to="{
-					name: 'Billing',
-					params: {
-						type: 'batch',
-						name: batch.data.name,
-					},
-				}"
-				v-else-if="
-					batch.data.paid_batch &&
-					batch.data.seats_left > 0 &&
-					batch.data.accept_enrollments
-				"
-			>
-				<Button v-if="!isStudent" class="w-full mt-4" variant="solid">
-					<span>
-						{{ __('Register Now') }}
-					</span>
-				</Button>
-			</router-link>
-			<Button
-				variant="solid"
-				class="w-full mt-2"
-				v-else-if="
-					batch.data.allow_self_enrollment &&
-					batch.data.seats_left &&
-					batch.data.accept_enrollments
-				"
-				@click="enrollInBatch()"
-			>
-				{{ __('Enroll Now') }}
+		<router-link
+			v-if="isModerator || isStudent"
+			:to="{
+				name: 'Batch',
+				params: {
+					batchName: batch.data.name,
+				},
+			}"
+		>
+			<Button variant="solid" class="w-full mt-4">
+				<span>
+					{{ isModerator ? __('Manage Batch') : __('Visit Batch') }}
+				</span>
 			</Button>
-			<router-link
-				v-if="isModerator"
-				:to="{
-					name: 'BatchForm',
-					params: {
-						batchName: batch.data.name,
-					},
-				}"
-			>
-				<Button class="w-full mt-2">
-					<span>
-						{{ __('Edit') }}
-					</span>
-				</Button>
-			</router-link>
-		</div>
+		</router-link>
+		<router-link
+			:to="{
+				name: 'Billing',
+				params: {
+					type: 'batch',
+					name: batch.data.name,
+				},
+			}"
+			v-else-if="
+				batch.data.paid_batch &&
+				batch.data.seats_left > 0 &&
+				batch.data.accept_enrollments
+			"
+		>
+			<Button v-if="!isStudent" class="w-full mt-4" variant="solid">
+				<span>
+					{{ __('Register Now') }}
+				</span>
+			</Button>
+		</router-link>
+		<Button
+			variant="solid"
+			class="w-full mt-2"
+			v-else-if="
+				batch.data.allow_self_enrollment &&
+				batch.data.seats_left &&
+				batch.data.accept_enrollments
+			"
+			@click="enrollInBatch()"
+		>
+			{{ __('Enroll Now') }}
+		</Button>
+		<router-link
+			v-if="isModerator"
+			:to="{
+				name: 'BatchForm',
+				params: {
+					batchName: batch.data.name,
+				},
+			}"
+		>
+			<Button class="w-full mt-2">
+				<span>
+					{{ __('Edit') }}
+				</span>
+			</Button>
+		</router-link>
 	</div>
 </template>
 <script setup>
 import { inject, computed } from 'vue'
-import { Badge, Button, createResource, toast } from 'frappe-ui'
+import { Badge, Button, createResource } from 'frappe-ui'
 import { BookOpen, Clock, Globe } from 'lucide-vue-next'
-import { formatNumberIntoCurrency, formatTime } from '@/utils'
+import { formatNumberIntoCurrency, formatTime, showToast } from '@/utils'
 import DateRange from '@/components/Common/DateRange.vue'
 import { useRouter } from 'vue-router'

 const router = useRouter()
 const user = inject('$user')
-const readOnlyMode = window.read_only_mode
+const dayjs = inject('$dayjs')

 const props = defineProps({
 	batch: {
@@ -156,7 +146,11 @@ const enrollInBatch = () => {
 		{},
 		{
 			onSuccess(data) {
-				toast.success(__('You have been enrolled in this batch'))
+				showToast(
+					__('Success'),
+					__('You have been enrolled in this batch'),
+					'check'
+				)
 				router.push({
 					name: 'Batch',
 					params: {
--- a/frontend/src/components/BatchStudents.vue
+++ b/frontend/src/components/BatchStudents.vue
@@ -1,64 +1,108 @@
 <template>
-	<div v-if="batch.data" class="">
+	<div class="">
 		<div class="w-full flex items-center justify-between pb-4">
 			<div class="font-medium text-ink-gray-7">
 				{{ __('Statistics') }}
 			</div>
 		</div>
 		<div class="grid grid-cols-4 gap-5 mb-8">
-			<NumberChart
-				class="border rounded-md"
-				:config="{ title: __('Students'), value: students.data?.length || 0 }"
-			/>
+			<div
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
+			>
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
+					<User class="w-5 h-5 stroke-1.5" />
+				</div>
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
+						{{ students.data?.length }}
+					</span>
+					<span class="">
+						{{ __('Students') }}
+					</span>
+				</div>
+			</div>

-			<NumberChart
-				class="border rounded-md"
-				:config="{
-					title: __('Certified'),
-					value: certificationCount.data || 0,
-				}"
-			/>
+			<div
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
+			>
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
+					<GraduationCap class="w-5 h-5 stroke-1.5" />
+				</div>
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
+						{{ certificationCount.data }}
+					</span>
+					<span class="">
+						{{ __('Certified') }}
+					</span>
+				</div>
+			</div>

-			<NumberChart
-				class="border rounded-md"
-				:config="{
-					title: __('Courses'),
-					value: batch.data.courses?.length || 0,
-				}"
-			/>
+			<div
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
+			>
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
+					<BookOpen class="w-5 h-5 stroke-1.5" />
+				</div>
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
+						{{ batch.courses?.length }}
+					</span>
+					<span>
+						{{ __('Courses') }}
+					</span>
+				</div>
+			</div>

-			<NumberChart
-				class="border rounded-md"
-				:config="{ title: __('Assessments'), value: assessmentCount || 0 }"
-			/>
+			<div
+				class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
+			>
+				<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
+					<ShieldCheck class="w-5 h-5 stroke-1.5" />
+				</div>
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
+						{{ assessmentCount }}
+					</span>
+					<span>
+						{{ __('Assessments') }}
+					</span>
+				</div>
+			</div>
+		</div>
+		<div v-if="showProgressChart" class="mb-8">
+			<div class="text-ink-gray-7 font-medium">
+				{{ __('Progress') }}
+			</div>
+			<ApexChart
+				:options="chartOptions"
+				:series="chartData"
+				type="bar"
+				:height="chartData[0].data.length * 30 + 100"
+			/>
+			<div
+				class="flex items-center justify-center text-sm text-ink-gray-7 space-x-4"
+			>
+				<div class="flex items-center space-x-2">
+					<div
+						class="w-3 h-3 rounded-sm"
+						:style="{ 'background-color': theme.colors.green[600] }"
+					></div>
+					<div>
+						{{ __('Courses') }}
+					</div>
+				</div>
+				<div class="flex items-center space-x-2">
+					<div
+						class="w-3 h-3 rounded-sm"
+						:style="{ 'background-color': theme.colors.blue[600] }"
+					></div>
+					<div>
+						{{ __('Assessments') }}
+					</div>
+				</div>
+			</div>
 		</div>
-
-		<AxisChart
-			v-if="showProgressChart"
-			:config="{
-				data: chartData,
-				title: __('Batch Summary'),
-				subtitle: __('Progress of students in courses and assessments'),
-				xAxis: {
-					key: 'task',
-					title: 'Tasks',
-					type: 'category',
-				},
-				yAxis: {
-					title: __('Number of Students'),
-					echartOptions: {
-						minInterval: 1,
-					},
-				},
-				swapXY: true,
-				series: [
-					{
-						name: 'value',
-						type: 'bar',
-					},
-				],
-			}"
-		/>
 	</div>

 	<div>
@@ -66,7 +110,7 @@
 			<div class="text-ink-gray-7 font-medium">
 				{{ __('Students') }}
 			</div>
-			<Button v-if="!readOnlyMode" @click="openStudentModal()">
+			<Button @click="openStudentModal()">
 				<template #prefix>
 					<Plus class="h-4 w-4" />
 				</template>
@@ -157,10 +201,9 @@
 	</div>

 	<StudentModal
-		:batch="props.batch.data.name"
+		:batch="props.batch.name"
 		v-model="showStudentModal"
 		v-model:reloadStudents="students"
-		v-model:batchModal="props.batch"
 	/>
 	<BatchStudentProgress
 		:student="selectedStudent"
@@ -170,7 +213,6 @@
 <script setup>
 import {
 	Avatar,
-	AxisChart,
 	Button,
 	createResource,
 	FeatherIcon,
@@ -181,8 +223,6 @@ import {
 	ListRows,
 	ListView,
 	ListRowItem,
-	NumberChart,
-	toast,
 } from 'frappe-ui'
 import {
 	BookOpen,
@@ -194,6 +234,7 @@ import {
 } from 'lucide-vue-next'
 import { ref, watch } from 'vue'
 import StudentModal from '@/components/Modals/StudentModal.vue'
+import { showToast } from '@/utils'
 import ProgressBar from '@/components/ProgressBar.vue'
 import BatchStudentProgress from '@/components/Modals/BatchStudentProgress.vue'
 import ApexChart from 'vue3-apexcharts'
@@ -203,9 +244,9 @@ const showStudentModal = ref(false)
 const showStudentProgressModal = ref(false)
 const selectedStudent = ref(null)
 const chartData = ref(null)
+const chartOptions = ref(null)
 const showProgressChart = ref(false)
 const assessmentCount = ref(0)
-const readOnlyMode = window.read_only_mode

 const props = defineProps({
 	batch: {
@@ -216,15 +257,15 @@ const props = defineProps({

 const students = createResource({
 	url: 'lms.lms.utils.get_batch_students',
+	cache: ['students', props.batch.name],
 	params: {
-		batch: props.batch?.data?.name,
+		batch: props.batch?.name,
 	},
 	auto: true,
 	onSuccess(data) {
 		chartData.value = getChartData()
 		showProgressChart.value =
-			data.length &&
-			(props.batch?.data?.courses?.length || assessmentCount.value)
+			data.length && (props.batch?.courses?.length || assessmentCount.value)
 	},
 })

@@ -281,8 +322,7 @@ const removeStudents = (selections, unselectAll) => {
 		{
 			onSuccess(data) {
 				students.reload()
-				props.batch.reload()
-				toast.success(__('Students deleted successfully'))
+				showToast(__('Success'), __('Students deleted successfully'), 'check')
 				unselectAll()
 			},
 		}
@@ -290,49 +330,96 @@ const removeStudents = (selections, unselectAll) => {
 }

 const getChartData = () => {
-	let tasks = []
-	let data = []
+	let categories = {}

-	students.data.forEach((row) => {
-		tasks = countAssessments(row, tasks)
-		tasks = countCourses(row, tasks)
+	if (!students.data?.length) return []
+
+	Object.keys(students.data[0].courses).forEach((course) => {
+		categories[course] = {
+			value: 0,
+			type: 'course',
+			label: course,
+		}
 	})

-	tasks.forEach((task) => {
-		data.push({
-			task: task.label,
-			value: task.value,
+	Object.keys(students.data?.[0].assessments).forEach((assessment) => {
+		categories[assessment] = {
+			value: 0,
+			type: 'assessment',
+			label: assessment,
+		}
+	})
+
+	students.data.forEach((student) => {
+		Object.keys(student.courses).forEach((course) => {
+			if (student.courses[course] === 100) {
+				categories[course].value += 1
+			}
+		})
+
+		Object.keys(student.assessments).forEach((assessment) => {
+			if (student.assessments[assessment].result === 'Pass') {
+				categories[assessment].value += 1
+			}
 		})
 	})
-	return data
+
+	chartOptions.value = getChartOptions(categories)
+	return [
+		{
+			name: __('Completed by Students'),
+			data: Object.values(categories).map((item) => item.value),
+		},
+	]
 }

-const countAssessments = (row, tasks) => {
-	Object.keys(row.assessments).forEach((assessment) => {
-		if (row.assessments[assessment].result === 'Pass') {
-			tasks.filter((task) => task.label === assessment).length
-				? tasks.filter((task) => task.label === assessment)[0].value++
-				: tasks.push({
-						value: 1,
-						label: assessment,
-				  })
-		}
-	})
-	return tasks
-}
+const getChartOptions = (categories) => {
+	const courseColor = theme.colors.green[700]
+	const assessmentColor = theme.colors.blue[700]
+	const maxY =
+		students.data?.length % 5
+			? students.data?.length + (5 - (students.data?.length % 5))
+			: students.data?.length

-const countCourses = (row, tasks) => {
-	Object.keys(row.courses).forEach((course) => {
-		if (row.courses[course] === 100) {
-			tasks.filter((task) => task.label === course).length
-				? tasks.filter((task) => task.label === course)[0].value++
-				: tasks.push({
-						value: 1,
-						label: course,
-				  })
-		}
-	})
-	return tasks
+	return {
+		chart: {
+			type: 'bar',
+			toolbar: {
+				show: false,
+			},
+		},
+		plotOptions: {
+			bar: {
+				distributed: true,
+				borderRadius: 3,
+				borderRadiusApplication: 'end',
+				horizontal: true,
+				barHeight: '40%',
+			},
+		},
+		colors: Object.values(categories).map((item) =>
+			item.type === 'course' ? courseColor : assessmentColor
+		),
+		xaxis: {
+			categories: Object.values(categories).map((item) => item.label),
+			labels: {
+				style: {
+					fontSize: '10px',
+				},
+				rotate: 0,
+				formatter: function (value) {
+					return value.length > 30 ? `${value.substring(0, 30)}...` : value
+				},
+			},
+		},
+		yaxis: {
+			max: maxY,
+			min: 0,
+			stepSize: 10,
+			tickAmount: maxY / 5,
+			/* reversed: true */
+		},
+	}
 }

 watch(students, () => {
@@ -346,9 +433,14 @@ const certificationCount = createResource({
 	params: {
 		doctype: 'LMS Certificate',
 		filters: {
-			batch_name: props.batch?.data?.name,
+			batch_name: props.batch.name,
 		},
 	},
 	auto: true,
 })
 </script>
+<style>
+.apexcharts-legend {
+	display: none !important;
+}
+</style>
--- a/frontend/src/components/Settings/BrandSettings.vue
+++ b/frontend/src/components/Settings/BrandSettings.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex flex-col justify-between h-full">
+	<div class="flex flex-col justify-between min-h-0">
 		<div>
 			<div class="flex items-center justify-between">
 				<div class="font-semibold mb-1 text-ink-gray-9">
@@ -18,17 +18,17 @@
 		</div>
 		<div class="overflow-y-auto">
 			<SettingFields :fields="fields" :data="data.data" />
-		</div>
-		<div class="flex flex-row-reverse mt-auto">
-			<Button variant="solid" :loading="saveSettings.loading" @click="update">
-				{{ __('Update') }}
-			</Button>
+			<div class="flex flex-row-reverse mt-auto">
+				<Button variant="solid" :loading="saveSettings.loading" @click="update">
+					{{ __('Update') }}
+				</Button>
+			</div>
 		</div>
 	</div>
 </template>
 <script setup>
 import { createResource, Button, Badge } from 'frappe-ui'
-import SettingFields from '@/components/Settings/SettingFields.vue'
+import SettingFields from '@/components/SettingFields.vue'
 import { watch, ref } from 'vue'

 const isDirty = ref(false)
--- a/frontend/src/components/Categories.vue
+++ b/frontend/src/components/Categories.vue
@@ -0,0 +1,130 @@
+<template>
+	<div class="flex flex-col min-h-0">
+		<div class="flex items-center justify-between">
+			<div class="text-xl font-semibold mb-5 text-ink-gray-9">
+				{{ label }}
+			</div>
+			<Button @click="() => showCategoryForm()">
+				<template #icon>
+					<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
+					<X v-else class="h-3 w-3 stroke-1.5" />
+				</template>
+			</Button>
+		</div>
+
+		<div
+			v-if="showForm"
+			class="flex items-center justify-between my-4 space-x-2"
+		>
+			<FormControl
+				ref="categoryInput"
+				v-model="category"
+				:placeholder="__('Category Name')"
+				class="flex-1"
+			/>
+			<Button @click="addCategory()" variant="subtle">
+				{{ __('Add') }}
+			</Button>
+		</div>
+
+		<div class="overflow-y-scroll">
+			<div class="text-base divide-y space-y-2">
+				<FormControl
+					:value="cat.category"
+					type="text"
+					v-for="cat in categories.data"
+					class=""
+					@change.stop="(e) => update(cat.name, e.target.value)"
+				/>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup>
+import {
+	Button,
+	FormControl,
+	createListResource,
+	createResource,
+	debounce,
+} from 'frappe-ui'
+import { Plus, X } from 'lucide-vue-next'
+import { ref } from 'vue'
+
+const showForm = ref(false)
+const category = ref(null)
+const categoryInput = ref(null)
+
+const props = defineProps({
+	label: {
+		type: String,
+		required: true,
+	},
+	description: {
+		type: String,
+		default: '',
+	},
+})
+
+const categories = createListResource({
+	doctype: 'LMS Category',
+	fields: ['name', 'category'],
+	auto: true,
+})
+
+const newCategory = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Category',
+				category: category.value,
+			},
+		}
+	},
+})
+
+const addCategory = () => {
+	newCategory.submit(
+		{},
+		{
+			onSuccess(data) {
+				categories.reload()
+				category.value = null
+			},
+		}
+	)
+}
+
+const showCategoryForm = () => {
+	showForm.value = !showForm.value
+	setTimeout(() => {
+		categoryInput.value.$el.querySelector('input').focus()
+	}, 0)
+}
+
+const updateCategory = createResource({
+	url: 'frappe.client.rename_doc',
+	makeParams(values) {
+		return {
+			doctype: 'LMS Category',
+			old_name: values.name,
+			new_name: values.category,
+		}
+	},
+})
+
+const update = (name, value) => {
+	updateCategory.submit(
+		{
+			name: name,
+			category: value,
+		},
+		{
+			onSuccess() {
+				categories.reload()
+			},
+		}
+	)
+}
+</script>
--- a/frontend/src/components/Controls/Autocomplete.vue
+++ b/frontend/src/components/Controls/Autocomplete.vue
@@ -28,7 +28,9 @@
 			</template>
 			<template #body="{ isOpen }">
 				<div v-show="isOpen">
-					<div class="mt-1 rounded-lg bg-surface-white py-1 text-base border-2">
+					<div
+						class="mt-1 rounded-lg bg-surface-white py-1 text-base shadow-2xl"
+					>
 						<div class="relative px-1.5 pt-0.5">
 							<ComboboxInput
 								ref="search"
@@ -47,7 +49,7 @@
 								class="absolute right-1.5 inline-flex h-7 w-7 items-center justify-center"
 								@click="selectedValue = null"
 							>
-								<X class="h-4 w-4 stroke-1.5 text-ink-gray-7" />
+								<X class="h-4 w-4 stroke-1.5" />
 							</button>
 						</div>
 						<ComboboxOptions
@@ -87,15 +89,12 @@
 											name="item-label"
 											v-bind="{ active, selected, option }"
 										>
-											<div class="flex flex-col space-y-1 text-ink-gray-8">
+											<div class="flex flex-col space-y-1">
 												<div>
 													{{ option.label }}
 												</div>
 												<div
-													v-if="
-														option.description &&
-														option.description != option.label
-													"
+													v-if="option.description"
 													class="text-xs text-ink-gray-7"
 													v-html="option.description"
 												></div>
--- a/frontend/src/components/Controls/CodeEditor.vue
+++ b/frontend/src/components/Controls/CodeEditor.vue
@@ -146,6 +146,7 @@ function resetEditor(value: string, resetHistory = false) {
 	value = getModelValue()
 	aceEditor?.setValue(value)
 	aceEditor?.clearSelection()
+	console.log(isDark.value)
 	aceEditor?.setTheme(isDark.value ? 'ace/theme/twilight' : 'ace/theme/chrome')
 	props.autofocus && aceEditor?.focus()
 	if (resetHistory) {
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -34,7 +34,7 @@
 					<Button
 						variant="ghost"
 						class="w-full !justify-start"
-						:label="__('Create New')"
+						label="Create New"
 						@click="attrs.onCreate(value, close)"
 					>
 						<template #prefix>
--- a/frontend/src/components/Controls/MultiSelect.vue
+++ b/frontend/src/components/Controls/MultiSelect.vue
@@ -4,92 +4,78 @@
 			{{ label }}
 			<span class="text-ink-red-3" v-if="required">*</span>
 		</label>
-		<div class="w-full">
-			<Combobox v-model="selectedValue" nullable>
-				<Popover class="w-full" v-model:show="showOptions">
-					<template #target="{ togglePopover }">
-						<ComboboxInput
-							ref="search"
-							class="search-input form-input w-full focus-visible:!ring-0"
-							type="text"
-							:value="query"
-							@change="
-								(e) => {
-									query = e.target.value
-									showOptions = true
-								}
-							"
-							autocomplete="off"
-							@focus="() => togglePopover()"
-							@keydown.delete.capture.stop="removeLastValue"
-						/>
-					</template>
-					<template #body="{ isOpen, close }">
-						<div v-show="isOpen">
-							<div
-								class="mt-1 rounded-lg bg-surface-white py-1 text-base border-2"
-							>
-								<ComboboxOptions
-									class="my-1 min-h-[6rem] max-h-[12rem] overflow-y-auto px-1.5"
-									static
-								>
-									<ComboboxOption
-										v-for="option in options"
-										:key="option.value"
-										:value="option"
-										v-slot="{ active }"
-									>
-										<li
-											:class="[
-												'flex cursor-pointer items-center rounded px-2 py-1 text-base',
-												{ 'bg-surface-gray-2': active },
-											]"
-										>
-											<div class="flex flex-col gap-1 p-1">
-												<div class="text-base font-medium text-ink-gray-8">
-													{{ option.description }}
-												</div>
-												<div class="text-sm text-ink-gray-5">
-													{{ option.value }}
-												</div>
-											</div>
-										</li>
-									</ComboboxOption>
-									<div class="h-10"></div>
-									<div
-										v-if="attrs.onCreate"
-										class="absolute bottom-2 left-1 w-[99%] pt-2 bg-white border-t"
-									>
-										<Button
-											variant="ghost"
-											class="w-full !justify-start"
-											:label="__('Create New')"
-											@click="attrs.onCreate(close)"
-										>
-											<template #prefix>
-												<Plus class="h-4 w-4 stroke-1.5" />
-											</template>
-										</Button>
-									</div>
-								</ComboboxOptions>
-							</div>
-						</div>
-					</template>
-				</Popover>
-			</Combobox>
-		</div>
-		<div v-if="values.length" class="grid grid-cols-2 gap-2 mt-1">
-			<div
+		<div class="grid grid-cols-3 gap-1">
+			<Button
+				ref="emails"
 				v-for="value in values"
-				class="flex items-center justify-between break-all bg-surface-gray-2 text-ink-gray-7 word-wrap p-2 rounded-md mr-2"
+				:key="value"
+				:label="value"
+				theme="gray"
+				variant="subtle"
+				class="rounded-md"
+				@keydown.delete.capture.stop="removeLastValue"
 			>
-				<span class="break-all">
-					{{ value }}
-				</span>
-				<X
-					class="size-4 stroke-1.5 cursor-pointer"
-					@click="removeValue(value)"
-				/>
+				<template #suffix>
+					<X @click="removeValue(value)" class="h-4 w-4 stroke-1.5" />
+				</template>
+			</Button>
+			<div class="">
+				<Combobox v-model="selectedValue" nullable>
+					<Popover class="w-full" v-model:show="showOptions">
+						<template #target="{ togglePopover }">
+							<ComboboxInput
+								ref="search"
+								class="search-input form-input w-full focus-visible:!ring-0"
+								type="text"
+								:value="query"
+								@change="
+									(e) => {
+										query = e.target.value
+										showOptions = true
+									}
+								"
+								autocomplete="off"
+								@focus="() => togglePopover()"
+								@keydown.delete.capture.stop="removeLastValue"
+							/>
+						</template>
+						<template #body="{ isOpen }">
+							<div v-show="isOpen">
+								<div
+									class="mt-1 rounded-lg bg-surface-white py-1 text-base shadow-2xl"
+								>
+									<ComboboxOptions
+										class="my-1 max-h-[12rem] overflow-y-auto px-1.5"
+										static
+									>
+										<ComboboxOption
+											v-for="option in options"
+											:key="option.value"
+											:value="option"
+											v-slot="{ active }"
+										>
+											<li
+												:class="[
+													'flex cursor-pointer items-center rounded px-2 py-1 text-base',
+													{ 'bg-surface-gray-2': active },
+												]"
+											>
+												<div class="flex flex-col gap-1 p-1">
+													<div class="text-base font-medium">
+														{{ option.description }}
+													</div>
+													<div class="text-sm text-ink-gray-5">
+														{{ option.value }}
+													</div>
+												</div>
+											</li>
+										</ComboboxOption>
+									</ComboboxOptions>
+								</div>
+							</div>
+						</template>
+					</Popover>
+				</Combobox>
 			</div>
 		</div>
 		<!-- <ErrorMessage class="mt-2 pl-2" v-if="error" :message="error" /> -->
@@ -104,9 +90,9 @@ import {
 	ComboboxOption,
 } from '@headlessui/vue'
 import { createResource, Popover, Button } from 'frappe-ui'
-import { ref, computed, nextTick, useAttrs } from 'vue'
+import { ref, computed, nextTick } from 'vue'
 import { watchDebounced } from '@vueuse/core'
-import { X, Plus } from 'lucide-vue-next'
+import { X } from 'lucide-vue-next'

 const props = defineProps({
 	label: {
@@ -138,7 +124,7 @@ const props = defineProps({
 })

 const values = defineModel()
-const attrs = useAttrs()
+
 const emails = ref([])
 const search = ref(null)
 const error = ref(null)
--- a/frontend/src/components/CourseCard.vue
+++ b/frontend/src/components/CourseCard.vue
@@ -9,20 +9,16 @@
 			:class="{ 'default-image': !course.image }"
 			:style="{ backgroundImage: 'url(\'' + encodeURI(course.image) + '\')' }"
 		>
-			<div class="flex items-center flex-wrap relative top-4 px-2 w-fit">
-				<Badge
-					v-if="course.featured"
-					variant="subtle"
-					theme="green"
-					size="md"
-					class="mb-1 mr-1"
-				>
+			<div
+				class="flex items-center flex-wrap space-x-1 relative top-4 px-2 w-fit"
+			>
+				<Badge v-if="course.featured" variant="subtle" theme="green" size="md">
 					{{ __('Featured') }}
 				</Badge>
 				<div
 					v-if="course.tags"
 					v-for="tag in course.tags?.split(', ')"
-					class="text-xs bg-white text-gray-800 px-2 py-0.5 rounded-md mb-1 mr-1"
+					class="text-xs bg-white text-gray-800 px-2 py-0.5 rounded-md"
 				>
 					{{ tag }}
 				</div>
--- a/frontend/src/components/CourseCardOverlay.vue
+++ b/frontend/src/components/CourseCardOverlay.vue
@@ -9,94 +9,88 @@
 			<div v-if="course.data.paid_course" class="text-2xl font-semibold mb-3">
 				{{ course.data.price }}
 			</div>
-			<div v-if="!readOnlyMode">
-				<div v-if="course.data.membership" class="space-y-2">
-					<router-link
-						:to="{
-							name: 'Lesson',
-							params: {
-								courseName: course.name,
-								chapterNumber: course.data.current_lesson
-									? course.data.current_lesson.split('-')[0]
-									: 1,
-								lessonNumber: course.data.current_lesson
-									? course.data.current_lesson.split('-')[1]
-									: 1,
-							},
-						}"
-					>
-						<Button variant="solid" size="md" class="w-full">
-							<span>
-								{{ __('Continue Learning') }}
-							</span>
-						</Button>
-					</router-link>
-					<CertificationLinks :courseName="course.data.name" class="w-full" />
-				</div>
+			<div v-if="course.data.membership" class="space-y-2">
 				<router-link
-					v-else-if="course.data.paid_course"
 					:to="{
-						name: 'Billing',
+						name: 'Lesson',
 						params: {
-							type: 'course',
-							name: course.data.name,
+							courseName: course.name,
+							chapterNumber: course.data.current_lesson
+								? course.data.current_lesson.split('-')[0]
+								: 1,
+							lessonNumber: course.data.current_lesson
+								? course.data.current_lesson.split('-')[1]
+								: 1,
 						},
 					}"
 				>
 					<Button variant="solid" size="md" class="w-full">
 						<span>
-							{{ __('Buy this course') }}
+							{{ __('Continue Learning') }}
 						</span>
 					</Button>
 				</router-link>
-				<Badge
-					v-else-if="course.data.disable_self_learning"
-					theme="blue"
-					size="lg"
-				>
-					{{ __('Contact the Administrator to enroll for this course.') }}
-				</Badge>
-				<Button
-					v-else
-					@click="enrollStudent()"
-					variant="solid"
-					class="w-full"
-					size="md"
-				>
+				<CertificationLinks :courseName="course.data.name" class="w-full" />
+			</div>
+			<router-link
+				v-else-if="course.data.paid_course"
+				:to="{
+					name: 'Billing',
+					params: {
+						type: 'course',
+						name: course.data.name,
+					},
+				}"
+			>
+				<Button variant="solid" size="md" class="w-full">
 					<span>
-						{{ __('Start Learning') }}
+						{{ __('Buy this course') }}
 					</span>
 				</Button>
-				<Button
-					v-if="canGetCertificate"
-					@click="fetchCertificate()"
-					variant="subtle"
-					class="w-full mt-2"
-					size="md"
-				>
-					{{ __('Get Certificate') }}
-				</Button>
-				<router-link
-					v-if="user?.data?.is_moderator || is_instructor()"
-					:to="{
-						name: 'CourseForm',
-						params: {
-							courseName: course.data.name,
-						},
-					}"
-				>
-					<Button variant="subtle" class="w-full mt-2" size="md">
-						<span>
-							{{ __('Edit') }}
-						</span>
-					</Button>
-				</router-link>
+			</router-link>
+			<div
+				v-else-if="course.data.disable_self_learning"
+				class="bg-surface-blue-2 text-blue-900 text-sm rounded-md py-1 px-3"
+			>
+				{{ __('Contact the Administrator to enroll for this course.') }}
 			</div>
+			<Button
+				v-else
+				@click="enrollStudent()"
+				variant="solid"
+				class="w-full"
+				size="md"
+			>
+				<span>
+					{{ __('Start Learning') }}
+				</span>
+			</Button>
+			<Button
+				v-if="canGetCertificate"
+				@click="fetchCertificate()"
+				variant="subtle"
+				class="w-full mt-2"
+				size="md"
+			>
+				{{ __('Get Certificate') }}
+			</Button>
+			<router-link
+				v-if="user?.data?.is_moderator || is_instructor()"
+				:to="{
+					name: 'CourseForm',
+					params: {
+						courseName: course.data.name,
+					},
+				}"
+			>
+				<Button variant="subtle" class="w-full mt-2" size="md">
+					<span>
+						{{ __('Edit') }}
+					</span>
+				</Button>
+			</router-link>
 			<div class="space-y-4">
-				<div
-					class="font-medium text-ink-gray-9"
-					:class="{ 'mt-8': !readOnlyMode }"
-				>
+				<div class="mt-8 font-medium text-ink-gray-9">
 					{{ __('This course has:') }}
 				</div>
 				<div class="flex items-center text-ink-gray-9">
@@ -116,7 +110,7 @@
 					v-if="parseInt(course.data.rating) > 0"
 					class="flex items-center text-ink-gray-9"
 				>
-					<Star class="size-4 stroke-1.5 fill-yellow-500 text-transparent" />
+					<Star class="h-4 w-4 stroke-1.5 fill-orange-500 text-gray-50" />
 					<span class="ml-2">
 						{{ course.data.rating }} {{ __('Rating') }}
 					</span>
@@ -146,15 +140,14 @@
 <script setup>
 import { BookOpen, Users, Star, GraduationCap } from 'lucide-vue-next'
 import { computed, inject } from 'vue'
-import { Badge, Button, call, createResource, toast } from 'frappe-ui'
-import { formatAmount } from '@/utils/'
+import { Button, createResource, Tooltip } from 'frappe-ui'
+import { showToast, formatAmount } from '@/utils/'
 import { capture } from '@/telemetry'
 import { useRouter } from 'vue-router'
 import CertificationLinks from '@/components/CertificationLinks.vue'

 const router = useRouter()
 const user = inject('$user')
-const readOnlyMode = window.read_only_mode

 const props = defineProps({
 	course: {
@@ -172,19 +165,31 @@ const video_link = computed(() => {

 function enrollStudent() {
 	if (!user.data) {
-		toast.success(__('You need to login first to enroll for this course'))
+		showToast(
+			__('Please Login'),
+			__('You need to login first to enroll for this course'),
+			'alert-circle'
+		)
 		setTimeout(() => {
 			window.location.href = `/login?redirect-to=${window.location.pathname}`
-		}, 500)
+		}, 2000)
 	} else {
-		call('lms.lms.doctype.lms_enrollment.lms_enrollment.create_membership', {
-			course: props.course.data.name,
+		const enrollStudentResource = createResource({
+			url: 'lms.lms.doctype.lms_enrollment.lms_enrollment.create_membership',
 		})
+		enrollStudentResource
+			.submit({
+				course: props.course.data.name,
+			})
 			.then(() => {
 				capture('enrolled_in_course', {
 					course: props.course.data.name,
 				})
-				toast.success(__('You have been enrolled in this course'))
+				showToast(
+					__('Success'),
+					__('You have been enrolled in this course'),
+					'check'
+				)
 				setTimeout(() => {
 					router.push({
 						name: 'Lesson',
@@ -194,11 +199,7 @@ function enrollStudent() {
 							lessonNumber: 1,
 						},
 					})
-				}, 1000)
-			})
-			.catch((err) => {
-				toast.warning(__(err.messages?.[0] || err))
-				console.error(err)
+				}, 2000)
 			})
 	}
 }
--- a/frontend/src/components/CourseOutline.vue
+++ b/frontend/src/components/CourseOutline.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="">
+	<div class="h-full">
 		<div
 			v-if="title && (outline.data?.length || allowEdit)"
 			class="flex items-center justify-between space-x-2 mb-4 px-2"
@@ -17,6 +17,9 @@
 			<Button size="sm" v-if="allowEdit" @click="openChapterModal()">
 				{{ __('Add Chapter') }}
 			</Button>
+			<!-- <span class="font-medium cursor-pointer" @click="expandAllChapters()">
+				{{ expandAll ? __("Collapse all chapters") : __("Expand all chapters") }}
+			</span> -->
 		</div>
 		<div
 			:class="{
@@ -139,7 +142,6 @@
 		</div>
 	</div>
 	<ChapterModal
-		v-if="user.data"
 		v-model="showChapterModal"
 		v-model:outline="outline"
 		:course="courseName"
@@ -147,7 +149,7 @@
 	/>
 </template>
 <script setup>
-import { Button, createResource, Tooltip, toast } from 'frappe-ui'
+import { Button, createResource, Tooltip } from 'frappe-ui'
 import { getCurrentInstance, inject, ref } from 'vue'
 import Draggable from 'vuedraggable'
 import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue'
@@ -162,6 +164,7 @@ import {
 } from 'lucide-vue-next'
 import { useRoute, useRouter } from 'vue-router'
 import ChapterModal from '@/components/Modals/ChapterModal.vue'
+import { showToast } from '@/utils'

 const route = useRoute()
 const router = useRouter()
@@ -214,7 +217,7 @@ const deleteLesson = createResource({
 	},
 	onSuccess() {
 		outline.reload()
-		toast.success(__('Lesson deleted successfully'))
+		showToast('Success', 'Lesson deleted successfully', 'check')
 	},
 })

@@ -229,7 +232,7 @@ const updateLessonIndex = createResource({
 		}
 	},
 	onSuccess() {
-		toast.success(__('Lesson moved successfully'))
+		showToast('Success', 'Lesson moved successfully', 'check')
 	},
 })

@@ -287,7 +290,7 @@ const deleteChapter = createResource({
 	},
 	onSuccess() {
 		outline.reload()
-		toast.success(__('Chapter deleted successfully'))
+		showToast('Success', 'Chapter deleted successfully', 'check')
 	},
 })

@@ -316,7 +319,11 @@ const redirectToChapter = (chapter) => {
 	event.preventDefault()
 	if (props.allowEdit) return
 	if (!user.data) {
-		toast.success(__('Please enroll for this course to view this lesson'))
+		showToast(
+			__('You are not enrolled'),
+			__('Please enroll for this course to view this lesson'),
+			'alert-circle'
+		)
 		return
 	}

--- a/frontend/src/components/CourseReviews.vue
+++ b/frontend/src/components/CourseReviews.vue
@@ -35,14 +35,14 @@
 						<span class="text-ink-gray-7">
 							{{ review.creation }}
 						</span>
-						<div class="flex mt-2 space-x-1">
+						<div class="flex mt-2">
 							<Star
 								v-for="index in 5"
-								class="size-4 text-transparent rounded-sm"
+								class="h-5 w-5 text-ink-gray-1 rounded-sm mr-2"
 								:class="
 									index <= Math.ceil(review.rating)
-										? 'fill-yellow-500'
-										: 'fill-gray-300'
+										? 'fill-orange-500'
+										: 'fill-gray-600'
 								"
 							/>
 						</div>
--- a/frontend/src/components/DiscussionReplies.vue
+++ b/frontend/src/components/DiscussionReplies.vue
@@ -27,9 +27,7 @@
 						</span>
 					</div>
 					<Dropdown
-						v-if="
-							user.data.name == reply.owner && !reply.editable && !readOnlyMode
-						"
+						v-if="user.data.name == reply.owner && !reply.editable"
 						:options="[
 							{
 								label: 'Edit',
@@ -73,7 +71,7 @@
 		</div>

 		<TextEditor
-			v-if="renderEditor && !readOnlyMode"
+			v-if="renderEditor"
 			class="mt-5"
 			:content="newReply"
 			:mentions="mentionUsers"
@@ -82,7 +80,7 @@
 			:fixedMenu="true"
 			editorClass="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none border border-outline-gray-2 rounded-b-md min-h-[7rem] py-1 px-2"
 		/>
-		<div v-if="!readOnlyMode" class="flex justify-between mt-2">
+		<div class="flex justify-between mt-2">
 			<span> </span>
 			<Button @click="postReply()">
 				<span>
@@ -93,11 +91,12 @@
 	</div>
 </template>
 <script setup>
-import { createResource, TextEditor, Button, Dropdown, toast } from 'frappe-ui'
+import { createResource, TextEditor, Button, Dropdown } from 'frappe-ui'
 import { timeAgo } from '../utils'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { ChevronLeft, MoreHorizontal } from 'lucide-vue-next'
-import { ref, inject, onMounted, onUnmounted } from 'vue'
+import { ref, inject, onMounted } from 'vue'
+import { createToast } from '../utils'

 const showTopics = defineModel('showTopics')
 const newReply = ref('')
@@ -106,7 +105,6 @@ const user = inject('$user')
 const allUsers = inject('$allUsers')
 const mentionUsers = ref([])
 const renderEditor = ref(false)
-const readOnlyMode = window.read_only_mode

 const props = defineProps({
 	topic: {
@@ -191,7 +189,14 @@ const postReply = () => {
 				replies.reload()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				createToast({
+					title: 'Error',
+					text: err.messages?.[0] || err,
+					icon: 'x',
+					iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
+					position: 'top-center',
+					timeout: 10,
+				})
 			},
 		}
 	)
@@ -251,10 +256,4 @@ const deleteReply = (reply) => {
 		}
 	)
 }
-
-onUnmounted(() => {
-	socket.off('publish_message')
-	socket.off('update_message')
-	socket.off('delete_message')
-})
 </script>
--- a/frontend/src/components/Discussions.vue
+++ b/frontend/src/components/Discussions.vue
@@ -1,10 +1,6 @@
 <template>
 	<div>
-		<Button
-			v-if="!singleThread && !readOnlyMode"
-			class="float-right"
-			@click="openTopicModal()"
-		>
+		<Button v-if="!singleThread" class="float-right" @click="openTopicModal()">
 			{{ __('New {0}').format(singularize(title)) }}
 		</Button>
 		<div class="text-xl font-semibold text-ink-gray-9">
@@ -70,7 +66,7 @@
 import { createResource, Button } from 'frappe-ui'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { singularize, timeAgo } from '../utils'
-import { ref, onMounted, inject, onUnmounted } from 'vue'
+import { ref, onMounted, inject } from 'vue'
 import DiscussionReplies from '@/components/DiscussionReplies.vue'
 import DiscussionModal from '@/components/Modals/DiscussionModal.vue'
 import { MessageSquareText } from 'lucide-vue-next'
@@ -81,7 +77,6 @@ const currentTopic = ref(null)
 const socket = inject('$socket')
 const user = inject('$user')
 const showTopicModal = ref(false)
-const readOnlyMode = window.read_only_mode

 const props = defineProps({
 	title: {
@@ -153,8 +148,4 @@ const showReplies = (topic) => {
 const openTopicModal = () => {
 	showTopicModal.value = true
 }
-
-onUnmounted(() => {
-	socket.off('new_discussion_topic')
-})
 </script>
--- a/frontend/src/components/EmptyState.vue
+++ b/frontend/src/components/EmptyState.vue
@@ -1,24 +0,0 @@
-<template>
-	<div class="flex flex-col items-center justify-center mt-60">
-		<GraduationCap class="size-10 mx-auto stroke-1 text-ink-gray-5" />
-		<div class="text-lg font-semibold text-ink-gray-7 mb-2.5">
-			{{ __('No {0}').format(type?.toLowerCase()) }}
-		</div>
-		<div
-			class="leading-5 text-base w-2/5 text-base text-center text-ink-gray-7"
-		>
-			{{
-				__(
-					'There are no {0} currently. Keep an eye out, fresh learning experiences are on the way!'
-				).format(type?.toLowerCase())
-			}}
-		</div>
-	</div>
-</template>
-<script setup lang="ts">
-import { BookOpen, GraduationCap } from 'lucide-vue-next'
-
-const props = defineProps({
-	type: String,
-})
-</script>
--- a/frontend/src/components/Settings/Evaluators.vue
+++ b/frontend/src/components/Settings/Evaluators.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="flex min-h-0 flex-col text-base">
+	<div>
 		<div class="flex items-center justify-between mb-4">
 			<div>
 				<div class="text-xl font-semibold mb-1 text-ink-gray-9">
@@ -17,11 +17,10 @@
 					:debounce="300"
 				/>
 				<Button @click="() => (showForm = !showForm)">
-					<template #prefix>
-						<Plus v-if="!showForm" class="size-4 stroke-1.5" />
-						<X v-else class="size-4 stroke-1.5" />
+					<template #icon>
+						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
+						<X v-else class="h-3 w-3 stroke-1.5" />
 					</template>
-					{{ showForm ? __('Close') : __('New') }}
 				</Button>
 			</div>
 		</div>
@@ -33,34 +32,31 @@
 				:placeholder="__('Email')"
 				type="email"
 				class="w-full"
-				@keydown.enter="addEvaluator"
 			/>
 			<Button @click="addEvaluator()" variant="subtle">
 				{{ __('Add') }}
 			</Button>
 		</div>

-		<div class="overflow-y-scroll">
-			<div class="divide-y">
-				<div
-					v-for="evaluator in evaluators.data"
-					@click="openProfile(evaluator.username)"
-					class="cursor-pointer"
-				>
-					<div class="flex items-center justify-between py-3">
-						<div class="flex items-center space-x-3">
-							<Avatar
-								:image="evaluator.user_image"
-								:label="evaluator.full_name"
-								size="lg"
-							/>
-							<div>
-								<div class="text-base font-semibold text-ink-gray-9">
-									{{ evaluator.full_name }}
-								</div>
-								<div class="text-xs text-ink-gray-5">
-									{{ evaluator.evaluator }}
-								</div>
+		<div class="divide-y">
+			<div
+				v-for="evaluator in evaluators.data"
+				@click="openProfile(evaluator.username)"
+				class="cursor-pointer"
+			>
+				<div class="flex items-center justify-between py-3">
+					<div class="flex items-center space-x-3">
+						<Avatar
+							:image="evaluator.user_image"
+							:label="evaluator.full_name"
+							size="lg"
+						/>
+						<div>
+							<div class="text-base font-semibold text-ink-gray-9">
+								{{ evaluator.full_name }}
+							</div>
+							<div class="text-xs text-ink-gray-5">
+								{{ evaluator.evaluator }}
 							</div>
 						</div>
 					</div>
@@ -101,7 +97,7 @@ const evaluators = createResource({
 		return {
 			doctype: 'Course Evaluator',
 			fields: ['evaluator', 'full_name', 'user_image', 'username'],
-			filters: search.value ? { evaluator: ['like', `%${search.value}%`] } : {},
+			filters: search.value ? [['evaluator', 'like', search.value]] : [],
 		}
 	},
 	auto: true,
--- a/frontend/src/components/Icons/LMSLogo.vue
+++ b/frontend/src/components/Icons/LMSLogo.vue
@@ -1,18 +1,36 @@
 <template>
 	<svg
-		width="80"
-		height="79"
-		viewBox="0 0 80 79"
+		width="118"
+		height="118"
+		viewBox="0 0 118 118"
 		fill="none"
 		xmlns="http://www.w3.org/2000/svg"
 	>
 		<path
-			d="M57.1285 0.580383H22.8514C10.2309 0.580383 0 10.5649 0 22.8815V56.3332C0 68.6497 10.2309 78.6343 22.8514 78.6343H57.1285C69.749 78.6343 79.9799 68.6497 79.9799 56.3332V22.8815C79.9799 10.5649 69.749 0.580383 57.1285 0.580383Z"
-			fill="#0E7159"
+			d="M93.9278 0H23.1013C10.3428 0 0 10.3428 0 23.1013V93.9278C0 106.686 10.3428 117.029 23.1013 117.029H93.9278C106.686 117.029 117.029 106.686 117.029 93.9278V23.1013C117.029 10.3428 106.686 0 93.9278 0Z"
+			fill="url(#paint0_radial_174_336)"
 		/>
 		<path
-			d="M62.8434 23.6906L60.7869 23.1052C53.6744 21.0702 45.9048 22.4641 39.992 26.8128C35.8502 23.7742 30.7943 22.1854 25.7099 22.2133H17.1406V27.8163H25.7099C29.6232 27.8163 33.508 29.015 36.6787 31.3845L39.992 33.8377L43.3056 31.3845C47.2475 28.4575 52.3032 27.2588 57.1306 28.0393V50.647C51.1035 49.9223 44.9051 51.4834 39.992 55.0795C35.8502 52.0688 30.8515 50.4798 25.7671 50.4798C24.7959 50.4798 23.8247 50.5355 22.8535 50.647V35.0642H17.1406V57.0588H62.8434V23.7185V23.6906Z"
-			fill="white"
+			d="M93.9278 0H23.1013C10.3428 0 0 10.3428 0 23.1013V93.9278C0 106.686 10.3428 117.029 23.1013 117.029H93.9278C106.686 117.029 117.029 106.686 117.029 93.9278V23.1013C117.029 10.3428 106.686 0 93.9278 0Z"
+			fill="#0B3D3D"
+			fill-opacity="0.8"
 		/>
+		<path
+			d="M95.1879 33.1294L91.4077 32.0268C80.1721 28.7716 67.9389 30.9242 58.5409 37.7496C52.083 33.0769 43.9975 30.5042 36.1746 30.5042H21.8938V41.0048H36.2796C42.2649 41.0048 48.1978 42.9999 52.923 46.6226L58.5934 50.9279L64.2637 46.6226C70.144 42.1599 77.5469 40.2698 84.7923 41.2673V76.1818C75.5518 75.2367 66.2063 77.7044 58.6459 83.2172C51.0854 77.7044 41.6349 75.2367 32.4994 76.1818V52.8705H21.9988V86.4724H95.3454V33.1294H95.1879Z"
+			fill="#58FF9B"
+		/>
+		<defs>
+			<radialGradient
+				id="paint0_radial_174_336"
+				cx="0"
+				cy="0"
+				r="1"
+				gradientUnits="userSpaceOnUse"
+				gradientTransform="translate(117.24 -101.5) rotate(105.042) scale(226.282)"
+			>
+				<stop offset="0.445162" stop-color="#1F7676" />
+				<stop offset="1" stop-color="#0A4B4B" />
+			</radialGradient>
+		</defs>
 	</svg>
 </template>
--- a/frontend/src/components/Icons/Play.vue
+++ b/frontend/src/components/Icons/Play.vue
@@ -1,16 +0,0 @@
-<template>
-	<svg
-		width="20"
-		height="20"
-		viewBox="0 0 68 75"
-		fill="none"
-		xmlns="http://www.w3.org/2000/svg"
-	>
-		<path
-			fill-rule="evenodd"
-			clip-rule="evenodd"
-			d="M0 6.78182C0 1.60212 5.5742 -1.65958 10.09 0.879521L64.09 31.2545C68.6916 33.8443 68.6916 40.4693 64.09 43.0595L10.09 73.4345C5.5744 75.9736 0 72.7119 0 67.5322V6.78182ZM26.2695 38.5201C26.2695 37.3248 25.2265 37.9342 26.2695 38.5201C27.332 39.1178 27.332 37.9225 26.2695 38.5201Z"
-			fill="white"
-		/>
-	</svg>
-</template>
--- a/frontend/src/components/JobCard.vue
+++ b/frontend/src/components/JobCard.vue
@@ -1,52 +1,41 @@
 <template>
-	<div
-		class="flex flex-col border rounded-md p-3 h-full hover:border-outline-gray-3"
-	>
-		<div class="flex space-x-4 mb-4">
-			<div class="flex flex-col space-y-2 flex-1">
-				<div class="text-lg font-semibold text-ink-gray-9">
-					{{ job.company_name }}
-				</div>
-				<span class="font-medium text-ink-gray-7 leading-5">
+	<div class="flex space-x-4 border rounded-md p-2">
+		<img :src="job.company_logo" class="size-10 rounded-full object-contain" />
+		<div class="flex flex-col space-y-2 flex-1">
+			<div class="flex items-center justify-between">
+				<span class="font-semibold text-ink-gray-9">
 					{{ job.job_title }}
 				</span>
-				<div class="flex items-center space-x-1 text-sm text-ink-gray-7">
-					<MapPin class="size-3" />
-					<span>
-						{{ job.location }}{{ job.country ? `, ${job.country}` : '' }}
-					</span>
-				</div>
-				<div
-					v-if="job.applicants"
-					class="flex items-center space-x-1 text-sm text-ink-gray-7"
-				>
-					<User class="size-3" />
-					<span>
-						{{ job.applicants }}
-						{{ job.applicants > 1 ? __('applicants') : __('applicant') }}
-					</span>
-				</div>
 			</div>
-			<!-- <img :src="job.company_logo" alt="Company Logo" class="size-8  rounded-full object-contain  bg-white" /> -->
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<Building2 class="w-4 h-4 stroke-1.5" />
+				<span>
+					{{ job.company_name }}
+				</span>
+			</div>
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<MapPin class="w-4 h-4 stroke-1.5" />
+				<span>
+					{{ job.location }}
+				</span>
+			</div>
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<Shapes class="w-4 h-4 stroke-1.5" />
+				<span>
+					{{ job.type }}
+				</span>
+			</div>
+			<div class="flex items-center space-x-2 text-ink-gray-5">
+				<Calendar class="w-4 h-4 stroke-1.5" />
+				<span> {{ __('posted') }} {{ dayjs(job.creation).fromNow() }} </span>
+			</div>
 		</div>
-		<div class="space-x-2 mt-auto">
-			<Badge>
-				{{ job.type }}
-			</Badge>
-			<Badge>
-				{{ dayjs(job.creation).fromNow() }}
-			</Badge>
-		</div>
-		<!-- <div
-			class="description text-ink-gray-9 text-sm"
-			v-html="job.description"
-		></div> -->
 	</div>
 </template>
 <script setup>
+import { Building2, Calendar, MapPin, Shapes } from 'lucide-vue-next'
 import { inject } from 'vue'
-import { Badge } from 'frappe-ui'
-import { MapPin, User } from 'lucide-vue-next'
+import { Avatar } from 'frappe-ui'

 const dayjs = inject('$dayjs')
 const props = defineProps({
@@ -56,15 +45,3 @@ const props = defineProps({
 	},
 })
 </script>
-<style>
-.description {
-	display: -webkit-box;
-	-webkit-line-clamp: 2;
-	-webkit-box-orient: vertical;
-	text-overflow: ellipsis;
-	width: 100%;
-	overflow: hidden;
-	margin-top: auto;
-	line-height: 1.5;
-}
-</style>
--- a/frontend/src/components/LiveClass.vue
+++ b/frontend/src/components/LiveClass.vue
@@ -1,19 +1,9 @@
 <template>
-	<div
-		v-if="hasPermission() && !props.zoomAccount"
-		class="flex items-center space-x-2 mb-5 bg-surface-amber-1 py-1 px-2 rounded-md text-ink-amber-3"
-	>
-		<AlertCircle class="size-4 stroke-1.5" />
-		<span>
-			{{ __('Please add a zoom account to the batch to create live classes.') }}
-		</span>
-	</div>
-
-	<div class="flex items-center justify-between">
+	<div class="flex items-center justify-between mb-5">
 		<div class="text-lg font-semibold text-ink-gray-9">
 			{{ __('Live Class') }}
 		</div>
-		<Button v-if="canCreateClass()" @click="openLiveClassModal">
+		<Button v-if="user.data.is_moderator" @click="openLiveClassModal">
 			<template #prefix>
 				<Plus class="h-4 w-4" />
 			</template>
@@ -22,18 +12,10 @@
 			</span>
 		</Button>
 	</div>
-	<div v-if="liveClasses.data?.length" class="grid grid-cols-3 gap-5 mt-5">
+	<div v-if="liveClasses.data?.length" class="grid grid-cols-2 gap-5">
 		<div
 			v-for="cls in liveClasses.data"
-			class="flex flex-col border rounded-md h-full text-ink-gray-7 hover:border-outline-gray-3 p-3"
-			:class="{
-				'cursor-pointer': hasPermission() && cls.attendees > 0,
-			}"
-			@click="
-				() => {
-					openAttendanceModal(cls)
-				}
-			"
+			class="flex flex-col border rounded-md h-full text-ink-gray-7 p-3"
 		>
 			<div class="font-semibold text-ink-gray-9 text-lg mb-1">
 				{{ cls.title }}
@@ -41,7 +23,7 @@
 			<div class="short-introduction">
 				{{ cls.description }}
 			</div>
-			<div class="mt-auto space-y-3">
+			<div class="space-y-3">
 				<div class="flex items-center space-x-2">
 					<Calendar class="w-4 h-4 stroke-1.5" />
 					<span>
@@ -51,20 +33,18 @@
 				<div class="flex items-center space-x-2">
 					<Clock class="w-4 h-4 stroke-1.5" />
 					<span>
-						{{ formatTime(cls.time) }} -
-						{{ dayjs(getClassEnd(cls)).format('HH:mm') }}
+						{{ formatTime(cls.time) }}
 					</span>
 				</div>
 				<div
-					v-if="canAccessClass(cls)"
+					v-if="cls.date >= dayjs().format('YYYY-MM-DD')"
 					class="flex items-center space-x-2 text-ink-gray-9 mt-auto"
 				>
 					<a
 						v-if="user.data?.is_moderator || user.data?.is_evaluator"
 						:href="cls.start_url"
 						target="_blank"
-						class="cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-ink-gray-8 bg-surface-gray-2 hover:bg-surface-gray-3 active:bg-surface-gray-4 focus-visible:ring focus-visible:ring-outline-gray-3 h-7 text-base px-2 rounded"
-						:class="cls.join_url ? 'w-full' : 'w-1/2'"
+						class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-ink-gray-8 bg-surface-gray-2 hover:bg-surface-gray-3 active:bg-surface-gray-4 focus-visible:ring focus-visible:ring-outline-gray-3 h-7 text-base px-2 rounded"
 					>
 						<Monitor class="h-4 w-4 stroke-1.5" />
 						{{ __('Start') }}
@@ -78,63 +58,41 @@
 						{{ __('Join') }}
 					</a>
 				</div>
-				<Tooltip
-					v-else-if="hasClassEnded(cls)"
-					:text="__('This class has ended')"
-					placement="right"
-				>
-					<div class="flex items-center space-x-2 text-ink-amber-3 w-fit">
-						<Info class="w-4 h-4 stroke-1.5" />
-						<span>
-							{{ __('Ended') }}
-						</span>
-					</div>
-				</Tooltip>
+				<div v-else class="flex items-center space-x-2 text-yellow-700">
+					<Info class="w-4 h-4 stroke-1.5" />
+					<span>
+						{{ __('This class has ended') }}
+					</span>
+				</div>
 			</div>
 		</div>
 	</div>
-	<div v-else class="text-sm italic text-ink-gray-5 mt-2">
+	<div v-else class="text-sm italic text-ink-gray-5">
 		{{ __('No live classes scheduled') }}
 	</div>
-
 	<LiveClassModal
 		:batch="props.batch"
-		:zoomAccount="props.zoomAccount"
 		v-model="showLiveClassModal"
 		v-model:reloadLiveClasses="liveClasses"
 	/>
-
-	<LiveClassAttendance v-model="showAttendance" :live_class="attendanceFor" />
 </template>
 <script setup>
-import { createListResource, Button, Tooltip } from 'frappe-ui'
-import {
-	Plus,
-	Clock,
-	Calendar,
-	Video,
-	Monitor,
-	Info,
-	AlertCircle,
-} from 'lucide-vue-next'
-import { inject, ref } from 'vue'
-import { formatTime } from '@/utils/'
+import { createListResource, Button } from 'frappe-ui'
+import { Plus, Clock, Calendar, Video, Monitor, Info } from 'lucide-vue-next'
+import { inject } from 'vue'
 import LiveClassModal from '@/components/Modals/LiveClassModal.vue'
-import LiveClassAttendance from '@/components/Modals/LiveClassAttendance.vue'
+import { ref } from 'vue'
+import { formatTime } from '@/utils/'

 const user = inject('$user')
 const showLiveClassModal = ref(false)
 const dayjs = inject('$dayjs')
-const readOnlyMode = window.read_only_mode
-const showAttendance = ref(false)
-const attendanceFor = ref(null)

 const props = defineProps({
 	batch: {
 		type: String,
 		required: true,
 	},
-	zoomAccount: String,
 })

 const liveClasses = createListResource({
@@ -147,8 +105,6 @@ const liveClasses = createListResource({
 		'description',
 		'time',
 		'date',
-		'duration',
-		'attendees',
 		'start_url',
 		'join_url',
 		'owner',
@@ -160,41 +116,6 @@ const liveClasses = createListResource({
 const openLiveClassModal = () => {
 	showLiveClassModal.value = true
 }
-
-const canCreateClass = () => {
-	if (readOnlyMode) return false
-	if (!props.zoomAccount) return false
-	return hasPermission()
-}
-
-const hasPermission = () => {
-	return user.data?.is_moderator || user.data?.is_evaluator
-}
-
-const canAccessClass = (cls) => {
-	if (cls.date < dayjs().format('YYYY-MM-DD')) return false
-	if (cls.date > dayjs().format('YYYY-MM-DD')) return false
-	if (hasClassEnded(cls)) return false
-	return true
-}
-
-const getClassEnd = (cls) => {
-	const classStart = new Date(`${cls.date}T${cls.time}`)
-	return new Date(classStart.getTime() + cls.duration * 60000)
-}
-
-const hasClassEnded = (cls) => {
-	const classEnd = getClassEnd(cls)
-	const now = new Date()
-	return now > classEnd
-}
-
-const openAttendanceModal = (cls) => {
-	if (!hasPermission()) return
-	if (cls.attendees <= 0) return
-	showAttendance.value = true
-	attendanceFor.value = cls
-}
 </script>
 <style>
 .short-introduction {
--- a/frontend/src/components/Settings/Members.vue
+++ b/frontend/src/components/Settings/Members.vue
@@ -17,11 +17,10 @@
 					:debounce="300"
 				/>
 				<Button @click="() => (showForm = !showForm)">
-					<template #prefix>
-						<Plus v-if="!showForm" class="size-4 stroke-1.5" />
-						<X v-else class="size-4 stroke-1.5" />
+					<template #icon>
+						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
+						<X v-else class="h-3 w-3 stroke-1.5" />
 					</template>
-					{{ showForm ? __('Close') : __('New') }}
 				</Button>
 			</div>
 		</div>
@@ -118,7 +117,6 @@ import { useRouter } from 'vue-router'
 import { ref, watch, reactive, inject } from 'vue'
 import { RefreshCw, Plus, X } from 'lucide-vue-next'
 import { useOnboarding } from 'frappe-ui/frappe'
-import type { User } from '@/components/Settings/types'

 const router = useRouter()
 const show = defineModel('show')
@@ -128,7 +126,6 @@ const memberList = ref([])
 const hasNextPage = ref(false)
 const showForm = ref(false)
 const dayjs = inject('$dayjs')
-const user = inject<User | null>('$user')
 const { updateOnboardingStep } = useOnboarding('learning')

 const member = reactive({
@@ -190,9 +187,7 @@ const newMember = createResource({
 	auto: false,
 	onSuccess(data) {
 		show.value = false
-
-		if (user?.data?.is_system_manager) updateOnboardingStep('invite_students')
-
+		updateOnboardingStep('invite_students')
 		router.push({
 			name: 'Profile',
 			params: {
--- a/frontend/src/components/MobileLayout.vue
+++ b/frontend/src/components/MobileLayout.vue
@@ -1,55 +1,60 @@
 <template>
-	<div class="flex h-full flex-col relative">
+	<div class="flex h-full flex-col">
 		<div class="h-full pb-10" id="scrollContainer">
 			<slot />
 		</div>
-
-		<div class="relative z-20">
-			<!-- Dropdown menu -->
-			<div
-				class="fixed bottom-16 right-2 w-[80%] rounded-md bg-surface-white text-base p-5 space-y-4 shadow-md"
-				v-if="showMenu"
-				ref="menu"
+		<div
+			v-if="sidebarSettings.data"
+			class="fixed flex items-center justify-around border-t border-outline-gray-2 bottom-0 z-10 w-full bg-surface-white standalone:pb-4"
+			:style="{
+				gridTemplateColumns: `repeat(${
+					sidebarLinks.length + 1
+				}, minmax(0, 1fr))`,
+			}"
+		>
+			<button
+				v-for="tab in sidebarLinks"
+				:key="tab.label"
+				:class="isVisible(tab) ? 'block' : 'hidden'"
+				class="flex flex-col items-center justify-center py-3 transition active:scale-95"
+				@click="handleClick(tab)"
 			>
-				<div
-					v-for="link in otherLinks"
-					:key="link.label"
-					class="flex items-center space-x-2 cursor-pointer"
-					@click="handleClick(link)"
-				>
-					<component
-						:is="icons[link.icon]"
-						class="h-4 w-4 stroke-1.5 text-ink-gray-5"
-					/>
-					<div>{{ link.label }}</div>
-				</div>
-			</div>
-
-			<!-- Fixed menu -->
-			<div
-				v-if="sidebarSettings.data"
-				class="fixed bottom-0 left-0 w-full flex items-center justify-around border-t border-outline-gray-2 bg-surface-white standalone:pb-4 z-10"
+				<component
+					:is="icons[tab.icon]"
+					class="h-6 w-6 stroke-1.5"
+					:class="[isActive(tab) ? 'text-ink-gray-9' : 'text-ink-gray-5']"
+				/>
+			</button>
+			<Popover
+				trigger="hover"
+				popoverClass="bottom-28 mx-2"
+				placement="top-start"
 			>
-				<button
-					v-for="tab in sidebarLinks"
-					:key="tab.label"
-					:class="isVisible(tab) ? 'block' : 'hidden'"
-					class="flex flex-col items-center justify-center py-3 transition active:scale-95"
-					@click="handleClick(tab)"
-				>
-					<component
-						:is="icons[tab.icon]"
-						class="h-6 w-6 stroke-1.5"
-						:class="[isActive(tab) ? 'text-ink-gray-9' : 'text-ink-gray-5']"
-					/>
-				</button>
-				<button @click="toggleMenu">
+				<template #target>
 					<component
 						:is="icons['List']"
 						class="h-6 w-6 stroke-1.5 text-ink-gray-5"
 					/>
-				</button>
-			</div>
+				</template>
+				<template #body-main>
+					<div class="text-base p-5 space-y-4">
+						<div
+							v-for="link in otherLinks"
+							:key="link.label"
+							class="flex items-center space-x-2"
+							@click="handleClick(link)"
+						>
+							<component
+								:is="icons[link.icon]"
+								class="h-4 w-4 stroke-1.5 text-ink-gray-5"
+							/>
+							<div>
+								{{ link.label }}
+							</div>
+						</div>
+					</div>
+				</template>
+			</Popover>
 		</div>
 	</div>
 </template>
@@ -59,6 +64,7 @@ import { useRouter } from 'vue-router'
 import { watch, ref, onMounted } from 'vue'
 import { sessionStore } from '@/stores/session'
 import { usersStore } from '@/stores/user'
+import { Popover } from 'frappe-ui'
 import * as icons from 'lucide-vue-next'

 const { logout, user, sidebarSettings } = sessionStore()
@@ -67,47 +73,26 @@ const router = useRouter()
 let { userResource } = usersStore()
 const sidebarLinks = ref(getSidebarLinks())
 const otherLinks = ref([])
-const showMenu = ref(false)
-const menu = ref(null)

 onMounted(() => {
 	sidebarSettings.reload(
 		{},
 		{
 			onSuccess(data) {
-				filterLinksToShow(data)
+				Object.keys(data).forEach((key) => {
+					if (!parseInt(data[key])) {
+						sidebarLinks.value = sidebarLinks.value.filter(
+							(link) => link.label.toLowerCase().split(' ').join('_') !== key
+						)
+					}
+				})
+
 				addOtherLinks()
 			},
 		}
 	)
 })

-const handleOutsideClick = (e) => {
-	if (menu.value && !menu.value.contains(e.target)) {
-		showMenu.value = false
-	}
-}
-
-watch(showMenu, (val) => {
-	if (val) {
-		setTimeout(() => {
-			document.addEventListener('click', handleOutsideClick)
-		}, 0)
-	} else {
-		document.removeEventListener('click', handleOutsideClick)
-	}
-})
-
-const filterLinksToShow = (data) => {
-	Object.keys(data).forEach((key) => {
-		if (!parseInt(data[key])) {
-			sidebarLinks.value = sidebarLinks.value.filter(
-				(link) => link.label.toLowerCase().split(' ').join('_') !== key
-			)
-		}
-	})
-}
-
 const addOtherLinks = () => {
 	if (user) {
 		otherLinks.value.push({
@@ -137,7 +122,6 @@ watch(userResource, () => {
 		(userResource.data.is_moderator || userResource.data.is_instructor)
 	) {
 		addQuizzes()
-		addAssignments()
 	}
 })

@@ -149,14 +133,6 @@ const addQuizzes = () => {
 	})
 }

-const addAssignments = () => {
-	otherLinks.value.push({
-		label: 'Assignments',
-		icon: 'Pencil',
-		to: 'Assignments',
-	})
-}
-
 let isActive = (tab) => {
 	return tab.activeFor?.includes(router.currentRoute.value.name)
 }
@@ -182,8 +158,4 @@ const isVisible = (tab) => {
 	else if (tab.label == 'Log out') return isLoggedIn
 	else return true
 }
-
-const toggleMenu = () => {
-	showMenu.value = !showMenu.value
-}
 </script>
--- a/frontend/src/components/Modals/AnnouncementModal.vue
+++ b/frontend/src/components/Modals/AnnouncementModal.vue
@@ -31,7 +31,6 @@
 				<div class="mb-4">
 					<div class="mb-1.5 text-sm text-ink-gray-5">
 						{{ __('Announcement') }}
-						<span class="text-ink-red-3">*</span>
 					</div>
 					<TextEditor
 						:fixedMenu="true"
@@ -44,8 +43,9 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, Input, TextEditor, createResource, toast } from 'frappe-ui'
+import { Dialog, Input, TextEditor, createResource } from 'frappe-ui'
 import { reactive } from 'vue'
+import { showToast } from '@/utils/'

 const show = defineModel()

@@ -87,21 +87,22 @@ const makeAnnouncement = (close) => {
 		{
 			validate() {
 				if (!props.students.length) {
-					return __('No students in this batch')
+					return 'No students in this batch'
 				}
 				if (!announcement.subject) {
-					return __('Subject is required')
-				}
-				if (!announcement.announcement) {
-					return __('Announcement is required')
+					return 'Subject is required'
 				}
 			},
 			onSuccess() {
 				close()
-				toast.success(__('Announcement has been sent successfully'))
+				showToast(
+					__('Success'),
+					__('Announcement has been sent successfully'),
+					'check'
+				)
 			},
 			onError(err) {
-				toast.error(__(err.messages?.[0] || err))
+				showToast(__('Error'), __(err.messages?.[0] || err), 'alert-circle')
 			},
 		}
 	)
--- a/frontend/src/components/Modals/AssessmentModal.vue
+++ b/frontend/src/components/Modals/AssessmentModal.vue
@@ -25,39 +25,21 @@
 					v-model="assessment"
 					:doctype="assessmentType"
 					:label="__('Assessment')"
-					:onCreate="
-						(value, close) => {
-							close()
-							if (assessmentType === 'LMS Quiz') {
-								router.push({
-									name: 'QuizForm',
-									params: {
-										quizID: 'new',
-									},
-								})
-							} else if (assessmentType === 'LMS Assignment') {
-								router.push({
-									name: 'Assignments',
-								})
-							}
-						}
-					"
 				/>
 			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FormControl, createResource, toast } from 'frappe-ui'
+import { Dialog, FormControl, createResource } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
 import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { showToast } from '@/utils'

 const show = defineModel()
 const assessmentType = ref(null)
 const assessment = ref(null)
 const assessments = defineModel('assessments')
-const router = useRouter()

 const props = defineProps({
 	batch: {
@@ -88,7 +70,7 @@ const addAssessment = (close) => {
 		{
 			onSuccess(data) {
 				assessments.value.reload()
-				toast.success(__('Assessment added successfully'))
+				showToast(__('Success'), __('Assessment added successfully'), 'check')
 				close()
 			},
 		}
--- a/frontend/src/components/Modals/AssignmentForm.vue
+++ b/frontend/src/components/Modals/AssignmentForm.vue
@@ -1,154 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: 'lg',
-		}"
-	>
-		<template #body>
-			<div class="p-5 text-base">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-5">
-					{{
-						assignmentID === 'new'
-							? __('Create an Assignment')
-							: __('Edit Assignment')
-					}}
-				</div>
-				<div class="space-y-4 max-h-[75vh] overflow-y-auto">
-					<FormControl
-						v-model="assignment.title"
-						:label="__('Title')"
-						:required="true"
-					/>
-					<FormControl
-						v-model="assignment.type"
-						type="select"
-						:options="assignmentOptions"
-						:label="__('Submission Type')"
-						:required="true"
-					/>
-					<div>
-						<div class="text-xs text-ink-gray-5 mb-2">
-							{{ __('Question') }}
-							<span class="text-ink-red-3">*</span>
-						</div>
-						<TextEditor
-							:content="assignment.question"
-							@change="(val) => (assignment.question = val)"
-							:editable="true"
-							:fixedMenu="true"
-							editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[18rem] overflow-y-auto"
-						/>
-					</div>
-				</div>
-
-				<div class="flex justify-end space-x-2 mt-5">
-					<router-link
-						:to="{
-							name: 'AssignmentSubmissionList',
-							query: {
-								assignmentID: assignmentID,
-							},
-						}"
-					>
-						<Button v-if="assignmentID !== 'new'" variant="subtle">
-							{{ __('Check Submissions') }}
-						</Button>
-					</router-link>
-					<Button variant="solid" @click="saveAssignment">
-						{{ __('Save') }}
-					</Button>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import { Button, Dialog, FormControl, TextEditor, toast } from 'frappe-ui'
-import { computed, reactive, watch } from 'vue'
-
-const show = defineModel()
-const assignments = defineModel<Assignments>('assignments')
-
-interface Assignment {
-	title: string
-	type: string
-	question: string
-}
-
-interface Assignments {
-	data: Assignment[]
-	get: (params: { doctype: string; name: string }) => Promise<Assignment>
-	insert: {
-		submit: (params: Assignment, options: { onSuccess: () => void }) => void
-	}
-}
-
-const assignment = reactive({
-	title: '',
-	type: '',
-	question: '',
-})
-
-const props = defineProps({
-	assignmentID: {
-		type: String,
-		default: 'new',
-	},
-})
-
-watch(
-	() => props.assignmentID,
-	(val) => {
-		if (val !== 'new') {
-			assignments.value?.data.forEach((row) => {
-				if (row.name === val) {
-					assignment.title = row.title
-					assignment.type = row.type
-					assignment.question = row.question
-				}
-			})
-		}
-	},
-	{ flush: 'post' }
-)
-
-const saveAssignment = () => {
-	if (props.assignmentID == 'new') {
-		assignments.value.insert.submit(
-			{
-				...assignment,
-			},
-			{
-				onSuccess() {
-					show.value = false
-					toast.success(__('Assignment created successfully'))
-				},
-			}
-		)
-	} else {
-		assignments.value.setValue.submit(
-			{
-				...assignment,
-				name: props.assignmentID,
-			},
-			{
-				onSuccess() {
-					show.value = false
-					toast.success(__('Assignment updated successfully'))
-				},
-			}
-		)
-	}
-}
-
-const assignmentOptions = computed(() => {
-	return [
-		{ label: 'PDF', value: 'PDF' },
-		{ label: 'Image', value: 'Image' },
-		{ label: 'Document', value: 'Document' },
-		{ label: 'Text', value: 'Text' },
-		{ label: 'URL', value: 'URL' },
-	]
-})
-</script>
--- a/frontend/src/components/Modals/BatchCourseModal.vue
+++ b/frontend/src/components/Modals/BatchCourseModal.vue
@@ -19,43 +19,31 @@
 				v-model="course"
 				:label="__('Course')"
 				:required="true"
-				:onCreate="
-					(value, close) => {
-						close()
-						router.push({
-							name: 'CourseForm',
-							params: {
-								courseName: 'new',
-							},
-						})
-					}
-				"
 			/>
 			<Link
 				doctype="Course Evaluator"
 				v-model="evaluator"
 				:label="__('Evaluator')"
-				:onCreate="(value, close) => openSettings('Evaluators', close)"
+				:onCreate="(value, close) => openSettings(close)"
 				class="mt-4"
 			/>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource, toast } from 'frappe-ui'
-import { ref, inject } from 'vue'
+import { Dialog, createResource } from 'frappe-ui'
+import { ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
+import { showToast } from '@/utils'
 import { useOnboarding } from 'frappe-ui/frappe'
-import { openSettings } from '@/utils'
-import { useRouter } from 'vue-router'
+import { useSettings } from '@/stores/settings'

 const show = defineModel()
 const course = ref(null)
 const evaluator = ref(null)
-const user = inject('$user')
 const courses = defineModel('courses')
-const router = useRouter()
 const { updateOnboardingStep } = useOnboarding('learning')
+const settingsStore = useSettings()

 const props = defineProps({
 	batch: {
@@ -85,18 +73,22 @@ const addCourse = (close) => {
 		{},
 		{
 			onSuccess() {
-				if (user.data?.is_system_manager)
-					updateOnboardingStep('add_batch_course')
-
-				close()
 				courses.value.reload()
+				updateOnboardingStep('add_batch_course')
+				close()
 				course.value = null
 				evaluator.value = null
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.message[0] || err, 'x')
 			},
 		}
 	)
 }
+
+const openSettings = (close) => {
+	close()
+	settingsStore.activeTab = 'Evaluators'
+	settingsStore.isSettingsOpen = true
+}
 </script>
--- a/frontend/src/components/Modals/BatchStudentProgress.vue
+++ b/frontend/src/components/Modals/BatchStudentProgress.vue
@@ -14,13 +14,7 @@
 							<div class="text-xl font-semibold">
 								{{ student.full_name }}
 							</div>
-							<Badge
-								v-if="
-									Object.keys(student.assessments).length ||
-									Object.keys(student.courses).length
-								"
-								:theme="student.progress === 100 ? 'green' : 'red'"
-							>
+							<Badge :theme="student.progress === 100 ? 'green' : 'red'">
 								{{ student.progress }}% {{ __('Complete') }}
 							</Badge>
 						</div>
@@ -32,10 +26,7 @@

 				<div class="space-y-8">
 					<!-- Assessments -->
-					<div
-						v-if="Object.keys(student.assessments).length"
-						class="space-y-2 text-sm"
-					>
+					<div class="space-y-2 text-sm">
 						<div class="flex items-center border-b pb-1 font-medium">
 							<span class="flex-1">
 								{{ __('Assessment') }}
@@ -82,10 +73,7 @@
 					</div>

 					<!-- Courses -->
-					<div
-						v-if="Object.keys(student.courses).length"
-						class="space-y-2 text-sm"
-					>
+					<div class="space-y-2 text-sm">
 						<div class="flex items-center border-b pb-1 font-medium">
 							<span class="flex-1">
 								{{ __('Courses') }}
--- a/frontend/src/components/Modals/BulkCertificates.vue
+++ b/frontend/src/components/Modals/BulkCertificates.vue
@@ -62,8 +62,9 @@
 </template>
 <script setup>
 import { inject, reactive } from 'vue'
-import { createResource, Dialog, FormControl, Switch, toast } from 'frappe-ui'
+import { createResource, Dialog, FormControl, Switch } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
+import { showToast } from '@/utils'

 const show = defineModel()
 const dayjs = inject('$dayjs')
@@ -111,13 +112,13 @@ const generateCertificates = (close) => {
 			},
 			{
 				onError(err) {
-					toast.error(err.messages?.[0] || err)
+					showToast(__('Error'), err.messages?.[0] || err, 'x')
 				},
 			}
 		)
 	})
 	close()
-	toast.success(__('Certificates generated successfully'))
+	showToast(__('Success'), __('Certificates generated successfully'), 'check')
 }

 const getCourses = () => {
--- a/frontend/src/components/Modals/ChapterModal.vue
+++ b/frontend/src/components/Modals/ChapterModal.vue
@@ -38,7 +38,7 @@
 							<div class="mb-4">
 								<Button @click="openFileSelector" :loading="uploading">
 									{{
-										uploading ? `Uploading ${progress}%` : 'Upload an ZIP file'
+										uploading ? `Uploading ${progress}%` : 'Upload an zip file'
 									}}
 								</Button>
 							</div>
@@ -76,17 +76,15 @@ import {
 	FileUploader,
 	FormControl,
 	Switch,
-	toast,
 } from 'frappe-ui'
-import { reactive, watch, inject } from 'vue'
-import { getFileSize } from '@/utils/'
+import { reactive, watch } from 'vue'
+import { showToast, getFileSize } from '@/utils/'
 import { capture } from '@/telemetry'
 import { FileText, X } from 'lucide-vue-next'
 import { useOnboarding } from 'frappe-ui/frappe'

 const show = defineModel()
 const outline = defineModel('outline')
-const user = inject('$user')
 const { updateOnboardingStep } = useOnboarding('learning')

 const props = defineProps({
@@ -141,27 +139,29 @@ const addChapter = async (close) => {
 				return validateChapter()
 			},
 			onSuccess: (data) => {
-				if (user.data?.is_system_manager)
-					updateOnboardingStep('create_first_chapter')
-
 				capture('chapter_created')
+				updateOnboardingStep('create_first_chapter')
 				chapterReference.submit(
 					{ name: data.name },
 					{
 						onSuccess(data) {
 							cleanChapter()
 							outline.value.reload()
-							toast.success(__('Chapter added successfully'))
+							showToast(
+								__('Success'),
+								__('Chapter added successfully'),
+								'check'
+							)
 						},
 						onError(err) {
-							toast.error(err.messages?.[0] || err)
+							showToast(__('Error'), err.messages?.[0] || err, 'x')
 						},
 					}
 				)
 				close()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast(__('Error'), err.messages?.[0] || err, 'x')
 			},
 		}
 	)
@@ -193,11 +193,11 @@ const editChapter = (close) => {
 			},
 			onSuccess() {
 				outline.value.reload()
-				toast.success(__('Chapter updated successfully'))
+				showToast(__('Success'), __('Chapter updated successfully'), 'check')
 				close()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast(__('Error'), err.messages?.[0] || err, 'x')
 			},
 		}
 	)
--- a/frontend/src/components/Modals/DiscussionModal.vue
+++ b/frontend/src/components/Modals/DiscussionModal.vue
@@ -34,15 +34,9 @@
 	</Dialog>
 </template>
 <script setup>
-import {
-	Dialog,
-	FormControl,
-	TextEditor,
-	createResource,
-	toast,
-} from 'frappe-ui'
+import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
 import { reactive } from 'vue'
-import { singularize } from '@/utils'
+import { showToast, singularize } from '@/utils'

 const topics = defineModel('reloadTopics')

@@ -121,7 +115,7 @@ const submitTopic = (close) => {
 				)
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.message, 'x')
 			},
 		}
 	)
--- a/frontend/src/components/Modals/EditProfile.vue
+++ b/frontend/src/components/Modals/EditProfile.vue
@@ -93,11 +93,10 @@ import {
 	Button,
 	createResource,
 	TextEditor,
-	toast,
 } from 'frappe-ui'
 import { reactive, watch } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
-import { getFileSize } from '@/utils'
+import { getFileSize, showToast, escapeHTML } from '@/utils'

 const reloadProfile = defineModel('reloadProfile')

@@ -132,6 +131,7 @@ const imageResource = createResource({
 const updateProfile = createResource({
 	url: 'frappe.client.set_value',
 	makeParams(values) {
+		profile.bio = escapeHTML(profile.bio)
 		return {
 			doctype: 'User',
 			name: props.profile.data.name,
@@ -155,7 +155,7 @@ const saveProfile = (close) => {
 				reloadProfile.value.reload()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.messages?.[0] || err, 'x')
 			},
 		}
 	)
--- a/frontend/src/components/Modals/EmailTemplateModal.vue
+++ b/frontend/src/components/Modals/EmailTemplateModal.vue
@@ -1,192 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title:
-				templateID == 'new'
-					? __('New Email Template')
-					: __('Edit Email Template'),
-			size: 'lg',
-			actions: [
-				{
-					label: __('Save'),
-					variant: 'solid',
-					onClick: ({ close }) => {
-						saveTemplate(close)
-					},
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<div class="space-y-4">
-				<FormControl
-					:label="__('Name')"
-					v-model="template.name"
-					type="text"
-					:required="true"
-					:placeholder="__('Batch Enrollment Confirmation')"
-				/>
-				<FormControl
-					:label="__('Subject')"
-					v-model="template.subject"
-					type="text"
-					:required="true"
-					:placeholder="__('Your enrollment in {{ batch_name }} is confirmed')"
-				/>
-				<FormControl
-					:label="__('Use HTML')"
-					v-model="template.use_html"
-					type="checkbox"
-				/>
-				<FormControl
-					v-if="template.use_html"
-					:label="__('Content')"
-					v-model="template.response_html"
-					type="textarea"
-					:required="true"
-					:rows="10"
-					:placeholder="
-						__(
-							'<p>Dear {{ member_name }},</p>\n\n<p>You have been enrolled in our upcoming batch {{ batch_name }}.</p>\n\n<p>Thanks,</p>\n<p>Frappe Learning</p>'
-						)
-					"
-				/>
-				<div v-else>
-					<div class="text-xs text-ink-gray-5 mb-2">
-						{{ __('Content') }}
-						<span class="text-ink-red-3">*</span>
-					</div>
-					<TextEditor
-						:content="template.response"
-						@change="(val) => (template.response = val)"
-						:editable="true"
-						:fixedMenu="true"
-						:placeholder="
-							__(
-								'Dear {{ member_name }},\n\nYou have been enrolled in our upcoming batch {{ batch_name }}.\n\nThanks,\nFrappe Learning'
-							)
-						"
-						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[18rem] overflow-y-auto"
-					/>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import { call, Dialog, FormControl, TextEditor, toast } from 'frappe-ui'
-import { reactive, watch } from 'vue'
-import { cleanError } from '@/utils'
-
-const props = defineProps({
-	templateID: {
-		type: String,
-		default: 'new',
-	},
-})
-
-const show = defineModel()
-const emailTemplates = defineModel('emailTemplates')
-const template = reactive({
-	name: '',
-	subject: '',
-	use_html: false,
-	response: '',
-	response_html: '',
-})
-
-const saveTemplate = (close) => {
-	if (props.templateID == 'new') {
-		createNewTemplate(close)
-	} else {
-		updateTemplate(close)
-	}
-}
-
-const createNewTemplate = (close) => {
-	emailTemplates.value.insert.submit(
-		{
-			__newname: template.name,
-			...template,
-		},
-		{
-			onSuccess() {
-				emailTemplates.value.reload()
-				refreshForm(close)
-				toast.success(__('Email Template created successfully'))
-			},
-			onError(err) {
-				refreshForm(close)
-				toast.error(
-					cleanError(err.messages[0]) || __('Error creating email template')
-				)
-			},
-		}
-	)
-}
-
-const updateTemplate = async (close) => {
-	if (props.templateID != template.name) {
-		await renameDoc()
-	}
-	setValue(close)
-}
-
-const setValue = (close) => {
-	emailTemplates.value.setValue.submit(
-		{
-			...template,
-			name: template.name,
-		},
-		{
-			onSuccess() {
-				emailTemplates.value.reload()
-				refreshForm(close)
-				toast.success(__('Email Template updated successfully'))
-			},
-			onError(err) {
-				refreshForm(close)
-				toast.error(
-					cleanError(err.messages[0]) || __('Error updating email template')
-				)
-			},
-		}
-	)
-}
-
-const renameDoc = async () => {
-	await call('frappe.client.rename_doc', {
-		doctype: 'Email Template',
-		old_name: props.templateID,
-		new_name: template.name,
-	})
-}
-
-watch(
-	() => props.templateID,
-	(val) => {
-		if (val !== 'new') {
-			emailTemplates.value?.data.forEach((row) => {
-				if (row.name === val) {
-					template.name = row.name
-					template.subject = row.subject
-					template.use_html = row.use_html
-					template.response = row.response
-					template.response_html = row.response_html
-				}
-			})
-		}
-	},
-	{ flush: 'post' }
-)
-
-const refreshForm = (close) => {
-	close()
-	template.name = ''
-	template.subject = ''
-	template.use_html = false
-	template.response = ''
-	template.response_html = ''
-}
-</script>
--- a/frontend/src/components/Modals/EvaluationModal.vue
+++ b/frontend/src/components/Modals/EvaluationModal.vue
@@ -42,11 +42,10 @@
 					<div class="grid grid-cols-2 gap-2">
 						<div v-for="slot in slots.data">
 							<div
-								class="text-base text-center border rounded-md text-ink-gray-8 bg-surface-gray-3 p-2 cursor-pointer"
+								class="text-base text-center border rounded-md bg-surface-gray-3 p-2 cursor-pointer"
 								@click="saveSlot(slot)"
 								:class="{
-									'border-outline-gray-4':
-										evaluation.start_time == slot.start_time,
+									'border-gray-900': evaluation.start_time == slot.start_time,
 								}"
 							>
 								{{ formatTime(slot.start_time) }} -
@@ -66,9 +65,9 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource, Select, FormControl, toast } from 'frappe-ui'
+import { Dialog, createResource, Select, FormControl } from 'frappe-ui'
 import { reactive, watch, inject } from 'vue'
-import { formatTime } from '@/utils/'
+import { createToast, formatTime } from '@/utils/'

 const user = inject('$user')
 const dayjs = inject('$dayjs')
@@ -90,7 +89,7 @@ const props = defineProps({
 	},
 })

-const evaluation = reactive({
+let evaluation = reactive({
 	course: '',
 	date: '',
 	start_time: '',
@@ -139,13 +138,29 @@ function submitEvaluation(close) {
 			close()
 		},
 		onError(err) {
-			toast.warning(__(err.messages?.[0] || err))
+			let message = err.messages?.[0] || err
+			let unavailabilityMessage
+
+			if (typeof message === 'string') {
+				unavailabilityMessage = message?.includes('unavailable')
+			} else {
+				unavailabilityMessage = false
+			}
+
+			createToast({
+				title: unavailabilityMessage ? __('Evaluator is Unavailable') : '',
+				text: message,
+				icon: unavailabilityMessage ? 'alert-circle' : 'x',
+				iconClasses: 'bg-yellow-600 text-ink-white rounded-md p-px',
+				position: 'top-center',
+				timeout: 10,
+			})
 		},
 	})
 }

 const getCourses = () => {
-	const courses = []
+	let courses = []
 	for (const course of props.courses) {
 		if (course.evaluator) {
 			courses.push({
@@ -155,7 +170,7 @@ const getCourses = () => {
 		}
 	}

-	if (courses.length === 1) {
+	if (courses.length == 1) {
 		evaluation.course = courses[0].value
 	}

--- a/frontend/src/components/Modals/Event.vue
+++ b/frontend/src/components/Modals/Event.vue
@@ -76,8 +76,8 @@
 						</Button>
 					</div>
 				</div>
-				<Tabs :tabs="tabs" as="div" v-model="tabIndex" class="border-l w-1/2">
-					<template #tab-panel="{ tab }">
+				<Tabs :tabs="tabs" v-model="tabIndex" class="border-l w-1/2">
+					<template #default="{ tab }">
 						<div
 							v-if="tab.label == 'Evaluation'"
 							class="flex flex-col space-y-4 p-5"
@@ -144,7 +144,6 @@ import {
 	Tabs,
 	Tooltip,
 	Textarea,
-	toast,
 } from 'frappe-ui'
 import {
 	User,
@@ -158,7 +157,7 @@ import {
 	ClipboardList,
 } from 'lucide-vue-next'
 import { inject, reactive, watch, ref, computed } from 'vue'
-import { formatTime } from '@/utils'
+import { formatTime, showToast } from '@/utils'
 import Rating from '@/components/Controls/Rating.vue'
 import Link from '@/components/Controls/Link.vue'

@@ -253,7 +252,7 @@ const saveEvaluation = () => {
 				} else {
 					show.value = false
 				}
-				toast.success(__('Evaluation saved successfully'))
+				showToast(__('Success'), __('Evaluation saved successfully'), 'check')
 			},
 		}
 	)
@@ -308,7 +307,7 @@ const saveCertificate = () => {
 		{},
 		{
 			onSuccess: () => {
-				toast.success(__('Certificate saved successfully'))
+				showToast(__('Success'), __('Certificate saved successfully'), 'check')
 			},
 		}
 	)
--- a/frontend/src/components/Modals/FeedbackModal.vue
+++ b/frontend/src/components/Modals/FeedbackModal.vue
@@ -1,115 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: '4xl',
-		}"
-	>
-		<template #body>
-			<div class="p-5 min-h-[300px]">
-				<div class="text-lg font-semibold mb-4">
-					{{ __('Training Feedback') }}
-				</div>
-				<ListView
-					:columns="feedbackColumns"
-					:rows="feedbackList"
-					row-key="name"
-					:options="{
-						showTooltip: false,
-						rowHeight: 'h-16',
-						selectable: false,
-					}"
-				>
-					<ListHeader
-						class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
-					></ListHeader>
-					<ListRows>
-						<ListRow
-							:row="row"
-							v-for="row in feedbackList"
-							class="group feedback-list"
-						>
-							<template #default="{ column, item }">
-								<ListRowItem
-									:item="row[column.key]"
-									:align="column.align"
-									class="text-sm"
-								>
-									<template #prefix>
-										<div v-if="column.key == 'member_name'">
-											<Avatar
-												class="flex"
-												:image="row['member_image']"
-												:label="item"
-												size="sm"
-											/>
-										</div>
-									</template>
-									<div v-if="ratingKeys.includes(column.key)">
-										<Rating v-model="row[column.key]" :readonly="true" />
-									</div>
-									<div v-else class="leading-5">
-										{{ row[column.key] }}
-									</div>
-								</ListRowItem>
-							</template>
-						</ListRow>
-					</ListRows>
-				</ListView>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import {
-	Dialog,
-	ListView,
-	Avatar,
-	ListHeader,
-	ListRows,
-	ListRow,
-	ListRowItem,
-	Rating,
-} from 'frappe-ui'
-import { reactive, computed } from 'vue'
-
-const show = defineModel()
-const ratingKeys = ['content', 'instructors', 'value']
-
-const props = defineProps({
-	feedbackList: {
-		type: Array,
-		required: true,
-	},
-})
-
-const feedbackColumns = computed(() => {
-	return [
-		{
-			label: 'Member',
-			key: 'member_name',
-			width: '10rem',
-		},
-		{
-			label: 'Feedback',
-			key: 'feedback',
-			width: '15rem',
-		},
-		{
-			label: 'Content',
-			key: 'content',
-			width: '9rem',
-		},
-		{
-			label: 'Instructors',
-			key: 'instructors',
-			width: '9rem',
-		},
-		{
-			label: 'Value',
-			key: 'value',
-			width: '9rem',
-		},
-	]
-})
-</script>
--- a/frontend/src/components/Modals/JobApplicationModal.vue
+++ b/frontend/src/components/Modals/JobApplicationModal.vue
@@ -64,10 +64,10 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FileUploader, Button, createResource, toast } from 'frappe-ui'
+import { Dialog, FileUploader, Button, createResource } from 'frappe-ui'
 import { FileText } from 'lucide-vue-next'
 import { ref, inject } from 'vue'
-import { getFileSize } from '@/utils/'
+import { createToast, getFileSize } from '@/utils/'

 const resume = ref(null)
 const show = defineModel()
@@ -112,12 +112,24 @@ const submitResume = (close) => {
 				}
 			},
 			onSuccess() {
-				toast.success('Your application has been submitted successfully')
+				createToast({
+					title: 'Success',
+					text: 'Your application has been submitted',
+					icon: 'check',
+					iconClasses: 'bg-surface-green-3 text-ink-white rounded-md p-px',
+				})
 				application.value.reload()
 				close()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				createToast({
+					title: 'Error',
+					text: err.messages?.[0] || err,
+					icon: 'x',
+					iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
+					position: 'top-center',
+					timeout: 10,
+				})
 			},
 		}
 	)
--- a/frontend/src/components/Modals/LiveClassAttendance.vue
+++ b/frontend/src/components/Modals/LiveClassAttendance.vue
@@ -1,91 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: __('Attendance for Class - {0}').format(live_class?.title),
-			size: 'xl',
-		}"
-	>
-		<template #body-content>
-			<div class="space-y-5">
-				<div
-					v-for="participant in participants.data"
-					@click="redirectToProfile(participant.member_username)"
-					class="cursor-pointer text-base w-fit"
-				>
-					<Tooltip placement="right">
-						<div class="flex items-center space-x-2">
-							<Avatar
-								:image="participant.member_image"
-								:label="participant.member_name"
-								size="xl"
-							/>
-							<div class="space-y-1">
-								<div class="font-medium">
-									{{ participant.member_name }}
-								</div>
-								<div>
-									{{ participant.member }}
-								</div>
-							</div>
-						</div>
-						<template #body>
-							<div
-								class="max-w-[30ch] rounded bg-surface-gray-7 px-2 py-1 text-p-xs text-ink-white leading-5 shadow-xl"
-							>
-								{{ dayjs(participant.joined_at).format('HH:mm a') }} -
-								{{ dayjs(participant.left_at).format('HH:mm a') }}
-								<br />
-								{{ __('attended for') }} {{ participant.duration }}
-								{{ __('minutes') }}
-							</div>
-						</template>
-					</Tooltip>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import { Avatar, createListResource, Dialog, Tooltip } from 'frappe-ui'
-import { useRouter } from 'vue-router'
-import { inject } from 'vue'
-
-const show = defineModel()
-const router = useRouter()
-const dayjs = inject('$dayjs')
-
-interface LiveClass {
-	name: String
-	title: String
-}
-
-const props = defineProps<{
-	live_class: LiveClass | null
-}>()
-
-const participants = createListResource({
-	doctype: 'LMS Live Class Participant',
-	filter: {
-		live_class: props.live_class?.name,
-	},
-	fields: [
-		'name',
-		'member',
-		'member_name',
-		'member_image',
-		'member_username',
-		'joined_at',
-		'left_at',
-		'duration',
-	],
-	auto: true,
-})
-
-const redirectToProfile = (username: string) => {
-	router.push({
-		name: 'Profile',
-		params: { username },
-	})
-}
-</script>
--- a/frontend/src/components/Modals/LiveClassModal.vue
+++ b/frontend/src/components/Modals/LiveClassModal.vue
@@ -8,7 +8,7 @@
 				{
 					label: 'Submit',
 					variant: 'solid',
-					onClick: ({ close }) => submitLiveClass(close),
+					onClick: (close) => submitLiveClass(close),
 				},
 			],
 		}"
@@ -16,29 +16,14 @@
 		<template #body-content>
 			<div class="flex flex-col gap-4">
 				<div class="grid grid-cols-2 gap-4">
-					<div class="space-y-4">
+					<div>
 						<FormControl
 							type="text"
 							v-model="liveClass.title"
 							:label="__('Title')"
+							class="mb-4"
 							:required="true"
 						/>
-						<FormControl
-							v-model="liveClass.date"
-							type="date"
-							:label="__('Date')"
-							:required="true"
-						/>
-						<Tooltip :text="__('Duration of the live class in minutes')">
-							<FormControl
-								type="number"
-								v-model="liveClass.duration"
-								:label="__('Duration')"
-								:required="true"
-							/>
-						</Tooltip>
-					</div>
-					<div class="space-y-4">
 						<Tooltip
 							:text="
 								__(
@@ -50,6 +35,7 @@
 								v-model="liveClass.time"
 								type="time"
 								:label="__('Time')"
+								class="mb-4"
 								:required="true"
 							/>
 						</Tooltip>
@@ -66,6 +52,24 @@
 								:required="true"
 							/>
 						</div>
+					</div>
+					<div>
+						<FormControl
+							v-model="liveClass.date"
+							type="date"
+							class="mb-4"
+							:label="__('Date')"
+							:required="true"
+						/>
+						<Tooltip :text="__('Duration of the live class in minutes')">
+							<FormControl
+								type="number"
+								v-model="liveClass.duration"
+								:label="__('Duration')"
+								class="mb-4"
+								:required="true"
+							/>
+						</Tooltip>
 						<FormControl
 							v-model="liveClass.auto_recording"
 							type="select"
@@ -90,10 +94,9 @@ import {
 	Tooltip,
 	FormControl,
 	Autocomplete,
-	toast,
 } from 'frappe-ui'
 import { reactive, inject, onMounted } from 'vue'
-import { getTimezones, getUserTimezone } from '@/utils/'
+import { getTimezones, createToast, getUserTimezone } from '@/utils/'

 const liveClasses = defineModel('reloadLiveClasses')
 const show = defineModel()
@@ -103,11 +106,7 @@ const dayjs = inject('$dayjs')
 const props = defineProps({
 	batch: {
 		type: String,
-		required: true,
-	},
-	zoomAccount: {
-		type: String,
-		required: true,
+		default: null,
 	},
 })

@@ -159,7 +158,6 @@ const createLiveClass = createResource({
 		return {
 			doctype: 'LMS Live Class',
 			batch_name: values.batch,
-			zoom_account: props.zoomAccount,
 			...values,
 		}
 	},
@@ -168,52 +166,54 @@ const createLiveClass = createResource({
 const submitLiveClass = (close) => {
 	return createLiveClass.submit(liveClass, {
 		validate() {
-			validateFormFields()
+			if (!liveClass.title) {
+				return __('Please enter a title.')
+			}
+			if (!liveClass.date) {
+				return __('Please select a date.')
+			}
+			if (!liveClass.time) {
+				return __('Please select a time.')
+			}
+			if (!liveClass.timezone) {
+				return __('Please select a timezone.')
+			}
+			if (!valideTime()) {
+				return __('Please enter a valid time in the format HH:mm.')
+			}
+			const liveClassDateTime = dayjs(`${liveClass.date}T${liveClass.time}`).tz(
+				liveClass.timezone,
+				true
+			)
+			if (
+				liveClassDateTime.isSameOrBefore(
+					dayjs().tz(liveClass.timezone, false),
+					'minute'
+				)
+			) {
+				return __('Please select a future date and time.')
+			}
+			if (!liveClass.duration) {
+				return __('Please select a duration.')
+			}
 		},
 		onSuccess() {
 			liveClasses.value.reload()
-			refreshForm()
 			close()
 		},
 		onError(err) {
-			toast.error(err.messages?.[0] || err)
+			createToast({
+				title: 'Error',
+				text: err.messages?.[0] || err,
+				icon: 'x',
+				iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
+				position: 'top-center',
+				timeout: 10,
+			})
 		},
 	})
 }

-const validateFormFields = () => {
-	if (!liveClass.title) {
-		return __('Please enter a title.')
-	}
-	if (!liveClass.date) {
-		return __('Please select a date.')
-	}
-	if (!liveClass.time) {
-		return __('Please select a time.')
-	}
-	if (!liveClass.timezone) {
-		return __('Please select a timezone.')
-	}
-	if (!valideTime()) {
-		return __('Please enter a valid time in the format HH:mm.')
-	}
-	const liveClassDateTime = dayjs(`${liveClass.date}T${liveClass.time}`).tz(
-		liveClass.timezone,
-		true
-	)
-	if (
-		liveClassDateTime.isSameOrBefore(
-			dayjs().tz(liveClass.timezone, false),
-			'minute'
-		)
-	) {
-		return __('Please select a future date and time.')
-	}
-	if (!liveClass.duration) {
-		return __('Please select a duration.')
-	}
-}
-
 const valideTime = () => {
 	let time = liveClass.time.split(':')
 	if (time.length != 2) {
@@ -227,14 +227,4 @@ const valideTime = () => {
 	}
 	return true
 }
-
-const refreshForm = () => {
-	liveClass.title = ''
-	liveClass.description = ''
-	liveClass.date = ''
-	liveClass.time = ''
-	liveClass.duration = ''
-	liveClass.timezone = getUserTimezone()
-	liveClass.auto_recording = 'No Recording'
-}
 </script>
--- a/frontend/src/components/Modals/PageModal.vue
+++ b/frontend/src/components/Modals/PageModal.vue
@@ -30,10 +30,11 @@
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource, toast } from 'frappe-ui'
+import { Dialog, createResource } from 'frappe-ui'
 import Link from '@/components/Controls/Link.vue'
 import { reactive, watch } from 'vue'
 import IconPicker from '@/components/Controls/IconPicker.vue'
+import { showToast } from '@/utils'

 const sidebar = defineModel('reloadSidebar')
 const show = defineModel()
@@ -77,10 +78,10 @@ const addWebPage = (close) => {
 			onSuccess() {
 				sidebar.value.reload()
 				close()
-				toast.success(__('Web page added to sidebar'))
+				showToast('Success', 'Web page added to sidebar', 'check')
 			},
 			onError(err) {
-				toast.error(err.message[0] || err)
+				showToast('Error', err.message[0] || err, 'x')
 				close()
 			},
 		}
--- a/frontend/src/components/Modals/Question.vue
+++ b/frontend/src/components/Modals/Question.vue
@@ -1,27 +1,38 @@
 <template>
-	<Dialog
-		v-model="show"
-		:options="{
-			size: '3xl',
-		}"
-	>
-		<template #body>
-			<div class="p-5 space-y-5">
-				<div class="text-lg font-semibold text-ink-gray-9 mb-5">
-					{{ __(props.title) }}
-				</div>
+	<Dialog v-model="show" :options="dialogOptions">
+		<template #body-content>
+			<div class="space-y-4">
 				<div
 					v-if="!editMode"
 					class="flex items-center text-xs text-ink-gray-7 space-x-5"
 				>
-					<Switch
-						size="sm"
-						:label="__('Choose an existing question')"
-						v-model="chooseFromExisting"
-						class="!p-0"
-					/>
+					<div class="flex items-center space-x-2">
+						<input
+							type="radio"
+							id="existing"
+							value="existing"
+							v-model="questionType"
+							class="w-3 h-3 cursor-pointer"
+						/>
+						<label for="existing" class="cursor-pointer">
+							{{ __('Add an existing question') }}
+						</label>
+					</div>
+
+					<div class="flex items-center space-x-2">
+						<input
+							type="radio"
+							id="new"
+							value="new"
+							v-model="questionType"
+							class="w-3 h-3 cursor-pointer"
+						/>
+						<label for="new" class="cursor-pointer">
+							{{ __('Create a new question') }}
+						</label>
+					</div>
 				</div>
-				<div v-if="!chooseFromExisting || editMode" class="space-y-2">
+				<div v-if="questionType == 'new' || editMode" class="space-y-2">
 					<div>
 						<label class="block text-xs text-ink-gray-5 mb-1">
 							{{ __('Question') }}
@@ -34,34 +45,20 @@
 							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 class="grid grid-cols-2 gap-4">
-						<FormControl
-							v-model="question.marks"
-							:label="__('Marks')"
-							type="number"
-						/>
-						<FormControl
-							:label="__('Type')"
-							v-model="question.type"
-							type="select"
-							:options="['Choices', 'User Input', 'Open Ended']"
-							class="pb-2"
-							:required="true"
-						/>
-					</div>
-					<div
-						v-if="question.type == 'Choices'"
-						class="text-base font-semibold text-ink-gray-9 mb-5 mt-5"
-					>
-						{{ __('Options') }}
-					</div>
-					<div
-						v-else-if="question.type == 'User Input'"
-						class="text-base font-semibold text-ink-gray-9 mb-5 mt-5"
-					>
-						{{ __('Possibilities') }}
-					</div>
-					<div v-if="question.type == 'Choices'" class="grid grid-cols-2 gap-4">
+					<FormControl
+						v-model="question.marks"
+						:label="__('Marks')"
+						type="number"
+					/>
+					<FormControl
+						:label="__('Type')"
+						v-model="question.type"
+						type="select"
+						:options="['Choices', 'User Input', 'Open Ended']"
+						class="pb-2"
+						:required="true"
+					/>
+					<div v-if="question.type == 'Choices'" class="divide-y border-t">
 						<div v-for="n in 4" class="space-y-4 py-2">
 							<FormControl
 								:label="__('Option') + ' ' + n"
@@ -81,18 +78,17 @@
 					</div>
 					<div
 						v-else-if="question.type == 'User Input'"
-						class="grid grid-cols-2 gap-4 py-2"
+						v-for="n in 4"
+						class="space-y-2"
 					>
-						<div v-for="n in 4">
-							<FormControl
-								:label="__('Possibility') + ' ' + n"
-								v-model="question[`possibility_${n}`]"
-								:required="n == 1 ? true : false"
-							/>
-						</div>
+						<FormControl
+							:label="__('Possibility') + ' ' + n"
+							v-model="question[`possibility_${n}`]"
+							:required="n == 1 ? true : false"
+						/>
 					</div>
 				</div>
-				<div v-else-if="chooseFromExisting" class="space-y-2">
+				<div v-else-if="questionType == 'existing'" class="space-y-2">
 					<Link
 						v-model="existingQuestion.question"
 						:label="__('Select a question')"
@@ -104,39 +100,26 @@
 						type="number"
 					/>
 				</div>
-				<div class="flex items-center justify-end space-x-2 mt-5">
-					<Button variant="solid" @click="submitQuestion()">
-						{{ __('Submit') }}
-					</Button>
-				</div>
 			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import {
-	Dialog,
-	FormControl,
-	TextEditor,
-	createResource,
-	Switch,
-	Button,
-	toast,
-} from 'frappe-ui'
-import { computed, watch, reactive, ref, inject } from 'vue'
+import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
+import { computed, watch, reactive, ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
+import { showToast } from '@/utils'
 import { useOnboarding } from 'frappe-ui/frappe'

 const show = defineModel()
 const quiz = defineModel('quiz')
-const chooseFromExisting = ref(false)
+const questionType = ref(null)
 const editMode = ref(false)
-const user = inject('$user')
 const { updateOnboardingStep } = useOnboarding('learning')

 const existingQuestion = reactive({
 	question: '',
-	marks: 1,
+	marks: 0,
 })
 const question = reactive({
 	question: '',
@@ -198,12 +181,11 @@ watch(show, () => {
 		editMode.value = false
 		if (props.questionDetail.question) questionData.fetch()
 		else {
-			question.question = ''
-			question.marks = 1
+			;(question.question = ''), (question.marks = 0)
 			question.type = 'Choices'
 			existingQuestion.question = ''
-			existingQuestion.marks = 1
-			chooseFromExisting.value = false
+			existingQuestion.marks = 0
+			questionType.value = null
 			populateFields()
 		}

@@ -238,53 +220,57 @@ const questionCreation = createResource({
 	},
 })

-const submitQuestion = () => {
-	if (props.questionDetail?.question) updateQuestion()
-	else addQuestion()
+const submitQuestion = (close) => {
+	if (props.questionDetail?.question) updateQuestion(close)
+	else addQuestion(close)
 }

-const addQuestion = () => {
-	if (chooseFromExisting.value) {
-		addQuestionRow({
-			question: existingQuestion.question,
-			marks: existingQuestion.marks,
-		})
+const addQuestion = (close) => {
+	if (questionType.value == 'existing') {
+		addQuestionRow(
+			{
+				question: existingQuestion.question,
+				marks: existingQuestion.marks,
+			},
+			close
+		)
 	} else {
 		questionCreation.submit(
 			{},
 			{
 				onSuccess(data) {
-					addQuestionRow({
-						question: data.name,
-						marks: question.marks,
-					})
+					addQuestionRow(
+						{
+							question: data.name,
+							marks: question.marks,
+						},
+						close
+					)
 				},
 				onError(err) {
-					toast.error(err.messages?.[0] || err)
+					showToast(__('Error'), __(err.messages?.[0] || err), 'x')
 				},
 			}
 		)
 	}
 }

-const addQuestionRow = (question) => {
+const addQuestionRow = (question, close) => {
 	questionRow.submit(
 		{
 			...question,
 		},
 		{
 			onSuccess() {
-				if (user.data?.is_system_manager)
-					updateOnboardingStep('create_first_quiz')
-
 				show.value = false
-				toast.success(__('Question added successfully'))
+				updateOnboardingStep('create_first_quiz')
+				showToast(__('Success'), __('Question added successfully'), 'check')
 				quiz.value.reload()
-				show.value = false
+				close()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
-				show.value = false
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				close()
 			},
 		}
 	)
@@ -318,7 +304,7 @@ const marksUpdate = createResource({
 	},
 })

-const updateQuestion = () => {
+const updateQuestion = (close) => {
 	questionUpdate.submit(
 		{},
 		{
@@ -328,18 +314,39 @@ const updateQuestion = () => {
 					{
 						onSuccess() {
 							show.value = false
-							toast.success(__('Question updated successfully'))
+							showToast(
+								__('Success'),
+								__('Question updated successfully'),
+								'check'
+							)
 							quiz.value.reload()
+							close()
 						},
 					}
 				)
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
 			},
 		}
 	)
 }
+
+const dialogOptions = computed(() => {
+	return {
+		title: __(props.title),
+		size: 'xl',
+		actions: [
+			{
+				label: __('Submit'),
+				variant: 'solid',
+				onClick: (close) => {
+					submitQuestion(close)
+				},
+			},
+		],
+	}
+})
 </script>
 <style>
 input[type='radio']:checked {
--- a/frontend/src/components/Modals/QuizInVideo.vue
+++ b/frontend/src/components/Modals/QuizInVideo.vue
@@ -1,225 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title: __('Add quiz to this video'),
-			size: '2xl',
-		}"
-	>
-		<template #body-content>
-			<div class="text-base">
-				<div class="flex items-end gap-4">
-					<FormControl
-						:label="__('Time in Video')"
-						v-model="quiz.time"
-						type="text"
-						placeholder="2:15"
-						class="flex-1"
-					/>
-					<Link
-						v-model="quiz.quiz"
-						:label="__('Quiz')"
-						doctype="LMS Quiz"
-						class="flex-1"
-					/>
-					<Button @click="addQuiz()" variant="solid">
-						<template #prefix>
-							<Plus class="w-4 h-4 stroke-1.5" />
-						</template>
-						{{ __('Add') }}
-					</Button>
-				</div>
-
-				<div class="mt-10 mb-5">
-					<div class="font-medium mb-4">
-						{{ __('Quizzes in this video') }}
-					</div>
-					<ListView
-						v-if="allQuizzes.length"
-						:columns="columns"
-						:rows="allQuizzes"
-						row-key="quiz"
-						:options="{
-							showTooltip: false,
-						}"
-					>
-						<ListHeader
-							class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
-						>
-							<ListHeaderItem :item="item" v-for="item in columns">
-								<template #prefix="{ item }">
-									<component
-										v-if="item.icon"
-										:is="item.icon"
-										class="h-4 w-4 stroke-1.5 ml-4"
-									/>
-								</template>
-							</ListHeaderItem>
-						</ListHeader>
-
-						<ListRows>
-							<ListRow :row="row" v-for="row in allQuizzes">
-								<template #default="{ column, item }">
-									<ListRowItem
-										:item="row[column.key as keyof Quiz]"
-										:align="column.align"
-									>
-										<div v-if="column.key == 'time'" class="leading-5 text-sm">
-											{{ formatTimestamp(row[column.key as keyof Quiz]) }}
-										</div>
-										<div v-else class="leading-5 text-sm">
-											{{ row[column.key as keyof Quiz] }}
-										</div>
-									</ListRowItem>
-								</template>
-							</ListRow>
-						</ListRows>
-
-						<ListSelectBanner>
-							<template #actions="{ unselectAll, selections }">
-								<div class="flex gap-2">
-									<Button
-										variant="ghost"
-										@click="removeQuiz(selections, unselectAll)"
-									>
-										<Trash2 class="h-4 w-4 stroke-1.5" />
-									</Button>
-								</div>
-							</template>
-						</ListSelectBanner>
-					</ListView>
-
-					<div v-else class="text-ink-gray-5 italic text-xs">
-						{{ __('No quizzes added yet.') }}
-					</div>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import {
-	Dialog,
-	Button,
-	FormControl,
-	ListView,
-	ListHeader,
-	ListHeaderItem,
-	ListRows,
-	ListRow,
-	ListRowItem,
-	ListSelectBanner,
-	toast,
-} from 'frappe-ui'
-import { computed, reactive, ref, watch } from 'vue'
-import { Plus, Trash2 } from 'lucide-vue-next'
-import { formatTimestamp } from '@/utils'
-import Link from '@/components/Controls/Link.vue'
-
-type Quiz = {
-	time: string
-	quiz: string
-}
-
-const show = defineModel()
-const allQuizzes = ref<Quiz[]>([])
-const quiz = reactive<Quiz>({
-	time: '',
-	quiz: '',
-})
-
-const props = defineProps({
-	quizzes: {
-		type: Array as () => Quiz[],
-		default: () => [],
-	},
-	saveQuizzes: {
-		type: Function,
-		required: true,
-	},
-	duration: {
-		type: Number,
-		default: 0,
-	},
-})
-
-const addQuiz = () => {
-	quiz.time = `${getTimeInSeconds()}`
-	if (!isTimeValid() || !isFormComplete()) return
-
-	allQuizzes.value.push({
-		time: quiz.time,
-		quiz: quiz.quiz,
-	})
-
-	props.saveQuizzes(allQuizzes.value)
-
-	quiz.time = ''
-	quiz.quiz = ''
-}
-
-const getTimeInSeconds = () => {
-	if (quiz.time && !quiz.time.includes(':')) {
-		quiz.time = `${quiz.time}:00`
-	}
-	const timeParts = quiz.time.split(':')
-	const timeInSeconds = parseInt(timeParts[0]) * 60 + parseInt(timeParts[1])
-
-	return timeInSeconds
-}
-
-const isTimeValid = () => {
-	if (parseInt(quiz.time) > props.duration) {
-		toast.error(__('Time in video exceeds the total duration of the video.'))
-		return false
-	}
-	return true
-}
-
-const isFormComplete = () => {
-	if (!quiz.time) {
-		toast.error(__('Please enter a valid timestamp'))
-		return false
-	}
-
-	if (!quiz.quiz) {
-		toast.error(__('Please select a quiz'))
-		return false
-	}
-
-	return true
-}
-
-const removeQuiz = (selections: string, unselectAll: () => void) => {
-	Array.from(selections).forEach((selection) => {
-		const index = allQuizzes.value.findIndex((q) => q.quiz === selection)
-		if (index !== -1) {
-			allQuizzes.value.splice(index, 1)
-		}
-		unselectAll()
-	})
-	props.saveQuizzes(allQuizzes.value)
-}
-
-watch(
-	() => props.quizzes,
-	(newQuizzes) => {
-		allQuizzes.value = newQuizzes
-	},
-	{ immediate: true }
-)
-
-const columns = computed(() => {
-	return [
-		{
-			key: 'quiz',
-			label: __('Quiz'),
-		},
-		{
-			key: 'time',
-			label: __('Time in Video (minutes)'),
-			align: 'center',
-		},
-	]
-})
-</script>
--- a/frontend/src/components/Modals/ReviewModal.vue
+++ b/frontend/src/components/Modals/ReviewModal.vue
@@ -15,20 +15,27 @@
 	>
 		<template #body-content>
 			<div class="flex flex-col gap-4">
-				<Rating v-model="review.rating" :label="__('Rating')" />
-				<FormControl
-					:label="__('Review')"
-					type="textarea"
-					v-model="review.review"
-					:rows="5"
-				/>
+				<div>
+					<div class="mb-1.5 text-sm text-ink-gray-5">
+						{{ __('Rating') }}
+					</div>
+					<Rating v-model="review.rating" />
+				</div>
+				<div>
+					<div class="mb-1.5 text-sm text-ink-gray-5">
+						{{ __('Review') }}
+					</div>
+					<Textarea type="text" size="md" rows="5" v-model="review.review" />
+				</div>
 			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, FormControl, createResource, toast, Rating } from 'frappe-ui'
+import { Dialog, Textarea, createResource } from 'frappe-ui'
 import { reactive } from 'vue'
+import Rating from '@/components/Controls/Rating.vue'
+import { createToast } from '@/utils/'

 const show = defineModel()
 const reviews = defineModel('reloadReviews')
@@ -71,7 +78,11 @@ function submitReview(close) {
 			hasReviewed.value.reload()
 		},
 		onError(err) {
-			toast.error(err.messages?.[0] || err)
+			createToast({
+				text: err.messages?.[0] || err,
+				icon: 'x',
+				iconClasses: 'text-ink-red-4 bg-surface-red-4',
+			})
 		},
 	})
 	close()
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -1,5 +1,5 @@
 <template>
-	<Dialog v-model="show" :options="{ size: '5xl' }">
+	<Dialog v-model="show" :options="{ size: '4xl' }">
 		<template #body>
 			<div class="flex h-[calc(100vh_-_8rem)]">
 				<div class="flex w-52 shrink-0 flex-col bg-surface-gray-2 p-2">
@@ -51,16 +51,6 @@
 						:label="activeTab.label"
 						:description="activeTab.description"
 					/>
-					<EmailTemplates
-						v-else-if="activeTab.label === 'Email Templates'"
-						:label="activeTab.label"
-						:description="activeTab.description"
-					/>
-					<ZoomSettings
-						v-else-if="activeTab.label === 'Zoom Accounts'"
-						:label="activeTab.label"
-						:description="activeTab.description"
-					/>
 					<PaymentSettings
 						v-else-if="activeTab.label === 'Payment Gateway'"
 						:label="activeTab.label"
@@ -91,15 +81,13 @@
 import { Dialog, createDocumentResource, createResource } from 'frappe-ui'
 import { ref, computed, watch } from 'vue'
 import { useSettings } from '@/stores/settings'
-import SettingDetails from '@/components/Settings/SettingDetails.vue'
+import SettingDetails from '../SettingDetails.vue'
 import SidebarLink from '@/components/SidebarLink.vue'
-import Members from '@/components/Settings/Members.vue'
-import Evaluators from '@/components/Settings/Evaluators.vue'
-import Categories from '@/components/Settings/Categories.vue'
-import EmailTemplates from '@/components/Settings/EmailTemplates.vue'
-import BrandSettings from '@/components/Settings/BrandSettings.vue'
-import PaymentSettings from '@/components/Settings/PaymentSettings.vue'
-import ZoomSettings from '@/components/Settings/ZoomSettings.vue'
+import Members from '@/components/Members.vue'
+import Evaluators from '@/components/Evaluators.vue'
+import Categories from '@/components/Categories.vue'
+import BrandSettings from '@/components/BrandSettings.vue'
+import PaymentSettings from '@/components/PaymentSettings.vue'

 const show = defineModel()
 const doctype = ref('LMS Settings')
@@ -134,7 +122,7 @@ const tabsStructure = computed(() => {
 							label: 'Enable Learning Paths',
 							name: 'enable_learning_paths',
 							description:
-								'This will ensure students follow the assigned programs in order.',
+								'This will enforce students to go through programs assigned to them in the correct order.',
 							type: 'checkbox',
 						},
 						{
@@ -151,26 +139,11 @@ const tabsStructure = computed(() => {
 								'If enabled, it sends google calendar invite to the student for evaluations.',
 							type: 'checkbox',
 						},
-						{
-							type: 'Column Break',
-						},
-						{
-							label: 'Batch Confirmation Email Template',
-							name: 'batch_confirmation_template',
-							doctype: 'Email Template',
-							type: 'Link',
-						},
-						{
-							label: 'Certification Email Template',
-							name: 'certification_template',
-							doctype: 'Email Template',
-							type: 'Link',
-						},
 						{
 							label: 'Unsplash Access Key',
 							name: 'unsplash_access_key',
 							description:
-								'Allows users to pick a profile cover image from Unsplash. https://unsplash.com/documentation#getting-started.',
+								'Optional. If this is set, students can pick a cover image from the unsplash library for their profile page. https://unsplash.com/documentation#getting-started.',
 							type: 'password',
 						},
 					],
@@ -187,12 +160,6 @@ const tabsStructure = computed(() => {
 					description:
 						'Configure the payment gateway and other payment related settings',
 					fields: [
-						{
-							label: 'Default Currency',
-							name: 'default_currency',
-							type: 'Link',
-							doctype: 'Currency',
-						},
 						{
 							label: 'Payment Gateway',
 							name: 'payment_gateway',
@@ -200,7 +167,10 @@ const tabsStructure = computed(() => {
 							doctype: 'Payment Gateway',
 						},
 						{
-							type: 'Column Break',
+							label: 'Default Currency',
+							name: 'default_currency',
+							type: 'Link',
+							doctype: 'Currency',
 						},
 						{
 							label: 'Apply GST for India',
@@ -237,19 +207,9 @@ const tabsStructure = computed(() => {
 				},
 				{
 					label: 'Categories',
-					description: 'Double click to edit the category',
+					description: 'Manage the members of your learning system',
 					icon: 'Network',
 				},
-				{
-					label: 'Email Templates',
-					description: 'Manage the email templates for your learning system',
-					icon: 'MailPlus',
-				},
-				{
-					label: 'Zoom Accounts',
-					description: 'Manage the Zoom accounts for your learning system',
-					icon: 'Video',
-				},
 			],
 		},
 		{
@@ -275,6 +235,28 @@ const tabsStructure = computed(() => {
 							name: 'favicon',
 							type: 'Upload',
 						},
+						{
+							label: 'Footer Logo',
+							name: 'footer_logo',
+							type: 'Upload',
+						},
+						{
+							label: 'Address',
+							name: 'address',
+							type: 'textarea',
+							rows: 2,
+						},
+						{
+							label: 'Footer "Powered By"',
+							name: 'footer_powered',
+							type: 'textarea',
+							rows: 4,
+						},
+						{
+							label: 'Copyright',
+							name: 'copyright',
+							type: 'text',
+						},
 					],
 				},
 				{
@@ -293,8 +275,8 @@ const tabsStructure = computed(() => {
 							type: 'checkbox',
 						},
 						{
-							label: 'Certified Members',
-							name: 'certified_members',
+							label: 'Certified Participants',
+							name: 'certified_participants',
 							type: 'checkbox',
 						},
 						{
@@ -317,64 +299,47 @@ const tabsStructure = computed(() => {
 						},
 					],
 				},
+				{
+					label: 'Email Templates',
+					icon: 'MailPlus',
+					fields: [
+						{
+							label: 'Batch Confirmation Template',
+							name: 'batch_confirmation_template',
+							doctype: 'Email Template',
+							type: 'Link',
+						},
+						{
+							label: 'Certification Template',
+							name: 'certification_template',
+							doctype: 'Email Template',
+							type: 'Link',
+						},
+						{
+							label: 'Assignment Submission Template',
+							name: 'assignment_submission_template',
+							doctype: 'Email Template',
+							type: 'Link',
+						},
+					],
+				},
 				{
 					label: 'Signup',
 					icon: 'LogIn',
 					fields: [
 						{
-							label: 'Identify User Category',
-							name: 'user_category',
-							type: 'checkbox',
-							description:
-								'Enable this option to identify the user category during signup.',
-						},
-						{
-							label: 'Disable signup',
-							name: 'disable_signup',
-							type: 'checkbox',
-							description:
-								'New users will have to be manually registered by Admins.',
-						},
-						{
-							type: 'Column Break',
-						},
-						{
-							label: 'Signup Consent HTML',
+							label: 'Custom Content',
 							name: 'custom_signup_content',
 							type: 'Code',
 							mode: 'htmlmixed',
 							rows: 10,
 						},
-					],
-				},
-				{
-					label: 'SEO',
-					icon: 'Search',
-					fields: [
 						{
-							label: 'Meta Description',
-							name: 'meta_description',
-							type: 'textarea',
-							rows: 4,
+							label: 'Ask for Occupation',
+							name: 'user_category',
+							type: 'checkbox',
 							description:
-								"This description will be shown on lists and pages that don't have meta description",
-						},
-						{
-							label: 'Meta Keywords',
-							name: 'meta_keywords',
-							type: 'textarea',
-							rows: 4,
-							description:
-								'Comma separated keywords for search engines to find your website.',
-						},
-						{
-							type: 'Column Break',
-						},
-						{
-							label: 'Meta Image',
-							name: 'meta_image',
-							type: 'Upload',
-							size: 'lg',
+								'Enable this option to ask users to select their occupation during the signup process.',
 						},
 					],
 				},
--- a/frontend/src/components/Modals/StudentModal.vue
+++ b/frontend/src/components/Modals/StudentModal.vue
@@ -19,27 +19,20 @@
 					doctype="User"
 					v-model="student"
 					:filters="{ ignore_user_type: 1 }"
-					:onCreate="
-						(value, close) => {
-							openSettings('Members', close)
-						}
-					"
 				/>
 			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
-import { Dialog, createResource, toast } from 'frappe-ui'
-import { ref, inject } from 'vue'
+import { Dialog, createResource } from 'frappe-ui'
+import { ref } from 'vue'
 import Link from '@/components/Controls/Link.vue'
+import { showToast } from '@/utils'
 import { useOnboarding } from 'frappe-ui/frappe'
-import { openSettings } from '@/utils'

 const students = defineModel('reloadStudents')
-const batchModal = defineModel('batchModal')
 const student = ref()
-const user = inject('$user')
 const { updateOnboardingStep } = useOnboarding('learning')
 const show = defineModel()

@@ -68,16 +61,13 @@ const addStudent = (close) => {
 		{},
 		{
 			onSuccess() {
-				if (user.data?.is_system_manager)
-					updateOnboardingStep('add_batch_student')
-
 				students.value.reload()
-				batchModal.value.reload()
 				student.value = null
+				updateOnboardingStep('add_batch_student')
 				close()
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast(__('Error'), __(err.messages?.[0] || err), 'x')
 			},
 		}
 	)
--- a/frontend/src/components/Modals/ZoomAccountModal.vue
+++ b/frontend/src/components/Modals/ZoomAccountModal.vue
@@ -1,206 +0,0 @@
-<template>
-	<Dialog
-		v-model="show"
-		:options="{
-			title:
-				accountID === 'new' ? __('New Zoom Account') : __('Edit Zoom Account'),
-			size: 'xl',
-			actions: [
-				{
-					label: __('Save'),
-					variant: 'solid',
-					onClick: ({ close }) => {
-						saveAccount(close)
-					},
-				},
-			],
-		}"
-	>
-		<template #body-content>
-			<div class="mb-4">
-				<FormControl
-					v-model="account.enabled"
-					:label="__('Enabled')"
-					type="checkbox"
-				/>
-			</div>
-			<div class="grid grid-cols-2 gap-5">
-				<FormControl
-					v-model="account.name"
-					:label="__('Account Name')"
-					type="text"
-					:required="true"
-				/>
-				<FormControl
-					v-model="account.client_id"
-					:label="__('Client ID')"
-					type="text"
-					:required="true"
-				/>
-				<Link
-					v-model="account.member"
-					:label="__('Member')"
-					doctype="Course Evaluator"
-					:onCreate="(value, close) => openSettings('Members', close)"
-					:required="true"
-				/>
-				<FormControl
-					v-model="account.client_secret"
-					:label="__('Client Secret')"
-					type="password"
-					:required="true"
-				/>
-				<FormControl
-					v-model="account.account_id"
-					:label="__('Account ID')"
-					type="text"
-					:required="true"
-				/>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup lang="ts">
-import { call, Dialog, FormControl, toast } from 'frappe-ui'
-import { inject, reactive, watch } from 'vue'
-import { User } from '@/components/Settings/types'
-import { openSettings, cleanError } from '@/utils'
-import Link from '@/components/Controls/Link.vue'
-
-interface ZoomAccount {
-	name: string
-	account_name: string
-	enabled: boolean
-	member: string
-	account_id: string
-	client_id: string
-	client_secret: string
-}
-
-interface ZoomAccounts {
-	data: ZoomAccount[]
-	reload: () => void
-	insert: {
-		submit: (
-			data: ZoomAccount,
-			options: { onSuccess: () => void; onError: (err: any) => void }
-		) => void
-	}
-}
-
-const show = defineModel('show')
-const user = inject<User | null>('$user')
-const zoomAccounts = defineModel<ZoomAccounts>('zoomAccounts')
-
-const account = reactive({
-	name: '',
-	enabled: false,
-	member: user?.data?.name || '',
-	account_id: '',
-	client_id: '',
-	client_secret: '',
-})
-
-const props = defineProps({
-	accountID: {
-		type: String,
-		default: 'new',
-	},
-})
-
-watch(
-	() => props.accountID,
-	(val) => {
-		if (val != 'new') {
-			zoomAccounts.value?.data.forEach((acc) => {
-				if (acc.name === val) {
-					account.name = acc.name
-					account.enabled = acc.enabled || false
-					account.member = acc.member
-					account.account_id = acc.account_id
-					account.client_id = acc.client_id
-					account.client_secret = acc.client_secret
-				}
-			})
-		}
-	}
-)
-
-watch(show, (val) => {
-	if (!val) {
-		account.name = ''
-		account.enabled = false
-		account.member = user?.data?.name || ''
-		account.account_id = ''
-		account.client_id = ''
-		account.client_secret = ''
-	}
-})
-
-const saveAccount = (close) => {
-	if (props.accountID == 'new') {
-		createAccount(close)
-	} else {
-		updateAccount(close)
-	}
-}
-
-const createAccount = (close) => {
-	zoomAccounts.value?.insert.submit(
-		{
-			account_name: account.name,
-			...account,
-		},
-		{
-			onSuccess() {
-				zoomAccounts.value?.reload()
-				close()
-				toast.success(__('Zoom Account created successfully'))
-			},
-			onError(err) {
-				close()
-				toast.error(
-					cleanError(err.messages[0]) || __('Error creating Zoom Account')
-				)
-			},
-		}
-	)
-}
-
-const updateAccount = async (close) => {
-	if (props.accountID != account.name) {
-		await renameDoc()
-	}
-	setValue(close)
-}
-
-const renameDoc = async () => {
-	await call('frappe.client.rename_doc', {
-		doctype: 'LMS Zoom Settings',
-		old_name: props.accountID,
-		new_name: account.name,
-	})
-}
-
-const setValue = (close) => {
-	zoomAccounts.value?.setValue.submit(
-		{
-			...account,
-			name: account.name,
-		},
-		{
-			onSuccess() {
-				zoomAccounts.value?.reload()
-				close()
-				toast.success(__('Zoom Account updated successfully'))
-			},
-			onError(err) {
-				close()
-				toast.error(
-					cleanError(err.messages[0]) || __('Error updating Zoom Account')
-				)
-			},
-		}
-	)
-}
-</script>
--- a/frontend/src/components/OnboardingBanner.vue
+++ b/frontend/src/components/OnboardingBanner.vue
@@ -0,0 +1,159 @@
+<template>
+	<div v-if="showOnboardingBanner && onboardingDetails.data">
+		<Tooltip :text="__('Skip Onboarding')" placement="left">
+			<X
+				class="w-4 h-4 stroke-1 absolute top-2 right-2 cursor-pointer mr-1"
+				@click="skipOnboarding.reload()"
+			/>
+		</Tooltip>
+		<div class="flex items-center justify-evenly bg-surface-gray-2 p-10">
+			<div
+				@click="redirectToCourseForm()"
+				class="flex items-center space-x-2"
+				:class="{
+					'cursor-pointer': !onboardingDetails.data.course_created?.length,
+				}"
+			>
+				<span
+					v-if="onboardingDetails.data.course_created?.length"
+					class="py-1 px-1 bg-surface-white rounded-full"
+				>
+					<Check class="h-4 w-4 stroke-2 text-ink-green-3" />
+				</span>
+				<span
+					v-else
+					class="font-semibold bg-surface-white px-2 py-1 rounded-full"
+				>
+					1
+				</span>
+				<span class="text-lg font-semibold">
+					{{ __('Create a course') }}
+				</span>
+			</div>
+			<div
+				@click="redirectToChapterForm()"
+				class="flex items-center space-x-2"
+				:class="{
+					'cursor-pointer':
+						onboardingDetails.data.course_created?.length &&
+						!onboardingDetails.data.chapter_created?.length,
+					'text-ink-gray-3': !onboardingDetails.data.course_created?.length,
+				}"
+			>
+				<span
+					v-if="onboardingDetails.data.chapter_created?.length"
+					class="py-1 px-1 bg-surface-white rounded-full"
+				>
+					<Check class="h-4 w-4 stroke-2 text-ink-green-3" />
+				</span>
+				<span
+					v-else
+					class="font-semibold bg-surface-white px-2 py-1 rounded-full"
+				>
+					2
+				</span>
+				<span class="text-lg font-semibold">
+					{{ __('Add a chapter') }}
+				</span>
+			</div>
+			<div
+				@click="redirectToLessonForm()"
+				class="flex items-center space-x-2"
+				:class="{
+					'cursor-pointer':
+						onboardingDetails.data.course_created?.length &&
+						onboardingDetails.data.chapter_created?.length,
+					'text-ink-gray-3':
+						!onboardingDetails.data.course_created?.length ||
+						!onboardingDetails.data.chapter_created?.length,
+				}"
+			>
+				<span
+					v-if="onboardingDetails.data.lesson_created?.length"
+					class="py-1 px-1 bg-surface-white rounded-full"
+				>
+					<Check class="h-4 w-4 stroke-2 text-ink-green-3" />
+				</span>
+				<span class="font-semibold bg-surface-white px-2 py-1 rounded-full">
+					3
+				</span>
+				<span class="text-lg font-semibold">
+					{{ __('Add a lesson') }}
+				</span>
+			</div>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { Check, X } from 'lucide-vue-next'
+import { useRouter } from 'vue-router'
+import { useSettings } from '@/stores/settings'
+import { createResource, Tooltip } from 'frappe-ui'
+
+const showOnboardingBanner = ref(false)
+const settings = useSettings()
+const onboardingDetails = settings.onboardingDetails
+const router = useRouter()
+
+watch(onboardingDetails, () => {
+	if (!onboardingDetails.data?.is_onboarded) {
+		showOnboardingBanner.value = true
+	} else {
+		showOnboardingBanner.value = false
+	}
+})
+
+const redirectToCourseForm = () => {
+	if (onboardingDetails.data?.course_created.length) {
+		return
+	} else {
+		router.push({ name: 'CourseForm', params: { courseName: 'new' } })
+	}
+}
+
+const redirectToChapterForm = () => {
+	if (!onboardingDetails.data?.course_created.length) {
+		return
+	} else {
+		router.push({
+			name: 'CourseForm',
+			params: {
+				courseName: onboardingDetails.data?.first_course,
+			},
+		})
+	}
+}
+
+const redirectToLessonForm = () => {
+	if (!onboardingDetails.data?.course_created.length) {
+		return
+	} else if (!onboardingDetails.data?.chapter_created.length) {
+		return
+	} else {
+		router.push({
+			name: 'LessonForm',
+			params: {
+				courseName: onboardingDetails.data?.first_course,
+				chapterNumber: 1,
+				lessonNumber: 1,
+			},
+		})
+	}
+}
+
+const skipOnboarding = createResource({
+	url: 'frappe.client.set_value',
+	makeParams() {
+		return {
+			doctype: 'LMS Settings',
+			name: 'LMS Settings',
+			fieldname: 'is_onboarding_complete',
+			value: 1,
+		}
+	},
+	onSuccess(data) {
+		onboardingDetails.reload()
+	},
+})
+</script>
--- a/frontend/src/components/Settings/PaymentSettings.vue
+++ b/frontend/src/components/Settings/PaymentSettings.vue
@@ -12,13 +12,13 @@
            /> -->
 		</div>
 		<div class="overflow-y-scroll">
-			<div class="flex flex-col divide-y">
-				<SettingFields :fields="fields" :data="data.doc" />
+			<div class="flex space-x-4">
+				<SettingFields :fields="fields" :data="data.doc" class="w-1/2" />
 				<SettingFields
 					v-if="paymentGateway.data"
 					:fields="paymentGateway.data.fields"
 					:data="paymentGateway.data.data"
-					class="pt-5 my-0"
+					class="w-1/2"
 				/>
 			</div>
 		</div>
@@ -30,9 +30,9 @@
 	</div>
 </template>
 <script setup>
-import SettingFields from '@/components/Settings/SettingFields.vue'
+import SettingFields from '@/components/SettingFields.vue'
 import { createResource, Badge, Button } from 'frappe-ui'
-import { watch } from 'vue'
+import { watch, ref } from 'vue'

 const props = defineProps({
 	label: {
@@ -60,28 +60,9 @@ const paymentGateway = createResource({
 			payment_gateway: props.data.doc.payment_gateway,
 		}
 	},
-	transform(data) {
-		arrangeFields(data.fields)
-		return data
-	},
 	auto: true,
 })

-const arrangeFields = (fields) => {
-	fields = fields.sort((a, b) => {
-		if (a.type === 'Upload' && b.type !== 'Upload') {
-			return 1
-		} else if (a.type !== 'Upload' && b.type === 'Upload') {
-			return -1
-		}
-		return 0
-	})
-
-	fields.splice(3, 0, {
-		type: 'Column Break',
-	})
-}
-
 const saveSettings = createResource({
 	url: 'frappe.client.set_value',
 	makeParams(values) {
--- a/frontend/src/components/Quiz.vue
+++ b/frontend/src/components/Quiz.vue
@@ -1,11 +1,8 @@
 <template>
 	<div v-if="quiz.data">
 		<div
-			class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-3 leading-5"
+			class="bg-surface-blue-2 space-y-1 py-2 px-2 mb-4 rounded-md text-sm text-ink-blue-2"
 		>
-			<div v-if="inVideo">
-				{{ __('You will have to complete the quiz to continue the video') }}
-			</div>
 			<div class="leading-5">
 				{{
 					__('This quiz consists of {0} questions.').format(questions.length)
@@ -58,30 +55,19 @@
 				<div class="font-semibold text-lg text-ink-gray-9">
 					{{ quiz.data.title }}
 				</div>
-				<div class="flex items-center justify-center space-x-2 mt-4">
-					<Button
-						v-if="
-							!quiz.data.max_attempts ||
-							attempts.data?.length < quiz.data.max_attempts
-						"
-						variant="solid"
-						@click="startQuiz"
-					>
-						<span>
-							{{ inVideo ? __('Start the Quiz') : __('Start') }}
-						</span>
-					</Button>
-					<Button v-if="inVideo" @click="props.backToVideo()">
-						{{ __('Resume Video') }}
-					</Button>
-				</div>
-				<div
+				<Button
 					v-if="
-						quiz.data.max_attempts &&
-						attempts.data?.length >= quiz.data.max_attempts
+						!quiz.data.max_attempts ||
+						attempts.data?.length < quiz.data.max_attempts
 					"
-					class="leading-5 text-ink-gray-7"
+					@click="startQuiz"
+					class="mt-2"
 				>
+					<span>
+						{{ __('Start') }}
+					</span>
+				</Button>
+				<div v-else class="leading-5 text-ink-gray-7">
 					{{
 						__(
 							'You have already exceeded the maximum number of attempts allowed for this quiz.'
@@ -261,23 +247,18 @@
 					)
 				}}
 			</div>
-			<div class="space-x-2">
-				<Button
-					@click="resetQuiz()"
-					class="mt-2"
-					v-if="
-						!quiz.data.max_attempts ||
-						attempts?.data.length < quiz.data.max_attempts
-					"
-				>
-					<span>
-						{{ __('Try Again') }}
-					</span>
-				</Button>
-				<Button v-if="inVideo" @click="props.backToVideo()">
-					{{ __('Resume Video') }}
-				</Button>
-			</div>
+			<Button
+				@click="resetQuiz()"
+				class="mt-2"
+				v-if="
+					!quiz.data.max_attempts ||
+					attempts?.data.length < quiz.data.max_attempts
+				"
+			>
+				<span>
+					{{ __('Try Again') }}
+				</span>
+			</Button>
 		</div>
 		<div
 			v-if="
@@ -310,9 +291,9 @@ import {
 	ListView,
 	TextEditor,
 	FormControl,
-	toast,
 } from 'frappe-ui'
 import { ref, watch, reactive, inject, computed } from 'vue'
+import { createToast, showToast } from '@/utils/'
 import { CheckCircle, XCircle, MinusCircle } from 'lucide-vue-next'
 import { timeAgo } from '@/utils'
 import { useRouter } from 'vue-router'
@@ -327,20 +308,13 @@ let questions = reactive([])
 const possibleAnswer = ref(null)
 const timer = ref(0)
 let timerInterval = null
+const router = useRouter()

 const props = defineProps({
 	quizName: {
 		type: String,
 		required: true,
 	},
-	inVideo: {
-		type: Boolean,
-		default: false,
-	},
-	backToVideo: {
-		type: Function,
-		default: () => {},
-	},
 })

 const quiz = createResource({
@@ -520,7 +494,12 @@ const getAnswers = () => {
 const checkAnswer = () => {
 	let answers = getAnswers()
 	if (!answers.length) {
-		toast.warning(__('Please select an option'))
+		createToast({
+			title: 'Please select an option',
+			icon: 'alert-circle',
+			iconClasses: 'text-yellow-600 bg-yellow-100 rounded-full',
+			position: 'top-center',
+		})
 		return
 	}

@@ -610,7 +589,7 @@ const createSubmission = () => {
 				const errorTitle = err?.message || ''
 				if (errorTitle.includes('MaximumAttemptsExceededError')) {
 					const errorMessage = err.messages?.[0] || err
-					toast.error(__(errorMessage))
+					showToast(__('Error'), __(errorMessage), 'x')
 					setTimeout(() => {
 						window.location.reload()
 					}, 3000)
@@ -637,15 +616,11 @@ const getInstructions = (question) => {
 }

 const markLessonProgress = () => {
-	let pathname = window.location.pathname.split('/')
-	if (pathname[2] != 'courses') return
-	let lessonIndex = pathname.pop().split('-')
-
-	if (lessonIndex.length == 2) {
+	if (router.currentRoute.value.name == 'Lesson') {
 		call('lms.lms.api.mark_lesson_progress', {
-			course: pathname[3],
-			chapter_number: lessonIndex[0],
-			lesson_number: lessonIndex[1],
+			course: router.currentRoute.value.params.courseName,
+			chapter_number: router.currentRoute.value.params.chapterNumber,
+			lesson_number: router.currentRoute.value.params.lessonNumber,
 		})
 	}
 }
@@ -678,8 +653,3 @@ const getSubmissionColumns = () => {
 	]
 }
 </script>
-<style>
-p {
-	line-height: 1.5rem;
-}
-</style>
--- a/frontend/src/components/Settings/SettingDetails.vue
+++ b/frontend/src/components/Settings/SettingDetails.vue
@@ -27,8 +27,9 @@
 </template>

 <script setup>
-import { Button, Badge, toast } from 'frappe-ui'
-import SettingFields from '@/components/Settings/SettingFields.vue'
+import { Button, Badge } from 'frappe-ui'
+import SettingFields from '@/components/SettingFields.vue'
+import { showToast } from '@/utils'

 const props = defineProps({
 	fields: {
@@ -50,9 +51,7 @@ const props = defineProps({

 const update = () => {
 	props.fields.forEach((f) => {
-		if (f.type == 'Upload') {
-			props.data.doc[f.name] = f.value ? f.value.file_url : null
-		} else if (f.type != 'Column Break') {
+		if (f.type != 'Column Break') {
 			props.data.doc[f.name] = f.value
 		}
 	})
@@ -60,7 +59,7 @@ const update = () => {
 		{},
 		{
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast(__('Error'), err.messages?.[0] || err, 'x')
 			},
 		}
 	)
--- a/frontend/src/components/Settings/SettingFields.vue
+++ b/frontend/src/components/Settings/SettingFields.vue
@@ -6,7 +6,7 @@
 		<div v-for="(column, index) in columns" :key="index">
 			<div
 				class="flex flex-col space-y-5"
-				:class="columns.length > 1 ? 'w-[21rem]' : 'w-full'"
+				:class="columns.length > 1 ? 'w-72' : 'w-full'"
 			>
 				<div v-for="field in column">
 					<Link
@@ -14,7 +14,6 @@
 						v-model="data[field.name]"
 						:doctype="field.doctype"
 						:label="__(field.label)"
-						:description="__(field.description)"
 					/>

 					<div v-else-if="field.type == 'Code'">
@@ -55,32 +54,21 @@
 						<div v-else>
 							<div class="flex items-center text-sm space-x-2">
 								<div
-									class="flex items-center justify-center rounded border border-outline-gray-1 bg-surface-gray-2"
-									:class="field.size == 'lg' ? 'px-5 py-5' : 'px-20 py-8'"
+									class="flex items-center justify-center rounded border border-outline-gray-modals w-[10rem] py-5"
 								>
-									<img
-										:src="data[field.name]?.file_url || data[field.name]"
-										class="rounded"
-										:class="field.size == 'lg' ? 'w-36' : 'size-6'"
-									/>
+									<img :src="data[field.name]?.file_url" class="h-6 rounded" />
 								</div>
 								<div class="flex flex-col flex-wrap">
 									<span class="break-all text-ink-gray-9">
-										{{
-											data[field.name]?.file_name ||
-											data[field.name].split('/').pop()
-										}}
+										{{ data[field.name]?.file_name }}
 									</span>
-									<span
-										v-if="data[field.name]?.file_size"
-										class="text-sm text-ink-gray-5 mt-1"
-									>
+									<span class="text-sm text-ink-gray-5 mt-1">
 										{{ getFileSize(data[field.name]?.file_size) }}
 									</span>
 								</div>
 								<X
 									@click="data[field.name] = null"
-									class="border text-ink-gray-7 border-outline-gray-3 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
+									class="bg-surface-gray-5 rounded-md cursor-pointer stroke-1.5 w-5 h-5 p-1 ml-4"
 								/>
 							</div>
 						</div>
@@ -103,7 +91,6 @@
 						:rows="field.rows"
 						:options="field.options"
 						:description="field.description"
-						:class="columns.length > 1 ? 'w-full' : 'w-1/2'"
 					/>
 				</div>
 			</div>
--- a/frontend/src/components/Settings/Categories.vue
+++ b/frontend/src/components/Settings/Categories.vue
@@ -1,216 +0,0 @@
-<template>
-	<div class="flex flex-col min-h-0 text-base">
-		<div class="flex items-center justify-between mb-5">
-			<div class="flex flex-col space-y-2">
-				<div class="text-xl font-semibold text-ink-gray-9">
-					{{ label }}
-				</div>
-				<div class="text-xs text-ink-gray-5">
-					{{ __(description) }}
-				</div>
-			</div>
-			<div class="flex items-center space-x-5">
-				<div
-					class="flex items-center space-x-1 text-ink-amber-3 border border-outline-amber-1 bg-surface-amber-1 rounded-lg px-2 py-1"
-					v-if="saving"
-				>
-					<LoadingIndicator class="size-2" />
-					<span class="text-xs">
-						{{ __('saving...') }}
-					</span>
-				</div>
-				<Button @click="() => showCategoryForm()">
-					<template #prefix>
-						<Plus v-if="!showForm" class="h-3 w-3 stroke-1.5" />
-						<X v-else class="h-3 w-3 stroke-1.5" />
-					</template>
-					{{ showForm ? __('Close') : __('New') }}
-				</Button>
-			</div>
-		</div>
-
-		<div
-			v-if="showForm"
-			class="flex items-center justify-between my-4 space-x-2"
-		>
-			<FormControl
-				ref="categoryInput"
-				v-model="category"
-				:placeholder="__('Category Name')"
-				class="flex-1"
-			/>
-			<Button @click="addCategory()" variant="subtle">
-				{{ __('Add') }}
-			</Button>
-		</div>
-
-		<div class="overflow-y-scroll">
-			<div class="divide-y space-y-2">
-				<div
-					v-for="(cat, index) in categories.data"
-					:key="cat.name"
-					class="pt-2"
-				>
-					<div
-						v-if="editing?.name !== cat.name"
-						class="flex items-center justify-between group text-sm"
-					>
-						<div @dblclick="allowEdit(cat, index)">
-							{{ cat.category }}
-						</div>
-						<Button
-							variant="ghost"
-							theme="red"
-							class="invisible group-hover:visible"
-							@click="deleteCategory(cat.name)"
-						>
-							<template #icon>
-								<Trash2 class="size-4 stroke-1.5 text-ink-red-4" />
-							</template>
-						</Button>
-					</div>
-					<FormControl
-						v-else
-						:ref="(el) => (editInputRef[index] = el)"
-						v-model="editedValue"
-						type="text"
-						class="w-full"
-						@keyup.enter="saveChanges(cat.name, editedValue)"
-					/>
-				</div>
-			</div>
-		</div>
-	</div>
-</template>
-<script setup>
-import {
-	Button,
-	FormControl,
-	LoadingIndicator,
-	createListResource,
-	createResource,
-	toast,
-} from 'frappe-ui'
-import { Plus, Trash2, X } from 'lucide-vue-next'
-import { ref } from 'vue'
-import { cleanError } from '@/utils'
-
-const showForm = ref(false)
-const category = ref(null)
-const categoryInput = ref(null)
-const saving = ref(false)
-const editing = ref(null)
-const editedValue = ref('')
-const editInputRef = ref([])
-
-const props = defineProps({
-	label: {
-		type: String,
-		required: true,
-	},
-	description: {
-		type: String,
-		default: '',
-	},
-})
-
-const categories = createListResource({
-	doctype: 'LMS Category',
-	fields: ['name', 'category'],
-	auto: true,
-})
-
-const addCategory = () => {
-	categories.insert.submit(
-		{
-			category: category.value,
-		},
-		{
-			onSuccess(data) {
-				categories.reload()
-				category.value = null
-				showForm.value = false
-				toast.success(__('Category added successfully'))
-			},
-			onError(err) {
-				toast.error(__(cleanError(err.messages[0]) || 'Unable to add category'))
-			},
-		}
-	)
-}
-
-const showCategoryForm = () => {
-	showForm.value = !showForm.value
-	setTimeout(() => {
-		categoryInput.value.$el.querySelector('input').focus()
-	}, 0)
-}
-
-const updateCategory = createResource({
-	url: 'frappe.client.rename_doc',
-	makeParams(values) {
-		return {
-			doctype: 'LMS Category',
-			old_name: values.name,
-			new_name: values.category,
-		}
-	},
-})
-
-const update = (name, value) => {
-	saving.value = true
-	updateCategory.submit(
-		{
-			name: name,
-			category: value,
-		},
-		{
-			onSuccess() {
-				saving.value = false
-				categories.reload()
-				editing.value = null
-				editedValue.value = ''
-				toast.success(__('Category updated successfully'))
-			},
-			onError(err) {
-				saving.value = false
-				editing.value = null
-				editedValue.value = ''
-				toast.error(
-					__(cleanError(err.messages[0]) || 'Unable to update category')
-				)
-			},
-		}
-	)
-}
-
-const deleteCategory = (name) => {
-	saving.value = true
-	categories.delete.submit(name, {
-		onSuccess() {
-			saving.value = false
-			categories.reload()
-			toast.success(__('Category deleted successfully'))
-		},
-		onError(err) {
-			saving.value = false
-			toast.error(
-				__(cleanError(err.messages[0]) || 'Unable to delete category')
-			)
-		},
-	})
-}
-
-const saveChanges = (name, value) => {
-	saving.value = true
-	update(name, value)
-}
-
-const allowEdit = (cat, index) => {
-	editing.value = cat
-	editedValue.value = cat.category
-	setTimeout(() => {
-		editInputRef.value[index].$el.querySelector('input').focus()
-	}, 0)
-}
-</script>
--- a/frontend/src/components/Settings/EmailTemplates.vue
+++ b/frontend/src/components/Settings/EmailTemplates.vue
@@ -1,160 +0,0 @@
-<template>
-	<div class="flex flex-col min-h-0 text-base">
-		<div class="flex items-center justify-between mb-5">
-			<div class="flex flex-col space-y-2">
-				<div class="text-xl font-semibold text-ink-gray-9">
-					{{ label }}
-				</div>
-				<!-- <div class="text-xs text-ink-gray-5">
-					{{ __(description) }}
-				</div> -->
-			</div>
-			<div class="flex items-center space-x-5">
-				<Button @click="openTemplateForm('new')">
-					<template #prefix>
-						<Plus class="h-3 w-3 stroke-1.5" />
-					</template>
-					{{ __('New') }}
-				</Button>
-			</div>
-		</div>
-		<div v-if="emailTemplates.data?.length" class="overflow-y-scroll">
-			<ListView
-				:columns="columns"
-				:rows="emailTemplates.data"
-				row-key="name"
-				:options="{
-					showTooltip: false,
-					onRowClick: (row) => {
-						openTemplateForm(row.name)
-					},
-				}"
-			>
-				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
-				>
-					<ListHeaderItem :item="item" v-for="item in columns">
-						<template #prefix="{ item }">
-							<component
-								v-if="item.icon"
-								:is="item.icon"
-								class="h-4 w-4 stroke-1.5 ml-4"
-							/>
-						</template>
-					</ListHeaderItem>
-				</ListHeader>
-
-				<ListRows>
-					<ListRow :row="row" v-for="row in emailTemplates.data">
-						<template #default="{ column, item }">
-							<ListRowItem :item="row[column.key]" :align="column.align">
-								<div class="leading-5 text-sm">
-									{{ row[column.key] }}
-								</div>
-							</ListRowItem>
-						</template>
-					</ListRow>
-				</ListRows>
-
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="removeTemplate(selections, unselectAll)"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
-					</template>
-				</ListSelectBanner>
-			</ListView>
-		</div>
-	</div>
-	<EmailTemplateModal
-		v-model="showForm"
-		v-model:emailTemplates="emailTemplates"
-		:templateID="selectedTemplate"
-	/>
-</template>
-<script setup lang="ts">
-import {
-	Button,
-	call,
-	createListResource,
-	ListView,
-	ListHeader,
-	ListHeaderItem,
-	ListSelectBanner,
-	ListRows,
-	ListRow,
-	ListRowItem,
-	toast,
-} from 'frappe-ui'
-import { computed, ref } from 'vue'
-import { Plus, Trash2 } from 'lucide-vue-next'
-import EmailTemplateModal from '@/components/Modals/EmailTemplateModal.vue'
-
-const props = defineProps({
-	label: {
-		type: String,
-		required: true,
-	},
-	description: {
-		type: String,
-		default: '',
-	},
-})
-
-const showForm = ref(false)
-const readOnlyMode = window.read_only_mode
-const selectedTemplate = ref(null)
-
-const emailTemplates = createListResource({
-	doctype: 'Email Template',
-	fields: ['name', 'subject', 'use_html', 'response', 'response_html'],
-	auto: true,
-	orderBy: 'modified desc',
-	cache: 'email-templates',
-})
-
-const removeTemplate = (selections, unselectAll) => {
-	call('lms.lms.api.delete_documents', {
-		doctype: 'Email Template',
-		documents: Array.from(selections),
-	})
-		.then(() => {
-			emailTemplates.reload()
-			toast.success(__('Email Templates deleted successfully'))
-			unselectAll()
-		})
-		.catch((err) => {
-			toast.error(
-				cleanError(err.messages[0]) || __('Error deleting email templates')
-			)
-		})
-}
-
-const openTemplateForm = (templateID) => {
-	if (readOnlyMode) {
-		return
-	}
-	selectedTemplate.value = templateID
-	showForm.value = true
-}
-
-const columns = computed(() => {
-	return [
-		{
-			label: 'Name',
-			key: 'name',
-			width: '20rem',
-		},
-		{
-			label: 'Subject',
-			key: 'subject',
-			width: '25rem',
-		},
-	]
-})
-</script>
--- a/frontend/src/components/Settings/ZoomSettings.vue
+++ b/frontend/src/components/Settings/ZoomSettings.vue
@@ -1,188 +0,0 @@
-<template>
-	<div class="flex flex-col min-h-0 text-base">
-		<div class="flex items-center justify-between mb-5">
-			<div class="flex flex-col space-y-2">
-				<div class="text-xl font-semibold text-ink-gray-9">
-					{{ label }}
-				</div>
-				<!-- <div class="text-xs text-ink-gray-5">
-					{{ __(description) }}
-				</div> -->
-			</div>
-			<div class="flex items-center space-x-5">
-				<Button @click="openForm('new')">
-					<template #prefix>
-						<Plus class="h-3 w-3 stroke-1.5" />
-					</template>
-					{{ __('New') }}
-				</Button>
-			</div>
-		</div>
-		<div v-if="zoomAccounts.data?.length" class="overflow-y-scroll">
-			<ListView
-				:columns="columns"
-				:rows="zoomAccounts.data"
-				row-key="name"
-				:options="{
-					showTooltip: false,
-					onRowClick: (row) => {
-						openForm(row.name)
-					},
-				}"
-			>
-				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
-				>
-					<ListHeaderItem :item="item" v-for="item in columns">
-						<template #prefix="{ item }">
-							<component
-								v-if="item.icon"
-								:is="item.icon"
-								class="h-4 w-4 stroke-1.5 ml-4"
-							/>
-						</template>
-					</ListHeaderItem>
-				</ListHeader>
-
-				<ListRows>
-					<ListRow :row="row" v-for="row in zoomAccounts.data">
-						<template #default="{ column, item }">
-							<ListRowItem :item="row[column.key]" :align="column.align">
-								<div v-if="column.key == 'enabled'">
-									<Badge v-if="row[column.key]" theme="blue">
-										{{ __('Enabled') }}
-									</Badge>
-									<Badge v-else theme="gray">
-										{{ __('Disabled') }}
-									</Badge>
-								</div>
-								<div v-else class="leading-5 text-sm">
-									{{ row[column.key] }}
-								</div>
-							</ListRowItem>
-						</template>
-					</ListRow>
-				</ListRows>
-
-				<ListSelectBanner>
-					<template #actions="{ unselectAll, selections }">
-						<div class="flex gap-2">
-							<Button
-								variant="ghost"
-								@click="removeAccount(selections, unselectAll)"
-							>
-								<Trash2 class="h-4 w-4 stroke-1.5" />
-							</Button>
-						</div>
-					</template>
-				</ListSelectBanner>
-			</ListView>
-		</div>
-	</div>
-	<ZoomAccountModal
-		v-model="showForm"
-		v-model:zoomAccounts="zoomAccounts"
-		:accountID="currentAccount"
-	/>
-</template>
-<script setup lang="ts">
-import {
-	Button,
-	Badge,
-	call,
-	createListResource,
-	ListView,
-	ListHeader,
-	ListHeaderItem,
-	ListRows,
-	ListRow,
-	ListRowItem,
-	ListSelectBanner,
-	toast,
-} from 'frappe-ui'
-import { computed, inject, onMounted, ref } from 'vue'
-import { Plus, Trash2 } from 'lucide-vue-next'
-import { cleanError } from '@/utils'
-import { User } from '@/components/Settings/types'
-import ZoomAccountModal from '@/components/Modals/ZoomAccountModal.vue'
-
-const user = inject<User | null>('$user')
-const showForm = ref(false)
-const currentAccount = ref<string | null>(null)
-
-const props = defineProps({
-	label: String,
-	description: String,
-})
-
-const zoomAccounts = createListResource({
-	doctype: 'LMS Zoom Settings',
-	fields: [
-		'name',
-		'enabled',
-		'member',
-		'member_name',
-		'account_id',
-		'client_id',
-		'client_secret',
-	],
-	cache: ['zoomAccounts'],
-})
-
-onMounted(() => {
-	fetchZoomAccounts()
-})
-
-const fetchZoomAccounts = () => {
-	if (!user?.data?.is_moderator && !user?.data?.is_evaluator) return
-
-	if (!user?.data?.is_moderator) {
-		zoomAccounts.update({
-			filters: {
-				member: user.data.name,
-			},
-		})
-	}
-	zoomAccounts.reload()
-}
-
-const openForm = (accountID: string) => {
-	currentAccount.value = accountID
-	showForm.value = true
-}
-
-const removeAccount = (selections, unselectAll) => {
-	call('lms.lms.api.delete_documents', {
-		doctype: 'LMS Zoom Settings',
-		documents: Array.from(selections),
-	})
-		.then(() => {
-			zoomAccounts.reload()
-			toast.success(__('Email Templates deleted successfully'))
-			unselectAll()
-		})
-		.catch((err) => {
-			toast.error(
-				cleanError(err.messages[0]) || __('Error deleting email templates')
-			)
-		})
-}
-
-const columns = computed(() => {
-	return [
-		{
-			label: __('Account'),
-			key: 'name',
-		},
-		{
-			label: __('Member'),
-			key: 'member_name',
-		},
-		{
-			label: __('Status'),
-			key: 'enabled',
-			align: 'center',
-		},
-	]
-})
-</script>
--- a/frontend/src/components/Settings/types.ts
+++ b/frontend/src/components/Settings/types.ts
@@ -1,16 +0,0 @@
-export interface User {
-    data: {
-        email: string
-        name: string
-        enabled: boolean
-        user_image: string
-        full_name: string
-        user_type: ['System User', 'Website User']
-        username: string
-        is_moderator: boolean
-        is_system_manager: boolean
-        is_evaluator: boolean
-        is_instructor: boolean
-        is_fc_site: boolean
-    }
-}
--- a/frontend/src/components/SidebarLink.vue
+++ b/frontend/src/components/SidebarLink.vue
@@ -61,7 +61,7 @@
 	</button>
 </template>
 <script setup>
-import { Tooltip } from 'frappe-ui'
+import { Tooltip, Button } from 'frappe-ui'
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 import * as icons from 'lucide-vue-next'
--- a/frontend/src/components/UpcomingEvaluations.vue
+++ b/frontend/src/components/UpcomingEvaluations.vue
@@ -1,11 +1,14 @@
 <template>
 	<div>
 		<div class="flex items-center justify-between mb-4">
-			<div class="text-lg text-ink-gray-9 font-semibold">
+			<div class="text-lg font-semibold">
 				{{ __('Upcoming Evaluations') }}
 			</div>
 			<Button
-				v-if="upcoming_evals.data?.length != evaluationCourses.length"
+				v-if="
+					!upcoming_evals.data?.length ||
+					upcoming_evals.length == courses.length
+				"
 				@click="openEvalModal"
 			>
 				{{ __('Schedule Evaluation') }}
@@ -14,9 +17,9 @@
 		<div v-if="upcoming_evals.data?.length">
 			<div class="grid grid-cols-3 gap-4">
 				<div v-for="evl in upcoming_evals.data">
-					<div class="border text-ink-gray-7 rounded-md p-3">
+					<div class="border rounded-md p-3">
 						<div class="flex justify-between mb-3">
-							<span class="font-semibold text-ink-gray-9 leading-5">
+							<span class="font-semibold leading-5">
 								{{ evl.course_title }}
 							</span>
 							<Menu
@@ -39,7 +42,7 @@
 									leave-to-class="transform scale-95 opacity-0"
 								>
 									<MenuItems
-										class="absolute mt-2 w-32 rounded-md bg-surface-white border p-1.5"
+										class="absolute mt-2 w-32 rounded-md bg-white shadow-lg p-1.5"
 									>
 										<MenuItem v-slot="{ active }">
 											<Button
@@ -79,11 +82,12 @@
 								{{ evl.evaluator_name }}
 							</span>
 						</div>
-						<div
-							v-if="evl.google_meet_link"
-							class="flex items-center justify-between space-x-2 mt-4"
-						>
-							<Button @click="openEvalCall(evl)" class="w-full">
+						<div class="flex items-center justify-between space-x-2 mt-4">
+							<Button
+								v-if="evl.google_meet_link"
+								@click="openEvalCall(evl)"
+								class="w-full"
+							>
 								<template #prefix>
 									<HeadsetIcon class="w-4 h-4 stroke-1.5" />
 								</template>
@@ -115,7 +119,7 @@ import {
 	HeadsetIcon,
 	EllipsisVertical,
 } from 'lucide-vue-next'
-import { inject, ref, getCurrentInstance, computed } from 'vue'
+import { inject, ref, getCurrentInstance } from 'vue'
 import { formatTime } from '../utils'
 import { Button, createResource, call } from 'frappe-ui'
 import EvaluationModal from '@/components/Modals/EvaluationModal.vue'
@@ -160,12 +164,6 @@ const openEvalCall = (evl) => {
 	window.open(evl.google_meet_link, '_blank')
 }

-const evaluationCourses = computed(() => {
-	return props.courses.filter((course) => {
-		return course.evaluator != ''
-	})
-})
-
 const cancelEvaluation = (evl) => {
 	$dialog({
 		title: __('Cancel this evaluation?'),
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -36,7 +36,7 @@
 						<span v-else> Learning </span>
 					</div>
 					<div
-						v-if="userResource.data"
+						v-if="userResource"
 						class="mt-1 text-sm text-ink-gray-7 leading-none"
 					>
 						{{ convertToTitleCase(userResource.data?.full_name) }}
@@ -72,7 +72,7 @@ import { usersStore } from '@/stores/user'
 import { useSettings } from '@/stores/settings'
 import { markRaw, watch, ref, onMounted, computed } from 'vue'
 import { createDialog } from '@/utils/dialogs'
-import SettingsModal from '@/components/Settings/Settings.vue'
+import SettingsModal from '@/components/Modals/Settings.vue'
 import FrappeCloudIcon from '@/components/Icons/FrappeCloudIcon.vue'
 import {
 	ChevronDown,
@@ -194,6 +194,18 @@ const userDropdownOptions = computed(() => {
 						)
 					},
 				},
+			],
+		},
+		{
+			group: '',
+			items: [
+				{
+					icon: Zap,
+					label: 'Powered by Learning',
+					onClick: () => {
+						window.open('https://frappe.io/learning', '_blank')
+					},
+				},
 				{
 					icon: LogOut,
 					label: 'Log out',
--- a/frontend/src/components/VideoBlock.vue
+++ b/frontend/src/components/VideoBlock.vue
@@ -1,129 +1,58 @@
 <template>
-	<div>
-		<div
-			v-if="quizzes.length && !showQuiz && readOnly"
-			class="bg-surface-blue-2 space-y-1 py-3 px-4 rounded-md text-sm text-ink-blue-3 leading-5"
+	<div ref="videoContainer" class="video-block group relative">
+		<video
+			@timeupdate="updateTime"
+			@ended="videoEnded"
+			@click="togglePlay"
+			oncontextmenu="return false"
+			class="rounded-lg border border-gray-100 group cursor-pointer"
+			ref="videoRef"
 		>
-			{{
-				__('This video contains {0} {1}:').format(
-					quizzes.length,
-					quizzes.length == 1 ? 'quiz' : 'quizzes'
-				)
-			}}
-
-			<div v-for="(quiz, index) in quizzes" class="pl-3 mt-1">
-				<span> {{ index + 1 }}. {{ quiz.quiz }} </span>
-				{{ __('at {0}').format(formatTimestamp(quiz.time)) }}
-			</div>
-		</div>
+			<source :src="fileURL" :type="type" />
+		</video>
 		<div
-			v-if="!showQuiz"
-			ref="videoContainer"
-			class="video-block relative group"
+			class="flex items-center space-x-2 bg-surface-gray-3 rounded-md p-0.5 absolute bottom-3 w-[98%] left-0 right-0 mx-auto invisible group-hover:visible"
 		>
-			<video
-				@timeupdate="updateTime"
-				@ended="videoEnded"
-				@click="togglePlay"
-				oncontextmenu="return false"
-				class="rounded-md border border-gray-100 cursor-pointer"
-				ref="videoRef"
-			>
-				<source :src="fileURL" :type="type" />
-			</video>
-			<div
-				v-if="!playing"
-				class="absolute inset-0 flex items-center justify-center cursor-pointer"
-				@click="playVideo"
-			>
-				<div
-					class="rounded-full p-4 pl-4.5"
-					style="
-						background: radial-gradient(
-							circle,
-							rgba(0, 0, 0, 0.3) 0%,
-							rgba(0, 0, 0, 0.4) 50%
-						);
-					"
-				>
-					<Play />
-				</div>
-			</div>
-			<div
-				class="flex items-center space-x-2 py-2 px-1 text-ink-white bg-gradient-to-b from-transparent to-black/75 absolute bottom-0 left-0 right-0 mx-auto rounded-md"
-				:class="{
-					'invisible group-hover:visible': playing,
-				}"
-			>
-				<Button variant="ghost" class="hover:bg-transparent">
-					<template #icon>
-						<Play
-							v-if="!playing"
-							@click="playVideo"
-							class="size-4 text-ink-gray-9"
-						/>
-						<Pause v-else @click="pauseVideo" class="size-5 text-ink-white" />
-					</template>
-				</Button>
-				<input
-					type="range"
-					min="0"
-					:max="duration"
-					step="0.1"
-					v-model="currentTime"
-					@input="changeCurrentTime"
-					class="duration-slider w-full h-1"
-				/>
-				<span class="text-sm font-medium">
-					{{ formatSeconds(currentTime) }} / {{ formatSeconds(duration) }}
-				</span>
-				<Button
-					variant="ghost"
-					@click="toggleMute"
-					class="hover:bg-transparent"
-				>
-					<template #icon>
-						<Volume2 v-if="!muted" class="size-5 text-ink-white" />
-						<VolumeX v-else class="size-5 text-ink-white" />
-					</template>
-				</Button>
-				<Button
-					variant="ghost"
-					@click="toggleFullscreen"
-					class="hover:bg-transparent"
-				>
-					<template #icon>
-						<Maximize class="size-5 text-ink-white" />
-					</template>
-				</Button>
-			</div>
-		</div>
-		<Quiz
-			v-if="showQuiz"
-			:quizName="currentQuiz"
-			:inVideo="true"
-			:backToVideo="resumeVideo"
-		/>
-		<div v-if="!readOnly" @click="showQuizModal = true">
-			<Button>
-				{{ __('Add Quiz to Video') }}
+			<Button variant="ghost">
+				<template #icon>
+					<Play
+						v-if="!playing"
+						@click="playVideo"
+						class="w-4 h-4 text-ink-gray-9"
+					/>
+					<Pause v-else @click="pauseVideo" class="w-4 h-4 text-ink-gray-9" />
+				</template>
+			</Button>
+			<Button variant="ghost" @click="toggleMute">
+				<template #icon>
+					<Volume2 v-if="!muted" class="w-4 h-4 text-ink-gray-9" />
+					<VolumeX v-else class="w-4 h-4 text-ink-gray-9" />
+				</template>
+			</Button>
+			<input
+				type="range"
+				min="0"
+				:max="duration"
+				step="0.1"
+				v-model="currentTime"
+				@input="changeCurrentTime"
+				class="duration-slider w-full h-1"
+			/>
+			<span class="text-xs font-medium">
+				{{ formatTime(currentTime) }} / {{ formatTime(duration) }}
+			</span>
+			<Button variant="ghost" @click="toggleFullscreen">
+				<template #icon>
+					<Maximize class="w-4 h-4 text-ink-gray-9" />
+				</template>
 			</Button>
 		</div>
 	</div>
-	<QuizInVideo
-		v-model="showQuizModal"
-		:quizzes="quizzes"
-		:saveQuizzes="saveQuizzes"
-		:duration="duration"
-	/>
 </template>
 <script setup>
 import { ref, onMounted, computed } from 'vue'
-import { Pause, Maximize, Volume2, VolumeX } from 'lucide-vue-next'
+import { Play, Pause, Maximize, Volume2, VolumeX } from 'lucide-vue-next'
 import { Button } from 'frappe-ui'
-import { formatSeconds, formatTimestamp } from '@/utils'
-import Play from '@/components/Icons/Play.vue'
-import QuizInVideo from '@/components/Modals/QuizInVideo.vue'

 const videoRef = ref(null)
 const videoContainer = ref(null)
@@ -131,10 +60,6 @@ let playing = ref(false)
 let currentTime = ref(0)
 let duration = ref(0)
 let muted = ref(false)
-const showQuizModal = ref(false)
-const showQuiz = ref(false)
-const currentQuiz = ref(null)
-const nextQuiz = ref({})

 const props = defineProps({
 	file: {
@@ -145,81 +70,34 @@ const props = defineProps({
 		type: String,
 		default: 'video/mp4',
 	},
-	readOnly: {
-		type: String,
-		default: true,
-	},
-	quizzes: {
-		type: Array,
-		default: () => [],
-	},
-	saveQuizzes: {
-		type: Function,
-	},
 })

 onMounted(() => {
-	updateCurrentTime()
-	updateNextQuiz()
-})
-
-const updateCurrentTime = () => {
 	setTimeout(() => {
 		videoRef.value.onloadedmetadata = () => {
 			duration.value = videoRef.value.duration
 		}
 		videoRef.value.ontimeupdate = () => {
-			currentTime.value = videoRef.value?.currentTime || currentTime.value
-			if (currentTime.value >= nextQuiz.value.time) {
-				videoRef.value.pause()
-				playing.value = false
-				videoRef.value.onTimeupdate = null
-				currentQuiz.value = nextQuiz.value.quiz
-				showQuiz.value = true
-			}
+			currentTime.value = videoRef.value.currentTime
 		}
 	}, 0)
-}
-
-const resumeVideo = (restart = false) => {
-	showQuiz.value = false
-	currentQuiz.value = null
-	updateCurrentTime()
-	setTimeout(() => {
-		videoRef.value.currentTime = restart ? 0 : currentTime.value
-		videoRef.value.play()
-		playing.value = true
-		updateNextQuiz()
-	}, 0)
-}
-
-const updateNextQuiz = () => {
-	if (!props.quizzes.length) return
-
-	props.quizzes.forEach((quiz) => {
-		if (typeof quiz.time == 'string' && quiz.time.includes(':')) {
-			let time = quiz.time.split(':')
-			let timeInSeconds = parseInt(time[0]) * 60 + parseInt(time[1])
-			quiz.time = timeInSeconds
-		}
-	})
-
-	props.quizzes.sort((a, b) => a.time - b.time)
-
-	const nextQuizIndex = props.quizzes.findIndex(
-		(quiz) => quiz.time > currentTime.value
-	)
-	if (nextQuizIndex !== -1) {
-		nextQuiz.value = props.quizzes[nextQuizIndex]
-	} else {
-		nextQuiz.value = {}
-	}
-}
+})

 const fileURL = computed(() => {
+	if (isYoutube) {
+		let url = props.file
+		if (url.includes('watch?v=')) {
+			url = url.replace('watch?v=', 'embed/')
+		}
+		return `${url}?autoplay=0&controls=0&disablekb=1&playsinline=1&cc_load_policy=1&cc_lang_pref=auto`
+	}
 	return props.file
 })

+const isYoutube = computed(() => {
+	return props.type == 'video/youtube'
+})
+
 const playVideo = () => {
 	videoRef.value.play()
 	playing.value = true
@@ -249,7 +127,12 @@ const toggleMute = () => {

 const changeCurrentTime = () => {
 	videoRef.value.currentTime = currentTime.value
-	updateNextQuiz()
+}
+
+const formatTime = (time) => {
+	const minutes = Math.floor(time / 60)
+	const seconds = Math.floor(time % 60)
+	return `${minutes}:${seconds < 10 ? '0' : ''}${seconds}`
 }

 const toggleFullscreen = () => {
@@ -264,6 +147,7 @@ const toggleFullscreen = () => {
 <style scoped>
 .video-block {
 	width: 100%;
+	max-width: 900px;
 	margin: 0 auto;
 }

@@ -281,16 +165,15 @@ iframe {
 	flex: 1;
 	-webkit-appearance: none;
 	appearance: none;
-	border-radius: 10px;
-	background-color: theme('colors.gray.100');
+	background-color: theme('colors.gray.400');
 	cursor: pointer;
 }

 .duration-slider::-webkit-slider-thumb {
-	width: 2px;
-	border-radius: 50%;
+	height: 10px;
+	width: 10px;
 	-webkit-appearance: none;
-	background-color: theme('colors.gray.500');
+	background-color: theme('colors.gray.900');
 }

@media screen and (-webkit-min-device-pixel-ratio: 0) {
@@ -303,7 +186,7 @@ iframe {
 	input[type='range']::-webkit-slider-thumb {
 		-webkit-appearance: none;
 		cursor: pointer;
-		box-shadow: -500px 0 0 500px theme('colors.gray.600');
+		box-shadow: -500px 0 0 500px theme('colors.gray.900');
 	}
 }
 </style>
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -26,6 +26,5 @@ app.mount('#app')
 const { userResource, allUsers } = usersStore()
 app.provide('$user', userResource)
 app.provide('$allUsers', allUsers)
-
 app.config.globalProperties.$user = userResource
 app.config.globalProperties.$dialog = createDialog
--- a/frontend/src/pages/AssignmentForm.vue
+++ b/frontend/src/pages/AssignmentForm.vue
@@ -0,0 +1,191 @@
+<template>
+	<header
+		class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
+	>
+		<Breadcrumbs :items="breadcrumbs" />
+		<div class="space-x-2">
+			<router-link
+				v-if="assignment.doc?.name"
+				:to="{
+					name: 'AssignmentSubmissionList',
+					query: {
+						assignmentID: assignment.doc.name,
+					},
+				}"
+			>
+				<Button>
+					{{ __('Submission List') }}
+				</Button>
+			</router-link>
+			<Button variant="solid" @click="saveAssignment()">
+				{{ __('Save') }}
+			</Button>
+		</div>
+	</header>
+	<div class="w-3/4 mx-auto py-5">
+		<div class="font-semibold mb-4">
+			{{ __('Details') }}
+		</div>
+		<div class="grid grid-cols-2 gap-5 mt-4 mb-8">
+			<FormControl
+				v-model="model.title"
+				:label="__('Title')"
+				:required="true"
+			/>
+			<FormControl
+				v-model="model.type"
+				type="select"
+				:options="assignmentOptions"
+				:label="__('Type')"
+				:required="true"
+			/>
+		</div>
+		<div>
+			<div class="text-xs text-ink-gray-5 mb-2">
+				{{ __('Question') }}
+				<span class="text-ink-red-3">*</span>
+			</div>
+			<TextEditor
+				:content="model.question"
+				@change="(val) => (model.question = val)"
+				:editable="true"
+				:fixedMenu="true"
+				editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
+			/>
+		</div>
+	</div>
+</template>
+<script setup>
+import {
+	Breadcrumbs,
+	Button,
+	createDocumentResource,
+	createResource,
+	FormControl,
+	TextEditor,
+} from 'frappe-ui'
+import {
+	computed,
+	inject,
+	onMounted,
+	onBeforeUnmount,
+	reactive,
+	watch,
+} from 'vue'
+import { showToast } from '@/utils'
+import { useRouter } from 'vue-router'
+
+const user = inject('$user')
+const router = useRouter()
+
+const props = defineProps({
+	assignmentID: {
+		type: String,
+		required: true,
+	},
+})
+
+const model = reactive({
+	title: '',
+	type: 'PDF',
+	question: '',
+})
+
+onMounted(() => {
+	if (
+		props.assignmentID == 'new' &&
+		!user.data?.is_moderator &&
+		!user.data?.is_instructor
+	) {
+		router.push({ name: 'Courses' })
+	}
+	if (props.assignmentID !== 'new') {
+		assignment.reload()
+	}
+	window.addEventListener('keydown', keyboardShortcut)
+})
+
+const keyboardShortcut = (e) => {
+	if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
+		saveAssignment()
+		e.preventDefault()
+	}
+}
+
+onBeforeUnmount(() => {
+	window.removeEventListener('keydown', keyboardShortcut)
+})
+
+const assignment = createDocumentResource({
+	doctype: 'LMS Assignment',
+	name: props.assignmentID,
+	auto: false,
+})
+
+const newAssignment = createResource({
+	url: 'frappe.client.insert',
+	makeParams(values) {
+		return {
+			doc: {
+				doctype: 'LMS Assignment',
+				...values,
+			},
+		}
+	},
+	onSuccess(data) {
+		router.push({ name: 'AssignmentForm', params: { assignmentID: data.name } })
+	},
+	onError(err) {
+		showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+	},
+})
+
+const saveAssignment = () => {
+	if (props.assignmentID == 'new') {
+		newAssignment.submit({
+			...model,
+		})
+	} else {
+		assignment.setValue.submit(
+			{
+				...model,
+			},
+			{
+				onSuccess(data) {
+					showToast(__('Success'), __('Assignment saved successfully'), 'check')
+					assignment.reload()
+				},
+				onError(err) {
+					showToast(__('Error'), __(err.messages?.[0] || err), 'x')
+				},
+			}
+		)
+	}
+}
+
+watch(assignment, () => {
+	Object.keys(assignment.doc).forEach((key) => {
+		model[key] = assignment.doc[key]
+	})
+})
+
+const breadcrumbs = computed(() => [
+	{
+		label: __('Assignments'),
+		route: { name: 'Assignments' },
+	},
+	{
+		label: assignment.doc ? assignment.doc.title : __('New Assignment'),
+	},
+])
+
+const assignmentOptions = computed(() => {
+	return [
+		{ label: 'PDF', value: 'PDF' },
+		{ label: 'Image', value: 'Image' },
+		{ label: 'Document', value: 'Document' },
+		{ label: 'Text', value: 'Text' },
+		{ label: 'URL', value: 'URL' },
+	]
+})
+</script>
--- a/frontend/src/pages/AssignmentSubmission.vue
+++ b/frontend/src/pages/AssignmentSubmission.vue
@@ -14,14 +14,12 @@
 	</div>
 </template>
 <script setup>
-import { Breadcrumbs, createResource, usePageMeta } from 'frappe-ui'
-import { computed, inject, onMounted, ref } from 'vue'
-import { sessionStore } from '../stores/session'
+import { Breadcrumbs, createResource } from 'frappe-ui'
+import { computed, inject, onMounted, onBeforeUnmount, ref } from 'vue'
 import Assignment from '@/components/Assignment.vue'

 const user = inject('$user')
 const fromLesson = ref(false)
-const { brand } = sessionStore()

 const props = defineProps({
 	assignmentID: {
@@ -74,11 +72,4 @@ const breadcrumbs = computed(() => {
 	]
 	return crumbs
 })
-
-usePageMeta(() => {
-	return {
-		title: title.data?.title,
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/AssignmentSubmissionList.vue
+++ b/frontend/src/pages/AssignmentSubmissionList.vue
@@ -84,17 +84,14 @@ import {
 	ListRows,
 	ListRow,
 	ListRowItem,
-	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { Pencil } from 'lucide-vue-next'
-import { sessionStore } from '../stores/session'
 import Link from '@/components/Controls/Link.vue'

 const user = inject('$user')
 const dayjs = inject('$dayjs')
-const { brand } = sessionStore()
 const router = useRouter()
 const assignmentID = ref('')
 const member = ref('')
@@ -217,11 +214,4 @@ const breadcrumbs = computed(() => {
 		},
 	]
 })
-
-usePageMeta(() => {
-	return {
-		title: __('Assignment Submissions'),
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/Assignments.vue
+++ b/frontend/src/pages/Assignments.vue
@@ -3,46 +3,32 @@
 		class="sticky top-0 z-10 flex items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
-		<Button
-			v-if="!readOnlyMode"
-			variant="solid"
-			@click="
-				() => {
-					assignmentID = 'new'
-					showAssignmentForm = true
-				}
-			"
+		<router-link
+			:to="{
+				name: 'AssignmentForm',
+				params: {
+					assignmentID: 'new',
+				},
+			}"
 		>
-			<template #prefix>
-				<Plus class="w-4 h-4" />
-			</template>
-			{{ __('New') }}
-		</Button>
+			<Button variant="solid">
+				<template #prefix>
+					<Plus class="w-4 h-4" />
+				</template>
+				{{ __('New') }}
+			</Button>
+		</router-link>
 	</header>

 	<div class="md:w-3/4 md:mx-auto py-5 mx-5">
-		<div class="flex items-center justify-between mb-5">
-			<div
-				v-if="assignmentCount"
-				class="text-xl font-semibold text-ink-gray-7 mb-4"
-			>
-				{{ __('{0} Assignments').format(assignmentCount) }}
-			</div>
-			<div
-				v-if="assignments.data?.length || assigmentCount > 0"
-				class="grid grid-cols-2 gap-5"
-			>
-				<FormControl
-					v-model="titleFilter"
-					:placeholder="__('Search by title')"
-				/>
-				<FormControl
-					v-model="typeFilter"
-					type="select"
-					:options="assignmentTypes"
-					:placeholder="__('Type')"
-				/>
-			</div>
+		<div class="grid grid-cols-3 gap-5 mb-5">
+			<FormControl v-model="titleFilter" :placeholder="__('Search by title')" />
+			<FormControl
+				v-model="typeFilter"
+				type="select"
+				:options="assignmentTypes"
+				:placeholder="__('Type')"
+			/>
 		</div>
 		<ListView
 			v-if="assignments.data?.length"
@@ -52,15 +38,31 @@
 			:options="{
 				showTooltip: false,
 				selectable: false,
-				onRowClick: (row) => {
-					if (readOnlyMode) return
-					assignmentID = row.name
-					showAssignmentForm = true
-				},
+				getRowRoute: (row) => ({
+					name: 'AssignmentForm',
+					params: {
+						assignmentID: row.name,
+					},
+				}),
 			}"
 		>
 		</ListView>
-		<EmptyState v-else type="Assignments" />
+		<div
+			v-else
+			class="text-center p-5 text-ink-gray-5 mt-52 w-3/4 md:w-1/2 mx-auto space-y-2"
+		>
+			<Pencil class="size-10 mx-auto stroke-1 text-ink-gray-4" />
+			<div class="text-xl font-medium">
+				{{ __('No assignments found') }}
+			</div>
+			<div class="leading-5">
+				{{
+					__(
+						'You have not created any assignments yet. To create a new assignment, click on the "New" button above.'
+					)
+				}}
+			</div>
+		</div>
 		<div
 			v-if="assignments.data && assignments.hasNextPage"
 			class="flex justify-center my-5"
@@ -70,45 +72,30 @@
 			</Button>
 		</div>
 	</div>
-	<AssignmentForm
-		v-model="showAssignmentForm"
-		v-model:assignments="assignments"
-		:assignmentID="assignmentID"
-	/>
 </template>
 <script setup>
 import {
 	Breadcrumbs,
 	Button,
-	call,
 	createListResource,
 	FormControl,
 	ListView,
-	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
-import { Plus } from 'lucide-vue-next'
+import { Plus, Pencil } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
-import { sessionStore } from '../stores/session'
-import AssignmentForm from '@/components/Modals/AssignmentForm.vue'
-import EmptyState from '@/components/EmptyState.vue'

 const user = inject('$user')
 const dayjs = inject('$dayjs')
 const titleFilter = ref('')
 const typeFilter = ref('')
-const showAssignmentForm = ref(false)
-const assignmentID = ref('new')
-const assignmentCount = ref(0)
-const { brand } = sessionStore()
 const router = useRouter()
-const readOnlyMode = window.read_only_mode

 onMounted(() => {
 	if (!user.data?.is_moderator && !user.data?.is_instructor) {
 		router.push({ name: 'Courses' })
 	}
-	getAssignmentCount()
+
 	titleFilter.value = router.currentRoute.value.query.title
 	typeFilter.value = router.currentRoute.value.query.type
 })
@@ -146,7 +133,7 @@ const assignmentFilter = computed(() => {

 const assignments = createListResource({
 	doctype: 'LMS Assignment',
-	fields: ['name', 'title', 'type', 'creation', 'question'],
+	fields: ['name', 'title', 'type', 'creation'],
 	orderBy: 'modified desc',
 	cache: ['assignments'],
 	transform(data) {
@@ -176,19 +163,11 @@ const assignmentColumns = computed(() => {
 			label: __('Created'),
 			key: 'creation',
 			width: 1,
-			align: 'right',
+			align: 'center',
 		},
 	]
 })

-const getAssignmentCount = () => {
-	call('frappe.client.get_count', {
-		doctype: 'LMS Assignment',
-	}).then((data) => {
-		assignmentCount.value = data
-	})
-}
-
 const assignmentTypes = computed(() => {
 	let types = ['', 'Document', 'Image', 'PDF', 'URL', 'Text']
 	return types.map((type) => {
@@ -205,11 +184,4 @@ const breadcrumbs = computed(() => [
 		route: { name: 'Assignments' },
 	},
 ])
-
-usePageMeta(() => {
-	return {
-		title: __('Assignments'),
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/Badge.vue
+++ b/frontend/src/pages/Badge.vue
@@ -24,12 +24,10 @@
 	</div>
 </template>
 <script setup>
-import { createResource, usePageMeta } from 'frappe-ui'
+import { createDocumentResource, createResource } from 'frappe-ui'
 import { computed, inject } from 'vue'
-import { sessionStore } from '../stores/session'

 const dayjs = inject('$dayjs')
-const { brand } = sessionStore()

 const props = defineProps({
 	badgeName: {
@@ -72,11 +70,4 @@ const breadcrumbs = computed(() => {
 		},
 	]
 })
-
-usePageMeta(() => {
-	return {
-		title: badge.data.badge,
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -11,7 +11,7 @@
 				>
 					{{ __('Generate Certificates') }}
 				</Button>
-				<Button v-if="canMakeAnnouncement()" @click="openAnnouncementModal()">
+				<Button v-if="user.data?.is_moderator" @click="openAnnouncementModal()">
 					<span>
 						{{ __('Make an Announcement') }}
 					</span>
@@ -67,13 +67,10 @@
 								<BatchDashboard :batch="batch" :isStudent="isStudent" />
 							</div>
 							<div v-else-if="tab.label == 'Dashboard'">
-								<BatchStudents :batch="batch" />
+								<BatchStudents :batch="batch.data" />
 							</div>
 							<div v-else-if="tab.label == 'Classes'">
-								<LiveClass
-									:batch="batch.data.name"
-									:zoomAccount="batch.data.zoom_account"
-								/>
+								<LiveClass :batch="batch.data.name" />
 							</div>
 							<div v-else-if="tab.label == 'Assessments'">
 								<Assessments :batch="batch.data.name" />
@@ -91,61 +88,56 @@
 									:scrollToBottom="false"
 								/>
 							</div>
+							<div v-else-if="tab.label == 'Feedback'">
+								<BatchFeedback :batch="batch.data.name" />
+							</div>
 						</div>
 					</template>
 				</Tabs>
 			</div>
 			<div class="p-5">
-				<div class="mb-10">
-					<div class="text-ink-gray-7 font-semibold mb-2">
-						{{ __('About this batch') }}
-					</div>
-					<div
-						v-html="batch.data.description"
-						class="leading-5 mb-4 text-ink-gray-7"
-					></div>
-
-					<div class="flex items-center avatar-group overlap mb-5">
-						<div
-							class="h-6 mr-1"
-							:class="{
-								'avatar-group overlap': batch.data.instructors.length > 1,
-							}"
-						>
-							<UserAvatar
-								v-for="instructor in batch.data.instructors"
-								:user="instructor"
-							/>
-						</div>
-						<CourseInstructors :instructors="batch.data.instructors" />
-					</div>
-					<DateRange
-						:startDate="batch.data.start_date"
-						:endDate="batch.data.end_date"
-						class="mb-3"
-					/>
-					<div class="flex items-center mb-3 text-ink-gray-7">
-						<Clock class="h-4 w-4 stroke-1.5 mr-2" />
-						<span>
-							{{ formatTime(batch.data.start_time) }} -
-							{{ formatTime(batch.data.end_time) }}
-						</span>
-					</div>
-					<div
-						v-if="batch.data.timezone"
-						class="flex items-center mb-3 text-ink-gray-7"
-					>
-						<Globe class="h-4 w-4 stroke-1.5 mr-2" />
-						<span>
-							{{ batch.data.timezone }}
-						</span>
-					</div>
+				<div class="text-ink-gray-7 font-semibold mb-4">
+					{{ __('About this batch') }}:
 				</div>
-				<div v-if="dayjs().isSameOrAfter(dayjs(batch.data.start_date))">
-					<div class="text-ink-gray-7 font-semibold mb-2">
-						{{ __('Feedback') }}
+				<div
+					v-html="batch.data.description"
+					class="leading-5 mb-4 text-ink-gray-7"
+				></div>
+
+				<div class="flex items-center avatar-group overlap mb-5">
+					<div
+						class="h-6 mr-1"
+						:class="{
+							'avatar-group overlap': batch.data.instructors.length > 1,
+						}"
+					>
+						<UserAvatar
+							v-for="instructor in batch.data.instructors"
+							:user="instructor"
+						/>
 					</div>
-					<BatchFeedback :batch="batch.data?.name" />
+					<CourseInstructors :instructors="batch.data.instructors" />
+				</div>
+				<DateRange
+					:startDate="batch.data.start_date"
+					:endDate="batch.data.end_date"
+					class="mb-3"
+				/>
+				<div class="flex items-center mb-4 text-ink-gray-7">
+					<Clock class="h-4 w-4 stroke-1.5 mr-2" />
+					<span>
+						{{ formatTime(batch.data.start_time) }} -
+						{{ formatTime(batch.data.end_time) }}
+					</span>
+				</div>
+				<div
+					v-if="batch.data.timezone"
+					class="flex items-center mb-4 text-ink-gray-7"
+				>
+					<Globe class="h-4 w-4 stroke-1.5 mr-2" />
+					<span>
+						{{ batch.data.timezone }}
+					</span>
 				</div>
 			</div>
 			<AnnouncementModal
@@ -207,14 +199,9 @@
 <script setup>
 import { computed, inject, ref, onMounted, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import {
-	Breadcrumbs,
-	Button,
-	createResource,
-	Tabs,
-	Badge,
-	usePageMeta,
-} from 'frappe-ui'
+import { Breadcrumbs, Button, createResource, Tabs, Badge } from 'frappe-ui'
+import CourseInstructors from '@/components/CourseInstructors.vue'
+import UserAvatar from '@/components/UserAvatar.vue'
 import {
 	Clock,
 	LayoutDashboard,
@@ -227,10 +214,7 @@ import {
 	Globe,
 	ClipboardPen,
 } from 'lucide-vue-next'
-import { formatTime } from '@/utils'
-import { sessionStore } from '@/stores/session'
-import CourseInstructors from '@/components/CourseInstructors.vue'
-import UserAvatar from '@/components/UserAvatar.vue'
+import { formatTime, updateDocumentTitle } from '@/utils'
 import BatchDashboard from '@/components/BatchDashboard.vue'
 import BatchCourses from '@/components/BatchCourses.vue'
 import LiveClass from '@/components/LiveClass.vue'
@@ -242,16 +226,13 @@ import Discussions from '@/components/Discussions.vue'
 import DateRange from '@/components/Common/DateRange.vue'
 import BulkCertificates from '@/components/Modals/BulkCertificates.vue'
 import BatchFeedback from '@/components/BatchFeedback.vue'
-import dayjs from 'dayjs/esm'

 const user = inject('$user')
 const showAnnouncementModal = ref(false)
 const openCertificateDialog = ref(false)
 const route = useRoute()
 const router = useRouter()
-const { brand } = sessionStore()
 const tabIndex = ref(0)
-const readOnlyMode = window.read_only_mode

 const tabs = computed(() => {
 	let batchTabs = []
@@ -286,6 +267,11 @@ const tabs = computed(() => {
 		label: 'Discussions',
 		icon: MessageCircle,
 	})
+
+	batchTabs.push({
+		label: 'Feedback',
+		icon: ClipboardPen,
+	})
 	return batchTabs
 })

@@ -359,18 +345,12 @@ watch(tabIndex, () => {
 	}
 })

-const canMakeAnnouncement = () => {
-	if (readOnlyMode) return false
-
-	if (!batch.data?.students?.length) return false
-
-	return user.data?.is_moderator || user.data?.is_evaluator
-}
-
-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
-		title: batch?.data?.title,
-		icon: brand.favicon,
+		title: batch.data?.title,
+		description: batch.data?.description,
 	}
 })
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/BatchDetail.vue
+++ b/frontend/src/pages/BatchDetail.vue
@@ -6,38 +6,64 @@
 			<Breadcrumbs :items="breadcrumbs" />
 		</header>
 		<div class="m-5 pb-10">
-			<div class="flex justify-between w-full">
-				<div class="md:w-2/3">
-					<div class="text-3xl font-semibold text-ink-gray-9">
-						{{ batch.data.title }}
+			<div>
+				<div class="text-3xl font-semibold text-ink-gray-9">
+					{{ batch.data.title }}
+				</div>
+				<div class="my-3 leading-6 text-ink-gray-7">
+					{{ batch.data.description }}
+				</div>
+				<div
+					class="flex flex-col gap-2 lg:gap-0 lg:flex-row lg:items-center justify-between lg:w-1/2"
+				>
+					<div class="flex items-center text-ink-gray-7">
+						<BookOpen class="h-4 w-4 mr-2" />
+						<span> {{ batch.data?.courses?.length }} {{ __('Courses') }} </span>
 					</div>
-					<div class="my-3 leading-6 text-ink-gray-7">
-						{{ batch.data.description }}
-					</div>
-					<div class="flex avatar-group overlap">
-						<div
-							class="h-6 mr-1"
-							:class="{
-								'avatar-group overlap': batch.data.instructors.length > 1,
-							}"
-						>
-							<UserAvatar
-								v-for="instructor in batch.data.instructors"
-								:user="instructor"
-							/>
-						</div>
-						<CourseInstructors :instructors="batch.data.instructors" />
+					<span class="hidden lg:block" v-if="batch.data.courses"
+						>&middot;</span
+					>
+					<DateRange
+						:startDate="batch.data.start_date"
+						:endDate="batch.data.end_date"
+					/>
+					<span class="hidden lg:block" v-if="batch.data.start_date"
+						>&middot;</span
+					>
+					<div class="flex items-center text-ink-gray-7">
+						<Clock class="h-4 w-4 mr-2" />
+						<span>
+							{{ formatTime(batch.data.start_time) }} -
+							{{ formatTime(batch.data.end_time) }}
+						</span>
 					</div>
+				</div>
+				<div class="flex avatar-group overlap mt-3">
 					<div
-						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-10"
+						class="h-6 mr-1"
+						:class="{
+							'avatar-group overlap': batch.data.instructors.length > 1,
+						}"
+					>
+						<UserAvatar
+							v-for="instructor in batch.data.instructors"
+							:user="instructor"
+						/>
+					</div>
+					<CourseInstructors :instructors="batch.data.instructors" />
+				</div>
+			</div>
+			<div class="grid lg:grid-cols-[60%,20%] gap-4 lg:gap-20 mt-10">
+				<div class="order-2 lg:order-none">
+					<div
+						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-6"
 						v-html="batch.data.batch_details"
 					></div>
 				</div>
-				<div class="hidden md:block">
+				<div class="order-1 lg:order-none">
 					<BatchOverlay :batch="batch" />
 				</div>
 			</div>
-			<BatchOverlay :batch="batch" class="md:hidden mt-5" />
 			<div v-if="batch.data.courses.length">
 				<div class="flex items-center mt-10">
 					<div class="text-2xl font-semibold">
@@ -76,9 +102,8 @@
 import { computed, inject } from 'vue'
 import { useRouter } from 'vue-router'
 import { BookOpen, Clock } from 'lucide-vue-next'
-import { formatTime } from '@/utils'
-import { Breadcrumbs, createResource, usePageMeta } from 'frappe-ui'
-import { sessionStore } from '@/stores/session'
+import { formatTime, updateDocumentTitle } from '@/utils'
+import { Breadcrumbs, createResource } from 'frappe-ui'
 import CourseCard from '@/components/CourseCard.vue'
 import BatchOverlay from '@/components/BatchOverlay.vue'
 import DateRange from '../components/Common/DateRange.vue'
@@ -87,7 +112,6 @@ import UserAvatar from '@/components/UserAvatar.vue'

 const user = inject('$user')
 const router = useRouter()
-const { brand } = sessionStore()

 const props = defineProps({
 	batchName: {
@@ -128,12 +152,14 @@ const breadcrumbs = computed(() => {
 	return items
 })

-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
-		title: batch?.data?.title,
-		icon: brand.favicon,
+		title: batch.data?.title,
+		description: batch.data?.description,
 	}
 })
+
+updateDocumentTitle(pageMeta)
 </script>
 <style>
 .batch-description p {
--- a/frontend/src/pages/BatchForm.vue
+++ b/frontend/src/pages/BatchForm.vue
@@ -8,68 +8,99 @@
 				{{ __('Save') }}
 			</Button>
 		</header>
-		<div class="py-5">
-			<div class="px-20 pb-5 space-y-5 border-b mb-5">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
+		<div class="w-1/2 mx-auto py-5">
+			<div class="">
+				<div class="text-lg font-semibold mb-4">
 					{{ __('Details') }}
 				</div>
-				<div class="grid grid-cols-2 gap-5">
-					<div class="space-y-5">
+				<div class="space-y-4 mb-4">
+					<FormControl
+						v-model="batch.title"
+						:label="__('Title')"
+						:required="true"
+						class="w-full"
+					/>
+					<div class="flex items-center space-x-5">
 						<FormControl
-							v-model="batch.title"
-							:label="__('Title')"
-							:required="true"
-							class="w-full"
+							v-model="batch.published"
+							type="checkbox"
+							:label="__('Published')"
 						/>
-						<MultiSelect
-							v-model="instructors"
-							doctype="Course Evaluator"
-							:label="__('Instructors')"
-							:required="true"
-							:onCreate="(close) => openSettings('Evaluators', close)"
-							:filters="{ ignore_user_type: 1 }"
+						<FormControl
+							v-model="batch.allow_self_enrollment"
+							type="checkbox"
+							:label="__('Allow self enrollment')"
+						/>
+						<FormControl
+							v-model="batch.certification"
+							type="checkbox"
+							:label="__('Certification')"
 						/>
 					</div>
-					<FormControl
-						v-model="batch.description"
-						:label="__('Short Description')"
-						type="textarea"
-						:rows="8"
-						:placeholder="__('Short description of the batch')"
-						:required="true"
-					/>
 				</div>
 			</div>
-
-			<div class="px-20 pb-5 space-y-5 border-b mb-5">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
-					{{ __('Settings') }}
+			<div class="mb-4">
+				<div class="text-xs text-ink-gray-5 mb-2">
+					{{ __('Meta Image') }}
 				</div>
-				<div class="grid grid-cols-3 gap-5">
-					<FormControl
-						v-model="batch.published"
-						type="checkbox"
-						:label="__('Published')"
-					/>
-					<FormControl
-						v-model="batch.allow_self_enrollment"
-						type="checkbox"
-						:label="__('Allow self enrollment')"
-					/>
-					<FormControl
-						v-model="batch.certification"
-						type="checkbox"
-						:label="__('Certification')"
-					/>
+				<FileUploader
+					v-if="!batch.image"
+					:fileTypes="['image/*']"
+					:validateFile="validateFile"
+					@success="(file) => saveImage(file)"
+				>
+					<template v-slot="{ file, progress, uploading, openFileSelector }">
+						<div class="flex items-center">
+							<div class="border rounded-md w-fit py-5 px-20">
+								<Image class="size-5 stroke-1 text-ink-gray-7" />
+							</div>
+							<div class="ml-4">
+								<Button @click="openFileSelector">
+									{{ __('Upload') }}
+								</Button>
+								<div class="mt-2 text-ink-gray-5 text-sm">
+									{{
+										__(
+											'Appears when the batch URL is shared on any online platform'
+										)
+									}}
+								</div>
+							</div>
+						</div>
+					</template>
+				</FileUploader>
+				<div v-else class="mb-4">
+					<div class="flex items-center">
+						<img :src="batch.image.file_url" class="border rounded-md w-40" />
+						<div class="ml-4">
+							<Button @click="removeImage()">
+								{{ __('Remove') }}
+							</Button>
+							<div class="mt-2 text-ink-gray-5 text-sm">
+								{{
+									__(
+										'Appears when the batch URL is shared on any online platform'
+									)
+								}}
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
+			<MultiSelect
+				v-model="instructors"
+				doctype="User"
+				:label="__('Instructors')"
+				:required="true"
+				:filters="{ ignore_user_type: 1 }"
+			/>

-			<div class="px-20 pb-5 space-y-5 border-b mb-5">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
+			<div class="my-10">
+				<div class="text-lg font-semibold mb-4">
 					{{ __('Date and Time') }}
 				</div>
-				<div class="grid grid-cols-3 gap-10">
-					<div class="space-y-5">
+				<div class="grid grid-cols-2 gap-10">
+					<div>
 						<FormControl
 							v-model="batch.start_date"
 							:label="__('Start Date')"
@@ -84,8 +115,16 @@
 							class="mb-4"
 							:required="true"
 						/>
+						<FormControl
+							v-model="batch.timezone"
+							:label="__('Timezone')"
+							type="text"
+							:placeholder="__('Example: IST (+5:30)')"
+							class="mb-4"
+							:required="true"
+						/>
 					</div>
-					<div class="space-y-5">
+					<div>
 						<FormControl
 							v-model="batch.start_time"
 							:label="__('Start Time')"
@@ -101,47 +140,15 @@
 							:required="true"
 						/>
 					</div>
-					<div class="space-y-5">
-						<FormControl
-							v-model="batch.timezone"
-							:label="__('Timezone')"
-							type="text"
-							:placeholder="__('Example: IST (+5:30)')"
-							class="mb-4"
-							:required="true"
-						/>
-						<FormControl
-							v-model="batch.evaluation_end_date"
-							:label="__('Evaluation End Date')"
-							type="date"
-							class="mb-4"
-						/>
-					</div>
 				</div>
 			</div>

-			<div class="px-20 pb-5 space-y-5 border-b mb-5">
-				<div>
-					<label class="block text-sm text-ink-gray-5 mb-1">
-						{{ __('Batch Details') }}
-						<span class="text-ink-red-3">*</span>
-					</label>
-					<TextEditor
-						:content="batch.batch_details"
-						@change="(val) => (batch.batch_details = val)"
-						:editable="true"
-						:fixedMenu="true"
-						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[20rem] overflow-y-scroll mb-4"
-					/>
+			<div class="mb-10">
+				<div class="text-lg font-semibold mb-4">
+					{{ __('Settings') }}
 				</div>
-			</div>
-
-			<div class="px-20 pb-5 space-y-5 border-b mb-5">
-				<div class="text-lg text-ink-gray-9 font-semibold mb-4">
-					{{ __('Configurations') }}
-				</div>
-				<div class="grid grid-cols-3 gap-10">
-					<div class="space-y-5">
+				<div class="grid grid-cols-2 gap-10">
+					<div>
 						<FormControl
 							v-model="batch.seat_count"
 							:label="__('Seat Count')"
@@ -149,28 +156,19 @@
 							class="mb-4"
 							:placeholder="__('Number of seats available')"
 						/>
+						<FormControl
+							v-model="batch.evaluation_end_date"
+							:label="__('Evaluation End Date')"
+							type="date"
+							class="mb-4"
+						/>
 						<Link
 							doctype="Email Template"
 							:label="__('Email Template')"
 							v-model="batch.confirmation_email_template"
-							:onCreate="
-								(value, close) => {
-									openSettings('Email Templates', close)
-								}
-							"
-						/>
-						<Link
-							doctype="LMS Zoom Settings"
-							:label="__('Zoom Account')"
-							v-model="batch.zoom_account"
-							:onCreate="
-								(value, close) => {
-									openSettings('Zoom Accounts', close)
-								}
-							"
 						/>
 					</div>
-					<div class="space-y-5">
+					<div>
 						<FormControl
 							v-model="batch.medium"
 							type="select"
@@ -191,79 +189,26 @@
 							doctype="LMS Category"
 							:label="__('Category')"
 							v-model="batch.category"
-							:onCreate="(value, close) => openSettings('Categories', close)"
 						/>
 					</div>
-					<div class="space-y-5">
-						<div>
-							<div class="text-xs text-ink-gray-5">
-								{{ __('Meta Image') }}
-							</div>
-							<FileUploader
-								v-if="!batch.image"
-								:fileTypes="['image/*']"
-								:validateFile="validateFile"
-								@success="(file) => saveImage(file)"
-							>
-								<template
-									v-slot="{ file, progress, uploading, openFileSelector }"
-								>
-									<div class="flex items-center">
-										<div class="border rounded-md w-fit py-5 px-20">
-											<Image class="size-5 stroke-1 text-ink-gray-7" />
-										</div>
-										<div class="ml-4">
-											<Button @click="openFileSelector">
-												{{ __('Upload') }}
-											</Button>
-											<div class="mt-1 text-ink-gray-5 text-sm leading-5">
-												{{
-													__('Appears when the batch URL is shared on socials')
-												}}
-											</div>
-										</div>
-									</div>
-								</template>
-							</FileUploader>
-							<div v-else class="mb-4">
-								<div class="flex items-center">
-									<img
-										:src="batch.image.file_url"
-										class="border rounded-md w-40"
-									/>
-									<div class="ml-4">
-										<Button @click="removeImage()">
-											{{ __('Remove') }}
-										</Button>
-										<div class="mt-2 text-ink-gray-5 text-sm">
-											{{
-												__(
-													'Appears when the batch URL is shared on any online platform'
-												)
-											}}
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
 				</div>
 			</div>

-			<div class="px-20 pb-5 space-y-5">
-				<div class="text-lg text-ink-gray-9 font-semibold">
-					{{ __('Pricing') }}
+			<div class="">
+				<div class="text-lg font-semibold mb-4">
+					{{ __('Payment') }}
 				</div>
-				<FormControl
-					v-model="batch.paid_batch"
-					type="checkbox"
-					:label="__('Paid Batch')"
-				/>
-				<div v-if="batch.paid_batch" class="grid grid-cols-3 gap-5">
+				<div>
+					<FormControl
+						v-model="batch.paid_batch"
+						type="checkbox"
+						:label="__('Paid Batch')"
+					/>
 					<FormControl
 						v-model="batch.amount"
 						:label="__('Amount')"
 						type="number"
+						class="my-4"
 					/>
 					<Link
 						doctype="Currency"
@@ -274,23 +219,29 @@
 				</div>
 			</div>

-			<div class="px-20 pb-5 space-y-5 border-b">
-				<div class="text-lg text-ink-gray-9 font-semibold">
-					{{ __('Meta Tags') }}
+			<div class="my-10">
+				<div class="text-lg font-semibold mb-4">
+					{{ __('Description') }}
 				</div>
-				<div class="space-y-5">
-					<FormControl
-						v-model="meta.description"
-						:label="__('Meta Description')"
-						type="textarea"
-						:rows="7"
-					/>
-					<FormControl
-						v-model="meta.keywords"
-						:label="__('Meta Keywords')"
-						type="textarea"
-						:rows="7"
-						:placeholder="__('Comma separated keywords for SEO')"
+				<FormControl
+					v-model="batch.description"
+					:label="__('Short Description')"
+					type="textarea"
+					class="my-4"
+					:placeholder="__('Short description of the batch')"
+					:required="true"
+				/>
+				<div>
+					<label class="block text-sm text-ink-gray-5 mb-1">
+						{{ __('Batch Details') }}
+						<span class="text-ink-red-3">*</span>
+					</label>
+					<TextEditor
+						:content="batch.batch_details"
+						@change="(val) => (batch.batch_details = val)"
+						:editable="true"
+						:fixedMenu="true"
+						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] mb-4"
 					/>
 				</div>
 			</div>
@@ -313,23 +264,18 @@ import {
 	Button,
 	TextEditor,
 	createResource,
-	usePageMeta,
-	toast,
 } from 'frappe-ui'
+import Link from '@/components/Controls/Link.vue'
 import { useRouter } from 'vue-router'
+import { showToast } from '@/utils'
 import { Image } from 'lucide-vue-next'
 import { capture } from '@/telemetry'
-import { useOnboarding } from 'frappe-ui/frappe'
-import { sessionStore } from '../stores/session'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
-import Link from '@/components/Controls/Link.vue'
-import { openSettings, getMetaInfo, updateMetaInfo } from '@/utils'
+import { useOnboarding } from 'frappe-ui/frappe'

 const router = useRouter()
 const user = inject('$user')
-const { brand } = sessionStore()
 const { updateOnboardingStep } = useOnboarding('learning')
-const instructors = ref([])

 const props = defineProps({
 	batchName: {
@@ -359,29 +305,20 @@ const batch = reactive({
 	paid_batch: false,
 	currency: '',
 	amount: 0,
-	zoom_account: '',
 })

-const meta = reactive({
-	description: '',
-	keywords: '',
-})
+const instructors = ref([])

 onMounted(() => {
 	if (!user.data) window.location.href = '/login'
 	if (props.batchName != 'new') {
-		fetchBatchInfo()
+		batchDetail.reload()
 	} else {
 		capture('batch_form_opened')
 	}
 	window.addEventListener('keydown', keyboardShortcut)
 })

-const fetchBatchInfo = () => {
-	batchDetail.reload()
-	getMetaInfo('batches', props.batchName, meta)
-}
-
 const keyboardShortcut = (e) => {
 	if (
 		e.key === 's' &&
@@ -490,13 +427,10 @@ const createNewBatch = () => {
 		{},
 		{
 			onSuccess(data) {
-				if (user.data?.is_system_manager) {
-					updateOnboardingStep('create_first_batch', true, false, () => {
-						localStorage.setItem('firstBatch', data.name)
-					})
-				}
-				updateMetaInfo('batches', data.name, meta)
 				capture('batch_created')
+				updateOnboardingStep('create_first_batch', true, false, () => {
+					localStorage.setItem('firstBatch', data.name)
+				})
 				router.push({
 					name: 'BatchDetail',
 					params: {
@@ -505,7 +439,7 @@ const createNewBatch = () => {
 				})
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.messages?.[0] || err, 'x')
 			},
 		}
 	)
@@ -516,7 +450,6 @@ const editBatchDetails = () => {
 		{},
 		{
 			onSuccess(data) {
-				updateMetaInfo('batches', data.name, meta)
 				router.push({
 					name: 'BatchDetail',
 					params: {
@@ -525,7 +458,7 @@ const editBatchDetails = () => {
 				})
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.messages?.[0] || err, 'x')
 			},
 		}
 	)
@@ -572,11 +505,4 @@ const breadcrumbs = computed(() => {
 	})
 	return crumbs
 })
-
-usePageMeta(() => {
-	return {
-		title: props.batchName == 'new' ? 'New Batch' : batchDetail.data?.title,
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -4,7 +4,7 @@
 	>
 		<Breadcrumbs :items="breadcrumbs" />
 		<router-link
-			v-if="canCreateBatch()"
+			v-if="user.data?.is_moderator"
 			:to="{
 				name: 'BatchForm',
 				params: { batchName: 'new' },
@@ -70,8 +70,22 @@
 				<BatchCard :batch="batch" />
 			</router-link>
 		</div>
-		<EmptyState v-else-if="!batches.list.loading" type="Batches" />
-
+		<div
+			v-else-if="!batches.list.loading"
+			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">
+				{{ __('No batches found') }}
+			</div>
+			<div class="leading-5 w-2/5 text-center">
+				{{
+					__(
+						'There are no batches matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!'
+					)
+				}}
+			</div>
+		</div>
 		<div
 			v-if="!batches.list.loading && batches.hasNextPage"
 			class="flex justify-center mt-5"
@@ -86,22 +100,18 @@
 import {
 	Breadcrumbs,
 	Button,
-	call,
 	createListResource,
 	FormControl,
 	Select,
 	TabButtons,
-	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
-import { Plus } from 'lucide-vue-next'
-import { sessionStore } from '@/stores/session'
+import { BookOpen, Plus } from 'lucide-vue-next'
+import { updateDocumentTitle } from '@/utils'
 import BatchCard from '@/components/BatchCard.vue'
-import EmptyState from '@/components/EmptyState.vue'

 const user = inject('$user')
 const dayjs = inject('$dayjs')
-const { brand } = sessionStore()
 const start = ref(0)
 const pageLength = ref(20)
 const categories = ref([])
@@ -112,7 +122,6 @@ const filters = ref({})
 const is_student = computed(() => user.data?.is_student)
 const currentTab = ref(is_student.value ? 'All' : 'Upcoming')
 const orderBy = ref('start_date')
-const readOnlyMode = window.read_only_mode

 onMounted(() => {
 	setFiltersFromQuery()
@@ -288,12 +297,6 @@ const batchTabs = computed(() => {
 	return tabs
 })

-const canCreateBatch = () => {
-	if (readOnlyMode) return false
-	if (user.data?.is_moderator || user.data?.is_instructor) return true
-	return false
-}
-
 const breadcrumbs = computed(() => [
 	{
 		label: __('Batches'),
@@ -301,10 +304,12 @@ const breadcrumbs = computed(() => [
 	},
 ])

-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
-		title: __('Batches'),
-		icon: brand.favicon,
+		title: 'Batches',
+		description: 'All upcoming batches.',
 	}
 })
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/Billing.vue
+++ b/frontend/src/pages/Billing.vue
@@ -151,20 +151,19 @@
 </template>
 <script setup>
 import {
+	Input,
 	Button,
 	createResource,
 	FormControl,
 	Breadcrumbs,
-	usePageMeta,
-	toast,
+	Tooltip,
 } from 'frappe-ui'
 import { reactive, inject, onMounted, computed } from 'vue'
-import { sessionStore } from '../stores/session'
 import Link from '@/components/Controls/Link.vue'
 import NotPermitted from '@/components/NotPermitted.vue'
+import { showToast } from '@/utils/'

 const user = inject('$user')
-const { brand } = sessionStore()

 onMounted(() => {
 	const script = document.createElement('script')
@@ -259,7 +258,7 @@ const generatePaymentLink = () => {
 				window.location.href = data
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast(__('Error'), err.messages?.[0] || err, 'x')
 			},
 		}
 	)
@@ -333,7 +332,14 @@ const validateAddress = () => {
 }

 const showError = (err) => {
-	toast.error(err.messages?.[0] || err)
+	createToast({
+		title: 'Error',
+		text: err.messages?.[0] || err,
+		icon: 'x',
+		iconClasses: 'bg-surface-red-5 text-ink-white rounded-md p-px',
+		position: 'top-center',
+		timeout: 10,
+	})
 }

 const changeCurrency = (country) => {
@@ -350,11 +356,4 @@ const redirectTo = computed(() => {
 		return `/lms/courses/${props.name}/certification`
 	}
 })
-
-usePageMeta(() => {
-	return {
-		title: __('Billing Details'),
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/CertifiedParticipants.vue
+++ b/frontend/src/pages/CertifiedParticipants.vue
@@ -3,7 +3,7 @@
 		class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
 	>
 		<Breadcrumbs :items="breadcrumbs" />
-		<router-link :to="{ name: 'Batches', query: { certification: true } }">
+		<router-link :to="{ name: 'Batches' }">
 			<Button>
 				<template #prefix>
 					<GraduationCap class="h-4 w-4 stroke-1.5" />
@@ -12,10 +12,12 @@
 			</Button>
 		</router-link>
 	</header>
-	<div class="mx-auto w-full max-w-4xl pt-6 pb-10">
-		<div class="flex flex-col md:flex-row justify-between mb-4 px-3">
-			<div class="text-xl font-semibold text-ink-gray-7 mb-4 md:mb-0">
-				{{ memberCount }} {{ __('certified members') }}
+	<div class="p-5 lg:w-3/4 mx-auto">
+		<div
+			class="flex flex-col lg:flex-row lg:items-center space-y-4 lg:space-y-0 justify-between mb-5"
+		>
+			<div class="text-lg text-ink-gray-9 font-semibold">
+				{{ __('All Certified Participants') }}
 			</div>
 			<div class="grid grid-cols-2 gap-2">
 				<FormControl
@@ -38,65 +40,57 @@
 				</div>
 			</div>
 		</div>
-		<div v-if="participants.data?.length" class="divide-y">
-			<template v-for="participant in participants.data">
+		<div v-if="participants.data?.length">
+			<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-5">
 				<router-link
+					v-for="participant in participants.data"
 					:to="{
 						name: 'ProfileCertificates',
-						params: {
-							username: participant.username,
-						},
+						params: { username: participant.username },
 					}"
-					class="flex sm:rounded px-3 py-2 sm:h-15 hover:bg-surface-gray-2"
 				>
-					<div class="flex items-center w-full space-x-3">
+					<div
+						class="flex items-center space-x-2 border rounded-md hover:bg-surface-menu-bar p-2 text-ink-gray-7"
+					>
 						<Avatar
 							:image="participant.user_image"
-							class="size-8 rounded-full object-contain"
 							:label="participant.full_name"
 							size="2xl"
 						/>
-						<div class="flex flex-col md:flex-row w-full">
-							<div class="flex-1">
-								<div class="text-base font-medium text-ink-gray-8">
-									{{ participant.full_name }}
-								</div>
-								<div
-									v-if="participant.headline"
-									class="mt-1.5 text-base text-ink-gray-5"
-								>
-									{{ participant.headline }}
-								</div>
+						<div class="flex flex-col space-y-2">
+							<div class="font-medium">
+								{{ participant.full_name }}
 							</div>
 							<div
-								class="flex items-center space-x-3 md:space-x-24 text-sm md:text-base mt-1.5"
+								v-if="participant.headline"
+								class="headline text-sm text-ink-gray-7"
 							>
-								<div class="text-ink-gray-5">
-									{{ participant.certificate_count }}
-									{{
-										participant.certificate_count > 1
-											? __('certificates')
-											: __('certificate')
-									}}
-								</div>
-								<span class="text-ink-gray-4 md:hidden">·</span>
-								<div class="text-ink-gray-5">
-									{{ dayjs(participant.issue_date).format('DD MMM YYYY') }}
-								</div>
+								{{ participant.headline }}
 							</div>
 						</div>
 					</div>
 				</router-link>
-			</template>
+			</div>
+			<div
+				v-if="!participants.list.loading && participants.hasNextPage"
+				class="flex justify-center mt-5"
+			>
+				<Button @click="participants.next()">
+					{{ __('Load More') }}
+				</Button>
+			</div>
 		</div>
-		<EmptyState v-else type="Certified Members" />
 		<div
-			v-if="!participants.list.loading && participants.hasNextPage"
-			class="flex justify-center mt-5"
+			v-else-if="!participants.list.loading"
+			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
 		>
-			<Button @click="participants.next()">
-				{{ __('Load More') }}
-			</Button>
+			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
+			<div class="text-lg font-medium mb-1">
+				{{ __('No participants found') }}
+			</div>
+			<div class="leading-5 w-2/5 text-center">
+				{{ __('There are no participants matching this criteria.') }}
+			</div>
 		</div>
 	</div>
 </template>
@@ -105,44 +99,30 @@ import {
 	Avatar,
 	Breadcrumbs,
 	Button,
-	call,
 	createListResource,
 	FormControl,
 	Select,
-	usePageMeta,
 } from 'frappe-ui'
-import { computed, inject, onMounted, ref } from 'vue'
-import { GraduationCap } from 'lucide-vue-next'
-import { sessionStore } from '../stores/session'
-import EmptyState from '@/components/EmptyState.vue'
+import { computed, onMounted, ref } from 'vue'
+import { updateDocumentTitle } from '@/utils'
+import { BookOpen, GraduationCap } from 'lucide-vue-next'

 const currentCategory = ref('')
 const filters = ref({})
 const nameFilter = ref('')
-const { brand } = sessionStore()
-const memberCount = ref(0)
-const dayjs = inject('$dayjs')

 onMounted(() => {
-	getMemberCount()
 	updateParticipants()
 })

 const participants = createListResource({
 	doctype: 'LMS Certificate',
 	url: 'lms.lms.api.get_certified_participants',
+	cache: ['certified_participants'],
 	start: 0,
-	pageLength: 100,
+	pageLength: 30,
 })

-const getMemberCount = () => {
-	call('lms.lms.api.get_count_of_certified_members', {
-		filters: filters.value,
-	}).then((data) => {
-		memberCount.value = data
-	})
-}
-
 const categories = createListResource({
 	doctype: 'LMS Certificate',
 	url: 'lms.lms.api.get_certification_categories',
@@ -156,7 +136,6 @@ const categories = createListResource({

 const updateParticipants = () => {
 	updateFilters()
-	getMemberCount()
 	participants.update({
 		filters: filters.value,
 	})
@@ -179,17 +158,18 @@ const updateFilters = () => {

 const breadcrumbs = computed(() => [
 	{
-		label: __('Certified Members'),
+		label: __('Certified Participants'),
 		route: { name: 'CertifiedParticipants' },
 	},
 ])

-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
-		title: __('Certified Members'),
-		icon: brand.favicon,
+		title: 'Certified Participants',
+		description: 'All participants that have been certified.',
 	}
 })
+updateDocumentTitle(pageMeta)
 </script>
 <style>
 .headline {
--- a/frontend/src/pages/CourseCertification.vue
+++ b/frontend/src/pages/CourseCertification.vue
@@ -36,14 +36,12 @@
 </template>
 <script setup>
 import { computed, inject, onMounted, ref } from 'vue'
-import { Breadcrumbs, call, createResource, usePageMeta } from 'frappe-ui'
+import { Breadcrumbs, call, createResource } from 'frappe-ui'
 import { useRouter } from 'vue-router'
-import { sessionStore } from '../stores/session'
 import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'

 const courseTitle = ref(null)
 const evaluator = ref(null)
-const { brand } = sessionStore()
 const courses = ref([])
 const user = inject('$user')
 const dayjs = inject('$dayjs')
@@ -135,11 +133,4 @@ const breadcrumbs = computed(() => [
 		label: __('Certification'),
 	},
 ])
-
-usePageMeta(() => {
-	return {
-		title: courseTitle.value,
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/CourseDetail.vue
+++ b/frontend/src/pages/CourseDetail.vue
@@ -20,7 +20,7 @@
 							:text="__('Average Rating')"
 							class="flex items-center"
 						>
-							<Star class="size-4 text-transparent fill-yellow-500" />
+							<Star class="h-5 w-5 text-gray-100 fill-orange-500" />
 							<span class="ml-1 text-ink-gray-7">
 								{{ course.data.rating }}
 							</span>
@@ -56,7 +56,7 @@
 							<CourseInstructors :instructors="course.data.instructors" />
 						</div>
 					</div>
-					<div v-if="course.data.tags" class="flex my-4 w-fit">
+					<div v-if="course.data.tags" class="flex mt-4 w-fit">
 						<Badge
 							theme="gray"
 							size="lg"
@@ -69,7 +69,7 @@
 					<CourseCardOverlay :course="course" class="md:hidden mb-4" />
 					<div
 						v-html="course.data.description"
-						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-10"
+						class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-4"
 					></div>
 					<div class="mt-10">
 						<CourseOutline
@@ -92,24 +92,16 @@
 	</div>
 </template>
 <script setup>
-import {
-	createResource,
-	Breadcrumbs,
-	Badge,
-	Tooltip,
-	usePageMeta,
-} from 'frappe-ui'
+import { createResource, Breadcrumbs, Badge, Tooltip } from 'frappe-ui'
 import { computed } from 'vue'
 import { Users, Star } from 'lucide-vue-next'
-import { sessionStore } from '@/stores/session'
 import CourseCardOverlay from '@/components/CourseCardOverlay.vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import CourseReviews from '@/components/CourseReviews.vue'
 import UserAvatar from '@/components/UserAvatar.vue'
+import { updateDocumentTitle } from '@/utils'
 import CourseInstructors from '@/components/CourseInstructors.vue'

-const { brand } = sessionStore()
-
 const props = defineProps({
 	courseName: {
 		type: String,
@@ -135,12 +127,14 @@ const breadcrumbs = computed(() => {
 	return items
 })

-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
 		title: course?.data?.title,
-		icon: brand.favicon,
+		description: course?.data?.short_introduction,
 	}
 })
+
+updateDocumentTitle(pageMeta)
 </script>
 <style>
 .avatar-group {
--- a/frontend/src/pages/CourseForm.vue
+++ b/frontend/src/pages/CourseForm.vue
@@ -3,11 +3,15 @@
 		<div class="grid md:grid-cols-[70%,30%] h-full">
 			<div>
 				<header
-					class="sticky top-0 z-10 flex flex-col md:flex-row md:items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
+					class="sticky top-0 z-10 group flex flex-col md:flex-row md:items-center justify-between border-b bg-surface-white px-3 py-2.5 sm:px-5"
 				>
 					<Breadcrumbs class="h-7" :items="breadcrumbs" />
 					<div class="flex items-center mt-3 md:mt-0">
-						<Button v-if="courseResource.data?.name" @click="trashCourse()">
+						<Button
+							v-if="courseResource.data?.name"
+							@click="trashCourse()"
+							class="invisible group-hover:visible"
+						>
 							<template #icon>
 								<Trash2 class="w-4 h-4 stroke-1.5" />
 							</template>
@@ -19,112 +23,62 @@
 						</Button>
 					</div>
 				</header>
-				<div class="mt-5 mb-5">
-					<div class="px-10 pb-5 mb-5 space-y-5 border-b">
+				<div class="mt-5 mb-10">
+					<div class="container mb-5">
 						<div class="text-lg font-semibold mb-4">
 							{{ __('Details') }}
 						</div>
-						<div class="grid grid-cols-2 gap-5">
-							<FormControl
-								v-model="course.title"
-								:label="__('Title')"
-								:required="true"
-							/>
-							<Link
-								doctype="LMS Category"
-								v-model="course.category"
-								:label="__('Category')"
-								:onCreate="(value, close) => openSettings('Categories', close)"
-							/>
-						</div>
-						<div class="grid grid-cols-2 gap-5">
-							<MultiSelect
-								v-model="instructors"
-								doctype="User"
-								:label="__('Instructors')"
-								:filters="{ ignore_user_type: 1 }"
-								:onCreate="(close) => openSettings('Members', close)"
-								:required="true"
-							/>
-							<div>
-								<div class="mb-1.5 text-xs text-ink-gray-5">
-									{{ __('Tags') }}
-								</div>
-								<div class="flex items-center">
-									<div
-										v-if="course.tags"
-										v-for="tag in course.tags?.split(', ')"
-										class="flex items-center bg-surface-gray-2 text-ink-gray-7 p-2 rounded-md mr-2"
-									>
-										{{ tag }}
-										<X
-											class="stroke-1.5 w-3 h-3 ml-2 cursor-pointer"
-											@click="removeTag(tag)"
-										/>
-									</div>
-									<FormControl
-										v-model="newTag"
-										:placeholder="__('Add a keyword and then press enter')"
-										class="w-full"
-										@keyup.enter="updateTags()"
-										id="tags"
-									/>
-								</div>
+						<FormControl
+							v-model="course.title"
+							:label="__('Title')"
+							class="mb-4"
+							:required="true"
+						/>
+						<FormControl
+							v-model="course.short_introduction"
+							:label="__('Short Introduction')"
+							:placeholder="
+								__(
+									'A one line introduction to the course that appears on the course card'
+								)
+							"
+							class="mb-4"
+							:required="true"
+						/>
+						<div class="mb-4">
+							<div class="mb-1.5 text-sm text-ink-gray-5">
+								{{ __('Course Description') }}
+								<span class="text-ink-red-3">*</span>
 							</div>
-						</div>
-						<div class="grid grid-cols-2 gap-5">
-							<FormControl
-								v-model="course.short_introduction"
-								type="textarea"
-								:rows="5"
-								:label="__('Short Introduction')"
-								:placeholder="
-									__(
-										'A one line introduction to the course that appears on the course card'
-									)
-								"
-								:required="true"
+							<TextEditor
+								:content="course.description"
+								@change="(val) => (course.description = val)"
+								:editable="true"
+								:fixedMenu="true"
+								editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
 							/>
-							<div class="mb-4">
-								<div class="text-xs text-ink-gray-5 mb-2">
-									{{ __('Course Image') }}
-									<span class="text-ink-red-3">*</span>
-								</div>
-								<FileUploader
-									v-if="!course.course_image"
-									:fileTypes="['image/*']"
-									:validateFile="validateFile"
-									@success="(file) => saveImage(file)"
+						</div>
+						<div class="mb-4">
+							<div class="text-xs text-ink-gray-5 mb-2">
+								{{ __('Course Image') }}
+								<span class="text-ink-red-3">*</span>
+							</div>
+							<FileUploader
+								v-if="!course.course_image"
+								:fileTypes="['image/*']"
+								:validateFile="validateFile"
+								@success="(file) => saveImage(file)"
+							>
+								<template
+									v-slot="{ file, progress, uploading, openFileSelector }"
 								>
-									<template
-										v-slot="{ file, progress, uploading, openFileSelector }"
-									>
-										<div class="flex items-center">
-											<div class="border rounded-md w-fit py-5 px-20">
-												<Image class="size-5 stroke-1 text-ink-gray-7" />
-											</div>
-											<div class="ml-4">
-												<Button @click="openFileSelector">
-													{{ __('Upload') }}
-												</Button>
-												<div class="mt-1 text-ink-gray-5 text-sm leading-5">
-													{{
-														__('Appears on the course card in the course list')
-													}}
-												</div>
-											</div>
-										</div>
-									</template>
-								</FileUploader>
-								<div v-else class="mb-4">
 									<div class="flex items-center">
-										<img
-											:src="course.course_image.file_url"
-											class="border rounded-md w-40"
-										/>
+										<div class="border rounded-md w-fit py-5 px-20">
+											<Image class="size-5 stroke-1 text-ink-gray-7" />
+										</div>
 										<div class="ml-4">
-											<Button @click="removeImage()">
-												{{ __('Remove') }}
+											<Button @click="openFileSelector">
+												{{ __('Upload') }}
 											</Button>
 											<div class="mt-2 text-ink-gray-5 text-sm">
 												{{
@@ -133,17 +87,85 @@
 											</div>
 										</div>
 									</div>
+								</template>
+							</FileUploader>
+							<div v-else class="mb-4">
+								<div class="flex items-center">
+									<img
+										:src="course.course_image.file_url"
+										class="border rounded-md w-40"
+									/>
+									<div class="ml-4">
+										<Button @click="removeImage()">
+											{{ __('Remove') }}
+										</Button>
+										<div class="mt-2 text-ink-gray-5 text-sm">
+											{{ __('Appears on the course card in the course list') }}
+										</div>
+									</div>
 								</div>
 							</div>
 						</div>
+						<FormControl
+							v-model="course.video_link"
+							:label="__('Preview Video')"
+							:placeholder="
+								__(
+									'Paste the youtube link of a short video introducing the course'
+								)
+							"
+							class="mb-4"
+						/>
+						<div class="mb-4">
+							<div class="mb-1.5 text-xs text-ink-gray-5">
+								{{ __('Tags') }}
+							</div>
+							<div class="flex items-center">
+								<div
+									v-if="course.tags"
+									v-for="tag in course.tags?.split(', ')"
+									class="flex items-center bg-surface-gray-2 text-ink-gray-7 p-2 rounded-md mr-2"
+								>
+									{{ tag }}
+									<X
+										class="stroke-1.5 w-3 h-3 ml-2 cursor-pointer"
+										@click="removeTag(tag)"
+									/>
+								</div>
+								<FormControl
+									v-model="newTag"
+									:placeholder="__('Add a keyword and then press enter')"
+									class="w-72"
+									@keyup.enter="updateTags()"
+									id="tags"
+								/>
+							</div>
+						</div>
+						<div class="w-1/2 mb-4">
+							<Link
+								doctype="LMS Category"
+								v-model="course.category"
+								:label="__('Category')"
+								:onCreate="(value, close) => openSettings(close)"
+							/>
+						</div>
+						<MultiSelect
+							v-model="instructors"
+							doctype="User"
+							:label="__('Instructors')"
+							:filters="{ ignore_user_type: 1 }"
+							:required="true"
+						/>
 					</div>
-
-					<div class="px-10 pb-5 mb-5 space-y-5 border-b">
-						<div class="text-lg font-semibold">
+					<div class="container border-t">
+						<div class="text-lg font-semibold mt-5 mb-4">
 							{{ __('Settings') }}
 						</div>
-						<div class="grid grid-cols-2 gap-5">
-							<div class="flex flex-col space-y-5">
+						<div class="grid grid-cols-2 gap-10 mb-4">
+							<div
+								v-if="user.data?.is_moderator"
+								class="flex flex-col space-y-4"
+							>
 								<FormControl
 									type="checkbox"
 									v-model="course.published"
@@ -153,9 +175,10 @@
 									v-model="course.published_on"
 									:label="__('Published On')"
 									type="date"
+									class="mb-5"
 								/>
 							</div>
-							<div class="flex flex-col space-y-5">
+							<div class="flex flex-col space-y-3">
 								<FormControl
 									type="checkbox"
 									v-model="course.upcoming"
@@ -174,34 +197,7 @@
 							</div>
 						</div>
 					</div>
-
-					<div class="px-10 pb-5 mb-5 space-y-5 border-b">
-						<div class="">
-							<div class="mb-1.5 text-sm text-ink-gray-5">
-								{{ __('Course Description') }}
-								<span class="text-ink-red-3">*</span>
-							</div>
-							<TextEditor
-								:content="course.description"
-								@change="(val) => (course.description = val)"
-								:editable="true"
-								:fixedMenu="true"
-								editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem]"
-							/>
-						</div>
-
-						<FormControl
-							v-model="course.video_link"
-							:label="__('Preview Video')"
-							:placeholder="
-								__(
-									'Paste the youtube link of a short video introducing the course'
-								)
-							"
-						/>
-					</div>
-
-					<div class="px-10 pb-5 space-y-5 border-b">
+					<div class="container border-t space-y-4">
 						<div class="text-lg font-semibold mt-5">
 							{{ __('Pricing and Certification') }}
 						</div>
@@ -222,52 +218,19 @@
 								:label="__('Paid Certificate')"
 							/>
 						</div>
-						<div class="grid grid-cols-2 gap-5">
-							<div class="space-y-5">
-								<FormControl
-									v-if="course.paid_course || course.paid_certificate"
-									v-model="course.course_price"
-									:label="__('Amount')"
-								/>
-								<Link
-									v-if="course.paid_certificate"
-									doctype="Course Evaluator"
-									v-model="course.evaluator"
-									:label="__('Evaluator')"
-									:onCreate="
-										(value, close) => openSettings('Evaluators', close)
-									"
-								/>
-							</div>
-							<Link
-								v-if="course.paid_course || course.paid_certificate"
-								doctype="Currency"
-								v-model="course.currency"
-								:filters="{ enabled: 1 }"
-								:label="__('Currency')"
-							/>
-						</div>
-					</div>
-
-					<div class="px-10 pb-5 space-y-5">
-						<div class="text-lg font-semibold mt-5">
-							{{ __('Meta Tags') }}
-						</div>
-						<div class="space-y-5">
-							<FormControl
-								v-model="meta.description"
-								:label="__('Meta Description')"
-								type="textarea"
-								:rows="7"
-							/>
-							<FormControl
-								v-model="meta.keywords"
-								:label="__('Meta Keywords')"
-								type="textarea"
-								:rows="7"
-								:placeholder="__('Comma separated keywords for SEO')"
-							/>
-						</div>
+						<FormControl v-model="course.course_price" :label="__('Amount')" />
+						<Link
+							doctype="Currency"
+							v-model="course.currency"
+							:filters="{ enabled: 1 }"
+							:label="__('Currency')"
+						/>
+						<Link
+							v-if="course.paid_certificate"
+							doctype="Course Evaluator"
+							v-model="course.evaluator"
+							:label="__('Evaluator')"
+						/>
 					</div>
 				</div>
 			</div>
@@ -285,14 +248,11 @@
 <script setup>
 import {
 	Breadcrumbs,
-	call,
 	TextEditor,
 	Button,
 	createResource,
 	FormControl,
 	FileUploader,
-	usePageMeta,
-	toast,
 } from 'frappe-ui'
 import {
 	inject,
@@ -304,21 +264,21 @@ import {
 	watch,
 	getCurrentInstance,
 } from 'vue'
+import { showToast, updateDocumentTitle } from '@/utils'
+import Link from '@/components/Controls/Link.vue'
 import { Image, Trash2, X } from 'lucide-vue-next'
 import { useRouter } from 'vue-router'
-import { capture, startRecording, stopRecording } from '@/telemetry'
-import { useOnboarding } from 'frappe-ui/frappe'
-import { sessionStore } from '../stores/session'
-import { openSettings, getMetaInfo, updateMetaInfo } from '@/utils'
-import Link from '@/components/Controls/Link.vue'
 import CourseOutline from '@/components/CourseOutline.vue'
 import MultiSelect from '@/components/Controls/MultiSelect.vue'
+import { capture } from '@/telemetry'
+import { useOnboarding } from 'frappe-ui/frappe'
+import { useSettings } from '@/stores/settings'

 const user = inject('$user')
 const newTag = ref('')
-const { brand } = sessionStore()
 const router = useRouter()
 const instructors = ref([])
+const settingsStore = useSettings()
 const app = getCurrentInstance()
 const { updateOnboardingStep } = useOnboarding('learning')
 const { $dialog } = app.appContext.config.globalProperties
@@ -350,30 +310,23 @@ const course = reactive({
 	evaluator: '',
 })

-const meta = reactive({
-	description: '',
-	keywords: '',
-})
-
 onMounted(() => {
-	if (!user.data?.is_moderator && !user.data?.is_instructor) {
+	if (
+		props.courseName == 'new' &&
+		!user.data?.is_moderator &&
+		!user.data?.is_instructor
+	) {
 		router.push({ name: 'Courses' })
 	}

 	if (props.courseName !== 'new') {
-		fetchCourseInfo()
+		courseResource.reload()
 	} else {
 		capture('course_form_opened')
-		startRecording()
 	}
 	window.addEventListener('keydown', keyboardShortcut)
 })

-const fetchCourseInfo = () => {
-	courseResource.reload()
-	getMetaInfo('courses', props.courseName, meta)
-}
-
 const keyboardShortcut = (e) => {
 	if (
 		e.key === 's' &&
@@ -387,7 +340,6 @@ const keyboardShortcut = (e) => {

 onBeforeUnmount(() => {
 	window.removeEventListener('keydown', keyboardShortcut)
-	stopRecording()
 })

 const courseCreationResource = createResource({
@@ -449,7 +401,7 @@ const courseResource = createResource({
 			'paid_course',
 			'featured',
 			'enable_certification',
-			'paid_certificate',
+			'paid_certifiate',
 		]
 		for (let idx in checkboxes) {
 			let key = checkboxes[idx]
@@ -476,50 +428,37 @@ const imageResource = createResource({

 const submitCourse = () => {
 	if (courseResource.data) {
-		editCourse()
+		courseEditResource.submit(
+			{
+				course: courseResource.data.name,
+			},
+			{
+				onSuccess() {
+					showToast('Success', 'Course updated successfully', 'check')
+				},
+				onError(err) {
+					showToast('Error', err.messages?.[0] || err, 'x')
+				},
+			}
+		)
 	} else {
-		createCourse()
-	}
-}
-
-const createCourse = () => {
-	courseCreationResource.submit(course, {
-		onSuccess(data) {
-			updateMetaInfo('courses', data.name, meta)
-			if (user.data?.is_system_manager) {
+		courseCreationResource.submit(course, {
+			onSuccess(data) {
+				capture('course_created')
+				showToast('Success', 'Course created successfully', 'check')
 				updateOnboardingStep('create_first_course', true, false, () => {
 					localStorage.setItem('firstCourse', data.name)
 				})
-			}
-
-			capture('course_created')
-			toast.success(__('Course created successfully'))
-			router.push({
-				name: 'CourseForm',
-				params: { courseName: data.name },
-			})
-		},
-		onError(err) {
-			toast.error(err.messages?.[0] || err)
-		},
-	})
-}
-
-const editCourse = () => {
-	courseEditResource.submit(
-		{
-			course: courseResource.data.name,
-		},
-		{
-			onSuccess() {
-				updateMetaInfo('courses', props.courseName, meta)
-				toast.success(__('Course updated successfully'))
+				router.push({
+					name: 'CourseForm',
+					params: { courseName: data.name },
+				})
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.messages?.[0] || err, 'x')
 			},
-		}
-	)
+		})
+	}
 }

 const deleteCourse = createResource({
@@ -530,7 +469,7 @@ const deleteCourse = createResource({
 		}
 	},
 	onSuccess() {
-		toast.success(__('Course deleted successfully'))
+		showToast(__('Success'), __('Course deleted successfully'), 'check')
 		router.push({ name: 'Courses' })
 	},
 })
@@ -559,7 +498,7 @@ watch(
 	() => props.courseName !== 'new',
 	(newVal) => {
 		if (newVal) {
-			fetchCourseInfo()
+			courseResource.reload()
 		}
 	}
 )
@@ -594,6 +533,12 @@ const removeImage = () => {
 	course.course_image = null
 }

+const openSettings = (close) => {
+	close()
+	settingsStore.activeTab = 'Categories'
+	settingsStore.isSettingsOpen = true
+}
+
 const check_permission = () => {
 	let user_is_instructor = false
 	if (user.data?.is_moderator) return
@@ -629,10 +574,12 @@ const breadcrumbs = computed(() => {
 	return crumbs
 })

-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
-		title: courseResource.data?.title || __('New Course'),
-		icon: brand.favicon,
+		title: 'Create a Course',
+		description: 'Create or edit a course for your learning system.',
 	}
 })
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -4,7 +4,7 @@
 	>
 		<Breadcrumbs :items="breadcrumbs" />
 		<router-link
-			v-if="canCreateCourse()"
+			v-if="user.data?.is_moderator"
 			:to="{
 				name: 'CourseForm',
 				params: { courseName: 'new' },
@@ -57,7 +57,7 @@
 		</div>
 		<div
 			v-if="courses.data?.length"
-			class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-4"
+			class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-5"
 		>
 			<router-link
 				v-for="course in courses.data"
@@ -66,7 +66,22 @@
 				<CourseCard :course="course" />
 			</router-link>
 		</div>
-		<EmptyState v-else-if="!courses.list.loading" type="Courses" />
+		<div
+			v-else-if="!courses.list.loading"
+			class="flex flex-col items-center justify-center text-sm text-ink-gray-5 italic mt-48"
+		>
+			<BookOpen class="size-10 mx-auto stroke-1 text-ink-gray-4" />
+			<div class="text-lg font-medium mb-1">
+				{{ __('No courses found') }}
+			</div>
+			<div class="leading-5 w-2/5 text-center">
+				{{
+					__(
+						'There are no courses matching the criteria. Keep an eye out, fresh learning experiences are on the way soon!'
+					)
+				}}
+			</div>
+		</div>
 		<div
 			v-if="!courses.list.loading && courses.hasNextPage"
 			class="flex justify-center mt-5"
@@ -81,20 +96,15 @@
 import {
 	Breadcrumbs,
 	Button,
-	call,
 	createListResource,
 	FormControl,
 	Select,
 	TabButtons,
-	usePageMeta,
 } from 'frappe-ui'
 import { computed, inject, onMounted, ref, watch } from 'vue'
-import { Plus } from 'lucide-vue-next'
-import { sessionStore } from '@/stores/session'
-import { canCreateCourse } from '@/utils'
+import { BookOpen, Plus } from 'lucide-vue-next'
+import { updateDocumentTitle } from '@/utils'
 import CourseCard from '@/components/CourseCard.vue'
-import EmptyState from '@/components/EmptyState.vue'
-import router from '../router'

 const user = inject('$user')
 const dayjs = inject('$dayjs')
@@ -106,13 +116,10 @@ const title = ref('')
 const certification = ref(false)
 const filters = ref({})
 const currentTab = ref('Live')
-const { brand } = sessionStore()
-const courseCount = ref(0)

 onMounted(() => {
 	setFiltersFromQuery()
 	updateCourses()
-	getCourseCount()
 	categories.value = [
 		{
 			label: '',
@@ -135,51 +142,16 @@ const courses = createListResource({
 	pageLength: pageLength.value,
 	start: start.value,
 	onSuccess(data) {
-		setCategories(data)
+		let allCategories = data.map((course) => course.category)
+		allCategories = allCategories.filter(
+			(category, index) => allCategories.indexOf(category) === index && category
+		)
+		if (categories.value.length <= allCategories.length) {
+			updateCategories(data)
+		}
 	},
 })

-const setCategories = (data) => {
-	let allCategories = data.map((course) => course.category)
-	allCategories = allCategories.filter(
-		(category, index) => allCategories.indexOf(category) === index && category
-	)
-	if (categories.value.length <= allCategories.length) {
-		updateCategories(data)
-	}
-}
-
-const isPersonaCaptured = async () => {
-	let persona = await call('frappe.client.get_single_value', {
-		doctype: 'LMS Settings',
-		field: 'persona_captured',
-	})
-	return persona
-}
-
-const identifyUserPersona = async () => {
-	if (user.data?.is_system_manager && !user.data?.developer_mode) {
-		let personaCaptured = await isPersonaCaptured()
-		if (personaCaptured) return
-		if (!courseCount.value) {
-			router.push({
-				name: 'PersonaForm',
-			})
-		}
-	}
-}
-
-const getCourseCount = () => {
-	if (!user.data) return
-
-	call('frappe.client.get_count', {
-		doctype: 'LMS Course',
-	}).then((data) => {
-		courseCount.value = data
-		identifyUserPersona()
-	})
-}
-
 const updateCourses = () => {
 	updateFilters()
 	courses.update({
@@ -240,6 +212,7 @@ const updateTabFilter = () => {
 			filters.value['live'] = 1
 		} else if (currentTab.value == 'Upcoming') {
 			filters.value['upcoming'] = 1
+			filters.value['published'] = 1
 		} else if (currentTab.value == 'New') {
 			filters.value['published'] = 1
 			filters.value['published_on'] = [
@@ -248,8 +221,6 @@ const updateTabFilter = () => {
 			]
 		} else if (currentTab.value == 'Created') {
 			filters.value['created'] = 1
-		} else if (currentTab.value == 'Unpublished') {
-			filters.value['published'] = 0
 		}
 	}
 }
@@ -319,7 +290,6 @@ const courseTabs = computed(() => {
 		user.data?.is_evaluator
 	) {
 		tabs.push({ label: __('Created') })
-		tabs.push({ label: __('Unpublished') })
 	} else if (user.data) {
 		tabs.push({ label: __('Enrolled') })
 	}
@@ -333,10 +303,12 @@ const breadcrumbs = computed(() => [
 	},
 ])

-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
-		title: __('Courses'),
-		icon: brand.favicon,
+		title: 'Courses',
+		description: 'All published courses.',
 	}
 })
+
+updateDocumentTitle(pageMeta)
 </script>
--- a/frontend/src/pages/Home.vue
+++ b/frontend/src/pages/Home.vue
@@ -0,0 +1,39 @@
+<template>
+	<div class="max-w-3xl py-12 mx-auto">
+		<Button
+			icon-left="code"
+			@click="$resources.ping.fetch"
+			:loading="$resources.ping.loading"
+		>
+			Click to send 'ping' request
+		</Button>
+		<div>
+			{{ $resources.ping.data }}
+		</div>
+		<pre>{{ $resources.ping }}</pre>
+
+		<Button @click="showDialog = true">Open Dialog</Button>
+		<Dialog title="Title" v-model="showDialog"> Dialog content </Dialog>
+	</div>
+</template>
+
+<script>
+import { Dialog } from 'frappe-ui'
+
+export default {
+	name: 'Home',
+	data() {
+		return {
+			showDialog: false,
+		}
+	},
+	resources: {
+		ping: {
+			url: 'ping',
+		},
+	},
+	components: {
+		Dialog,
+	},
+}
+</script>
--- a/frontend/src/pages/JobCreation.vue
+++ b/frontend/src/pages/JobCreation.vue
@@ -9,39 +9,34 @@
 			</Button>
 		</header>
 		<div class="py-5">
-			<div class="container border-b mb-4 pb-5">
+			<div class="container border-b mb-4 pb-4">
 				<div class="text-lg font-semibold mb-4">
 					{{ __('Job Details') }}
 				</div>
-				<div class="grid grid-cols-2 gap-5">
-					<div class="space-y-4">
+				<div class="grid grid-cols-2 gap-4">
+					<div>
 						<FormControl
 							v-model="job.job_title"
 							:label="__('Title')"
+							class="mb-4"
 							:required="true"
 						/>
+						<FormControl
+							v-model="job.location"
+							:label="__('Location')"
+							:required="true"
+						/>
+					</div>
+					<div>
 						<FormControl
 							v-model="job.type"
 							:label="__('Type')"
 							type="select"
 							:options="jobTypes"
-							:required="true"
-						/>
-					</div>
-					<div class="space-y-4">
-						<FormControl
-							v-model="job.location"
-							:label="__('City')"
-							:required="true"
-						/>
-						<Link
-							v-model="job.country"
-							doctype="Country"
-							:label="__('Country')"
+							class="mb-4"
 							:required="true"
 						/>
 						<FormControl
-							v-if="jobName != 'new'"
 							v-model="job.status"
 							:label="__('Status')"
 							type="select"
@@ -50,12 +45,25 @@
 						/>
 					</div>
 				</div>
+				<div class="mt-4">
+					<label class="block text-ink-gray-5 text-xs mb-1">
+						{{ __('Description') }}
+						<span class="text-ink-red-3">*</span>
+					</label>
+					<TextEditor
+						:content="job.description"
+						@change="(val) => (job.description = val)"
+						:editable="true"
+						:fixedMenu="true"
+						editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] mb-4"
+					/>
+				</div>
 			</div>
-			<div class="container border-b mb-4 pb-5">
+			<div class="container mb-4 pb-4">
 				<div class="text-lg font-semibold mb-4">
 					{{ __('Company Details') }}
 				</div>
-				<div class="grid grid-cols-2 gap-5">
+				<div class="grid grid-cols-2 gap-4">
 					<div>
 						<FormControl
 							v-model="job.company_name"
@@ -120,19 +128,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="container mt-4">
-				<label class="block text-ink-gray-5 text-xs mb-1">
-					{{ __('Description') }}
-					<span class="text-ink-red-3">*</span>
-				</label>
-				<TextEditor
-					:content="job.description"
-					@change="(val) => (job.description = val)"
-					:editable="true"
-					:fixedMenu="true"
-					editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] mb-4"
-				/>
-			</div>
 		</div>
 	</div>
 </template>
@@ -144,18 +139,14 @@ import {
 	Button,
 	TextEditor,
 	FileUploader,
-	usePageMeta,
-	toast,
 } from 'frappe-ui'
 import { computed, onMounted, reactive, inject } from 'vue'
 import { FileText, X } from 'lucide-vue-next'
-import { sessionStore } from '@/stores/session'
 import { useRouter } from 'vue-router'
-import { getFileSize } from '@/utils'
+import { getFileSize, showToast } from '../utils'

 const user = inject('$user')
 const router = useRouter()
-const { brand } = sessionStore()

 const props = defineProps({
 	jobName: {
@@ -223,7 +214,6 @@ const imageResource = createResource({
 const job = reactive({
 	job_title: '',
 	location: '',
-	country: '',
 	type: 'Full Time',
 	status: 'Open',
 	company_name: '',
@@ -260,7 +250,7 @@ const createNewJob = () => {
 				})
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.messages?.[0] || err, 'x')
 			},
 		}
 	)
@@ -279,7 +269,7 @@ const editJobDetails = () => {
 				})
 			},
 			onError(err) {
-				toast.error(err.messages?.[0] || err)
+				showToast('Error', err.messages?.[0] || err, 'x')
 			},
 		}
 	)
@@ -324,16 +314,9 @@ const breadcrumbs = computed(() => {
 		},
 		{
 			label: props.jobName == 'new' ? 'New Job' : 'Edit Job',
-			route: { name: 'JobForm' },
+			route: { name: 'JobCreation' },
 		},
 	]
 	return crumbs
 })
-
-usePageMeta(() => {
-	return {
-		title: props.jobName == 'new' ? 'New Job' : jobDetail.data?.title,
-		icon: brand.favicon,
-	}
-})
 </script>
--- a/frontend/src/pages/JobDetail.vue
+++ b/frontend/src/pages/JobDetail.vue
@@ -16,30 +16,21 @@
 					},
 				]"
 			/>
-			<div
-				v-if="user.data?.name && !readOnlyMode"
-				class="flex items-center space-x-2"
-			>
+			<div v-if="user.data?.name" class="flex">
 				<router-link
 					v-if="user.data.name == job.data?.owner"
 					:to="{
-						name: 'JobForm',
+						name: 'JobCreation',
 						params: { jobName: job.data?.name },
 					}"
 				>
-					<Button>
+					<Button class="mr-2">
 						<template #prefix>
 							<Pencil class="h-4 w-4 stroke-1.5" />
 						</template>
 						{{ __('Edit') }}
 					</Button>
 				</router-link>
-				<Button @click="redirectToWebsite(job.data?.company_website)">
-					<template #prefix>
-						<SquareArrowOutUpRight class="h-4 w-4 stroke-1.5" />
-					</template>
-					{{ __('Visit Website') }}
-				</Button>
 				<Button
 					v-if="!jobApplication.data?.length"
 					variant="solid"
@@ -50,14 +41,8 @@
 					</template>
 					{{ __('Apply') }}
 				</Button>
-				<Badge v-else variant="subtle" theme="green" size="lg">
-					<template #prefix>
-						<Check class="h-4 w-4" />
-					</template>
-					{{ __('You have applied') }}
-				</Badge>
 			</div>
-			<div v-else-if="!readOnlyMode">
+			<div v-else>
 				<Button @click="redirectToLogin(job.data?.name)">
 					<span>
 						{{ __('Login to apply') }}
@@ -65,63 +50,87 @@
 				</Button>
 			</div>
 		</header>
-		<div v-if="job.data" class="max-w-3xl mx-auto pt-5">
+		<div v-if="job.data" class="max-w-3xl mx-auto">
 			<div class="p-4">
-				<div class="space-y-5 mb-12">
-					<div class="flex">
+				<div class="space-y-5 mb-10">
+					<div class="flex items-center">
 						<img
 							:src="job.data.company_logo"
-							class="size-10 rounded-lg object-contain cursor-pointer mr-4"
+							class="w-16 h-16 rounded-lg object-contain mr-4"
 							:alt="job.data.company_name"
-							@click="redirectToWebsite(job.data.company_website)"
 						/>
-						<div class="">
-							<div class="text-2xl text-ink-gray-9 font-semibold mb-1">
-								{{ job.data.job_title }}
+						<div class="text-2xl text-ink-gray-9 font-semibold mb-4">
+							{{ job.data.job_title }}
+						</div>
+					</div>
+					<div>
+						<div
+							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-5 md:gap-y-5"
+						>
+							<div class="flex items-center space-x-4">
+								<Building2 class="h-4 w-4 text-ink-green-2" />
+								<div class="flex flex-col space-y-2 text-ink-gray-7">
+									<span class="text-xs text-ink-gray-5 font-medium uppercase">
+										{{ __('Organisation') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.company_name }}
+									</span>
+								</div>
 							</div>
-							<div class="text-sm text-ink-gray-5 font-semibold">
-								{{ job.data.company_name }} - {{ job.data.location }},
-								{{ job.data.country }}
+							<div class="flex items-center space-x-4">
+								<MapPin class="size-4 text-ink-red-3" />
+								<div class="flex flex-col space-y-2 text-ink-gray-7">
+									<span class="text-xs font-medium uppercase">
+										{{ __('Location') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.location }}
+									</span>
+								</div>
+							</div>
+							<div class="flex items-center space-x-4">
+								<ClipboardType class="h-4 w-4 text-yellow-500" />
+								<div class="flex flex-col space-y-2 text-ink-gray-7">
+									<span class="text-xs font-medium uppercase">
+										{{ __('Category') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ job.data.type }}
+									</span>
+								</div>
+							</div>
+							<div class="flex items-center space-x-4">
+								<CalendarDays class="h-4 w-4 text-ink-blue-2" />
+								<div class="flex flex-col space-y-2 text-ink-gray-7">
+									<span class="text-xs font-medium uppercase">
+										{{ __('Posted on') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
+									</span>
+								</div>
+							</div>
+							<div
+								v-if="applicationCount.data"
+								class="flex items-center space-x-4"
+							>
+								<SquareUserRound class="h-4 w-4 text-purple-500" />
+								<div class="flex flex-col space-y-2 text-ink-gray-7">
+									<span class="text-xs font-medium uppercase">
+										{{ __('Applications Received') }}
+									</span>
+									<span class="text-sm font-semibold">
+										{{ applicationCount.data }}
+									</span>
+								</div>
 							</div>
 						</div>
 					</div>
-
-					<div class="space-x-5">
-						<Badge size="lg">
-							<template #prefix>
-								<CalendarDays class="size-3 stroke-2 text-ink-gray-7" />
-							</template>
-							{{ dayjs(job.data.creation).fromNow() }}
-						</Badge>
-						<Badge size="lg">
-							<template #prefix>
-								<ClipboardType class="size-3 stroke-2 text-ink-gray-7" />
-							</template>
-							{{ job.data.type }}
-						</Badge>
-						<Badge v-if="applicationCount.data" size="lg">
-							<template #prefix>
-								<SquareUserRound class="size-3 stroke-2 text-ink-gray-7" />
-							</template>
-							{{ applicationCount.data }}
-							{{
-								applicationCount.data == 1 ? __('applicant') : __('applicants')
-							}}
-						</Badge>
-					</div>
 				</div>
-
-				<div class="flex items-center justify-between">
-					<div class="bg-surface-gray-2 h-px m-1 w-1/2"></div>
-					<div>
-						<FileText class="size-3 stroke-1 text-ink-gray-5" />
-					</div>
-					<div class="bg-surface-gray-2 h-px m-1 w-1/2"></div>
-				</div>
-
 				<p
 					v-html="job.data.description"
-					class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-12"
+					class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-6"
 				></p>
 			</div>
 			<JobApplicationModal
@@ -133,32 +142,23 @@
 	</div>
 </template>
 <script setup>
-import {
-	Badge,
-	Button,
-	Breadcrumbs,
-	createResource,
-	usePageMeta,
-} from 'frappe-ui'
-import { inject, ref } from 'vue'
-import { sessionStore } from '../stores/session'
+import { Button, Breadcrumbs, createResource } from 'frappe-ui'
+import { inject, ref, computed } from 'vue'
+import { updateDocumentTitle } from '@/utils'
 import JobApplicationModal from '@/components/Modals/JobApplicationModal.vue'
 import {
-	Check,
+	MapPin,
 	SendHorizonal,
 	Pencil,
+	Building2,
 	CalendarDays,
-	SquareUserRound,
-	SquareArrowOutUpRight,
-	FileText,
 	ClipboardType,
+	SquareUserRound,
 } from 'lucide-vue-next'

 const user = inject('$user')
 const dayjs = inject('$dayjs')
-const { brand } = sessionStore()
 const showApplicationModal = ref(false)
-const readOnlyMode = window.read_only_mode

 const props = defineProps({
 	job: {
@@ -215,23 +215,12 @@ const redirectToLogin = (job) => {
 	window.location.href = `/login?redirect-to=/job-openings/${job}`
 }

-const redirectToWebsite = (url) => {
-	window.open(url, '_blank')
-}
-
-usePageMeta(() => {
+const pageMeta = computed(() => {
 	return {
 		title: job.data?.job_title,
-		icon: brand.favicon,
+		description: job.data?.description,
 	}
 })
+
+updateDocumentTitle(pageMeta)
 </script>
-<style>
-p {
-	margin-bottom: 0.5rem !important;
-	line-height: 1.5;
-}
-p span {
-	line-height: 1.5;
-}
-</style>
--- a/Show More
+++ b/Show More