diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches.vue
index 335ae2167..935ddbf08 100644
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches.vue
@@ -163,7 +163,7 @@ onMounted(() => {
 const batches = createResource({
 	doctype: 'LMS Batch',
 	url: 'lms.lms.utils.get_batches',
-	cache: ['batches', user.data?.email],
+	cache: ['batches', user.data?.email || ''],
 	auto: true,
 })
 
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index 16ae3ba08..54bf36872 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -71,7 +71,7 @@
 				<template #default="{ tab }">
 					<div
 						v-if="tab.courses && tab.courses.value.length"
-						class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-5 my-5 mx-5"
+						class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 gap-7 my-5 mx-5"
 					>
 						<router-link
 							v-for="course in tab.courses.value"
diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index dfa3a5780..5dd10149e 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -475,7 +475,8 @@ updateDocumentTitle(pageMeta)
 	font-weight: 500;
 }
 
-.embed-tool__caption {
+.embed-tool__caption,
+.cdx-simple-image__caption {
 	display: none;
 }
 
@@ -585,4 +586,8 @@ iframe {
 	border-top: 3px solid theme('colors.gray.700');
 	border-bottom: 3px solid theme('colors.gray.700');
 }
+
+.tc-table {
+	border-left: 1px solid #e8e8eb;
+}
 </style>
diff --git a/frontend/src/pages/LessonForm.vue b/frontend/src/pages/LessonForm.vue
index 7ef014b9c..f3f687fae 100644
--- a/frontend/src/pages/LessonForm.vue
+++ b/frontend/src/pages/LessonForm.vue
@@ -619,4 +619,8 @@ iframe {
 	border-top: 3px solid theme('colors.gray.700');
 	border-bottom: 3px solid theme('colors.gray.700');
 }
+
+.tc-table {
+	border-left: 1px solid #e8e8eb;
+}
 </style>
diff --git a/frontend/src/stores/settings.js b/frontend/src/stores/settings.js
index 9aea84760..184010574 100644
--- a/frontend/src/stores/settings.js
+++ b/frontend/src/stores/settings.js
@@ -1,8 +1,10 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { createResource } from 'frappe-ui'
+import { sessionStore } from './session'
 
 export const useSettings = defineStore('settings', () => {
+	const { isLoggedIn } = sessionStore()
 	const isSettingsOpen = ref(false)
 	const activeTab = ref(null)
 	const learningPaths = createResource({
@@ -13,13 +15,13 @@ export const useSettings = defineStore('settings', () => {
 				field: 'enable_learning_paths',
 			}
 		},
-		auto: true,
+		auto: isLoggedIn ? true : false,
 		cache: ['learningPaths'],
 	})
 
 	const onboardingDetails = createResource({
 		url: 'lms.lms.utils.is_onboarding_complete',
-		auto: true,
+		auto: isLoggedIn ? true : false,
 		cache: ['onboardingDetails'],
 	})
 
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 7e99aee1a..9a0062663 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -160,7 +160,10 @@ export function getEditorTools() {
 		upload: Upload,
 		markdown: Markdown,
 		image: SimpleImage,
-		table: Table,
+		table: {
+			class: Table,
+			inlineToolbar: true,
+		},
 		paragraph: {
 			class: Paragraph,
 			inlineToolbar: true,
@@ -179,6 +182,7 @@ export function getEditorTools() {
 		},
 		list: {
 			class: NestedList,
+			inlineToolbar: true,
 			config: {
 				defaultStyle: 'ordered',
 			},
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index 658de0a98..764b1c384 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -11,6 +11,10 @@ module.exports = {
 			strokeWidth: {
 				1.5: '1.5',
 			},
+			screens: {
+				'2xl': '1536px',
+				'3xl': '1920px',
+			},
 		},
 	},
 	plugins: [],
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 6171a1646..8aa3a1ff7 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1244,6 +1244,7 @@ def get_batch_card_details(batchname):
 			"end_time",
 			"timezone",
 			"published",
+			"category",
 		],
 		as_dict=True,
 	)