diff --git a/frontend/src/pages/Home/AdminHome.vue b/frontend/src/pages/Home/AdminHome.vue
index c027b996..22be0957 100644
--- a/frontend/src/pages/Home/AdminHome.vue
+++ b/frontend/src/pages/Home/AdminHome.vue
@@ -54,108 +54,136 @@
 					<BatchCard :batch="batch" />
 				</router-link>
 			</div>
+		</div>
 
-			<div class="grid grid-cols-2 gap-5 mt-10">
-				<div v-if="evals?.data?.length">
-					<div class="font-semibold text-lg mb-3">
-						{{ __('Upcoming Evaluations') }}
-					</div>
-					<div class="grid grid-cols-1 lg:grid-cols-2 gap-5">
-						<div
-							v-for="evaluation in evals?.data"
-							class="border rounded-md p-3 flex flex-col h-full cursor-pointer"
-							@click="redirectToProfile()"
-						>
-							<div class="font-semibold text-ink-gray-9 text-lg mb-1">
-								{{ evaluation.course_title }}
+		<div
+			v-if="!createdCourses.data?.length && !createdBatches.data?.length"
+			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-1.5">
+				{{ __('No courses created') }}
+			</div>
+			<div
+				class="leading-5 text-base w-full md:w-2/5 text-base text-center text-ink-gray-7"
+			>
+				{{
+					__(
+						'There are no courses currently. Create your first course to get started!'
+					)
+				}}
+			</div>
+			<router-link
+				:to="{ name: 'CourseForm', params: { courseName: 'new' } }"
+				class="mt-4"
+			>
+				<Button>
+					<template #prefix>
+						<Plus class="size-4 stroke-1.5" />
+					</template>
+					{{ __('Create Course') }}
+				</Button>
+			</router-link>
+		</div>
+
+		<div class="grid grid-cols-2 gap-5 mt-10">
+			<div v-if="evals?.data?.length">
+				<div class="font-semibold text-lg mb-3">
+					{{ __('Upcoming Evaluations') }}
+				</div>
+				<div class="grid grid-cols-1 lg:grid-cols-2 gap-5">
+					<div
+						v-for="evaluation in evals?.data"
+						class="border rounded-md p-3 flex flex-col h-full cursor-pointer"
+						@click="redirectToProfile()"
+					>
+						<div class="font-semibold text-ink-gray-9 text-lg mb-1">
+							{{ evaluation.course_title }}
+						</div>
+						<div class="text-ink-gray-7 text-sm">
+							<div class="flex items-center mb-2">
+								<Calendar class="w-4 h-4 stroke-1.5" />
+								<span class="ml-2">
+									{{ dayjs(evaluation.date).format('DD MMMM YYYY') }}
+								</span>
 							</div>
-							<div class="text-ink-gray-7 text-sm">
-								<div class="flex items-center mb-2">
-									<Calendar class="w-4 h-4 stroke-1.5" />
-									<span class="ml-2">
-										{{ dayjs(evaluation.date).format('DD MMMM YYYY') }}
-									</span>
-								</div>
-								<div class="flex items-center mb-2">
-									<Clock class="w-4 h-4 stroke-1.5" />
-									<span class="ml-2">
-										{{ formatTime(evaluation.start_time) }}
-									</span>
-								</div>
-								<div class="flex items-center">
-									<GraduationCap class="w-4 h-4 stroke-1.5" />
-									<span class="ml-2">
-										{{ evaluation.member_name }}
-									</span>
-								</div>
+							<div class="flex items-center mb-2">
+								<Clock class="w-4 h-4 stroke-1.5" />
+								<span class="ml-2">
+									{{ formatTime(evaluation.start_time) }}
+								</span>
+							</div>
+							<div class="flex items-center">
+								<GraduationCap class="w-4 h-4 stroke-1.5" />
+								<span class="ml-2">
+									{{ evaluation.member_name }}
+								</span>
 							</div>
 						</div>
 					</div>
 				</div>
-				<div v-if="liveClasses?.data?.length">
-					<div class="font-semibold text-lg mb-3">
-						{{ __('Upcoming Live Classes') }}
-					</div>
-					<div class="grid grid-cols-1 lg:grid-cols-2 gap-5">
-						<div v-for="cls in liveClasses?.data" class="border rounded-md p-3">
-							<div class="font-semibold text-ink-gray-9 text-lg mb-1">
-								{{ cls.title }}
+			</div>
+			<div v-if="liveClasses?.data?.length">
+				<div class="font-semibold text-lg mb-3">
+					{{ __('Upcoming Live Classes') }}
+				</div>
+				<div class="grid grid-cols-1 lg:grid-cols-2 gap-5">
+					<div v-for="cls in liveClasses?.data" class="border rounded-md p-3">
+						<div class="font-semibold text-ink-gray-9 text-lg mb-1">
+							{{ cls.title }}
+						</div>
+						<div class="text-ink-gray-7 text-sm leading-5 mb-4">
+							{{ cls.description }}
+						</div>
+						<div class="mt-auto space-y-3 text-ink-gray-7 text-sm">
+							<div class="flex items-center space-x-2">
+								<Calendar class="w-4 h-4 stroke-1.5" />
+								<span>
+									{{ dayjs(cls.date).format('DD MMMM YYYY') }}
+								</span>
 							</div>
-							<div class="text-ink-gray-7 text-sm leading-5 mb-4">
-								{{ cls.description }}
+							<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 A') }}
+								</span>
 							</div>
-							<div class="mt-auto space-y-3 text-ink-gray-7 text-sm">
-								<div class="flex items-center space-x-2">
-									<Calendar class="w-4 h-4 stroke-1.5" />
+							<div
+								v-if="canAccessClass(cls)"
+								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'"
+								>
+									<Monitor class="h-4 w-4 stroke-1.5" />
+									{{ __('Start') }}
+								</a>
+								<a
+									:href="cls.join_url"
+									target="_blank"
+									class="w-full 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"
+								>
+									<Video class="h-4 w-4 stroke-1.5" />
+									{{ __('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>
-										{{ dayjs(cls.date).format('DD MMMM YYYY') }}
+										{{ __('Ended') }}
 									</span>
 								</div>
-								<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 A') }}
-									</span>
-								</div>
-								<div
-									v-if="canAccessClass(cls)"
-									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'"
-									>
-										<Monitor class="h-4 w-4 stroke-1.5" />
-										{{ __('Start') }}
-									</a>
-									<a
-										:href="cls.join_url"
-										target="_blank"
-										class="w-full 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"
-									>
-										<Video class="h-4 w-4 stroke-1.5" />
-										{{ __('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>
+							</Tooltip>
 						</div>
 					</div>
 				</div>
@@ -164,7 +192,7 @@
 	</div>
 </template>
 <script setup lang="ts">
-import { createResource, Tooltip } from 'frappe-ui'
+import { Button, createResource, Tooltip } from 'frappe-ui'
 import { inject } from 'vue'
 import { useRouter } from 'vue-router'
 import {
@@ -174,6 +202,7 @@ import {
 	Info,
 	Monitor,
 	MoveRight,
+	Plus,
 	Video,
 } from 'lucide-vue-next'
 import { formatTime } from '@/utils'
diff --git a/frontend/src/pages/Home/Streak.vue b/frontend/src/pages/Home/Streak.vue
index e52bc80f..49ba31a9 100644
--- a/frontend/src/pages/Home/Streak.vue
+++ b/frontend/src/pages/Home/Streak.vue
@@ -52,7 +52,7 @@
 				>
 					{{
 						__(
-							"A learning streak is the number of consecutive days you've completed a learning activity like completing a lesson, quiz or an assignment."
+							'Your learning streak counts the number of days in a row you’ve kept up your learning, whether it’s a lesson, quiz, or assignment. Don’t worry, weekends don’t break your streak.'
 						)
 					}}
 				</div>
@@ -62,7 +62,6 @@
 </template>
 <script setup lang="ts">
 import { Dialog } from 'frappe-ui'
-import { Info } from 'lucide-vue-next'
 
 const show = defineModel<boolean>({
 	default: false,
diff --git a/frontend/src/pages/Home/StudentHome.vue b/frontend/src/pages/Home/StudentHome.vue
index 744af3c1..457d99f3 100644
--- a/frontend/src/pages/Home/StudentHome.vue
+++ b/frontend/src/pages/Home/StudentHome.vue
@@ -3,7 +3,11 @@
 		<div v-if="myCourses.data?.length" class="mt-10">
 			<div class="flex items-center justify-between mb-3">
 				<span class="font-semibold text-lg">
-					{{ __('My Courses') }}
+					{{
+						myCourses.data[0].membership
+							? __('My Courses')
+							: __('Our Popular Courses')
+					}}
 				</span>
 				<router-link
 					:to="{
@@ -31,7 +35,11 @@
 		<div v-if="myBatches.data?.length" class="mt-10">
 			<div class="flex items-center justify-between mb-3">
 				<span class="font-semibold text-lg">
-					{{ __('My Batches') }}
+					{{
+						myBatches.data?.[0].students.includes(user.data?.name)
+							? __('My Batches')
+							: __('Our Upcoming Batches')
+					}}
 				</span>
 				<router-link
 					:to="{
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 94d5ac8f..f6b494e6 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -61,7 +61,7 @@ export default defineConfig({
 	],
 	server: {
 		host: '0.0.0.0', // Accept connections from any network interface
-		allowedHosts: ['ps', 'fs'], // Explicitly allow this host
+		allowedHosts: ['ps', 'fs', 'home'], // Explicitly allow this host
 	},
 	resolve: {
 		alias: {
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 0ffb24f3..9f6ef546 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -2150,7 +2150,22 @@ def get_my_courses():
 	if frappe.session.user == "Guest":
 		return my_courses
 
-	courses = frappe.get_all(
+	courses = get_my_latest_courses()
+
+	if not len(courses):
+		courses = get_featured_home_courses()
+
+	if not len(courses):
+		courses = get_popular_courses()
+
+	for course in courses:
+		my_courses.append(get_course_details(course))
+
+	return my_courses
+
+
+def get_my_latest_courses():
+	return frappe.get_all(
 		"LMS Enrollment",
 		{
 			"member": frappe.session.user,
@@ -2160,10 +2175,27 @@ def get_my_courses():
 		pluck="course",
 	)
 
-	for course in courses:
-		my_courses.append(get_course_details(course))
 
-	return my_courses
+def get_featured_home_courses():
+	return frappe.get_all(
+		"LMS Course",
+		{"published": 1, "featured": 1},
+		order_by="published_on desc",
+		limit=3,
+		pluck="name",
+	)
+
+
+def get_popular_courses():
+	return frappe.get_all(
+		"LMS Course",
+		{
+			"published": 1,
+		},
+		order_by="enrollments desc",
+		limit=3,
+		pluck="name",
+	)
 
 
 @frappe.whitelist()
@@ -2172,7 +2204,21 @@ def get_my_batches():
 	if frappe.session.user == "Guest":
 		return my_batches
 
-	batches = frappe.get_all(
+	batches = get_my_latest_batches()
+
+	if not len(batches):
+		batches = get_upcoming_batches()
+
+	for batch in batches:
+		batch_details = get_batch_details(batch)
+		if batch_details:
+			my_batches.append(batch_details)
+
+	return my_batches
+
+
+def get_my_latest_batches():
+	return frappe.get_all(
 		"LMS Batch Enrollment",
 		{
 			"member": frappe.session.user,
@@ -2182,12 +2228,18 @@ def get_my_batches():
 		pluck="batch",
 	)
 
-	for batch in batches:
-		batch_details = get_batch_details(batch)
-		if batch_details:
-			my_batches.append(batch_details)
 
-	return my_batches
+def get_upcoming_batches():
+	return frappe.get_all(
+		"LMS Batch",
+		{
+			"published": 1,
+			"start_date": [">=", getdate()],
+		},
+		order_by="start_date asc",
+		limit=4,
+		pluck="name",
+	)
 
 
 @frappe.whitelist()
@@ -2359,74 +2411,71 @@ def get_admin_evals():
 	return evals
 
 
-@frappe.whitelist()
-def get_streak_info():
-	if frappe.session.user == "Guest":
-		return {}
-
-	course_dates = frappe.get_all(
+def fetch_activity_dates(user):
+	doctypes = [
 		"LMS Course Progress",
-		{
-			"member": frappe.session.user,
-		},
-		pluck="creation",
-	)
-
-	quiz_dates = frappe.get_all(
 		"LMS Quiz Submission",
-		{
-			"member": frappe.session.user,
-		},
-		pluck="creation",
-	)
-
-	assignment_dates = frappe.get_all(
 		"LMS Assignment Submission",
-		{
-			"member": frappe.session.user,
-		},
-		pluck="creation",
-	)
-
-	programming_exercise_dates = frappe.get_all(
 		"LMS Programming Exercise Submission",
-		{
-			"member": frappe.session.user,
-		},
-		pluck="creation",
-	)
+	]
 
-	all_dates = set(course_dates + quiz_dates + assignment_dates + programming_exercise_dates)
-	all_dates = sorted(all_dates)
+	all_dates = []
+	for dt in doctypes:
+		all_dates.extend(frappe.get_all(dt, {"member": user}, pluck="creation"))
 
+	return sorted({d.date() if hasattr(d, "date") else d for d in all_dates})
+
+
+def calculate_streaks(all_dates):
 	streak = 0
 	longest_streak = 0
 	prev_day = None
 
 	for d in all_dates:
-		# skip weekends entirely
-		print(d.weekday())
-		if d.weekday() in (5, 6):  # Saturday=5, Sunday=6
+		if d.weekday() in (5, 6):
 			continue
 
 		if prev_day:
-			# if yesterday (excluding weekend gaps)
 			expected = prev_day + timedelta(days=1)
-			print(expected.weekday())
-			while expected.weekday() in (5, 6):  # skip Sat/Sun
+			while expected.weekday() in (5, 6):
 				expected += timedelta(days=1)
 
-			if d == expected:
-				streak += 1
-			else:
-				streak = 1
+			streak = streak + 1 if d == expected else 1
 		else:
 			streak = 1
 
 		longest_streak = max(longest_streak, streak)
 		prev_day = d
 
+	return streak, longest_streak
+
+
+def calculate_current_streak(all_dates, streak):
+	if not all_dates:
+		return 0
+
+	last_date = all_dates[-1]
+	today = getdate()
+
+	ref_day = today
+	while ref_day.weekday() in (5, 6):
+		ref_day -= timedelta(days=1)
+
+	if last_date == ref_day or last_date == ref_day - timedelta(days=1):
+		return streak
+	return 0
+
+
+@frappe.whitelist()
+def get_streak_info():
+	if frappe.session.user == "Guest":
+		return {}
+
+	all_dates = fetch_activity_dates(frappe.session.user)
+	streak, longest_streak = calculate_streaks(all_dates)
+	current_streak = calculate_current_streak(all_dates, streak)
+
 	return {
-		"current_streak": streak,
+		"current_streak": current_streak,
 		"longest_streak": longest_streak,
 	}