diff --git a/frontend/src/components/CourseCard.vue b/frontend/src/components/CourseCard.vue
index 2f967b3c..ae678fdd 100644
--- a/frontend/src/components/CourseCard.vue
+++ b/frontend/src/components/CourseCard.vue
@@ -24,6 +24,12 @@
                     <Star class="h-4 w-4 text-gray-700" />
                     <span> {{ course.avg_rating }} </span>
                 </div>
+
+                <div v-if="course.status != 'Approved'">
+                    <Badge variant="solid" :theme="course.status === 'Under Review' ? 'orange' : 'blue'" size="sm">
+                        {{ course.status }}
+                    </Badge>
+                </div>
             </div>
         
             <div class="text-xl font-semibold">
@@ -65,9 +71,9 @@
 </template>
 <script setup>
 import { BookOpen, Users, Star } from 'lucide-vue-next'
-import { computed } from 'vue'
 import UserAvatar from '@/components/UserAvatar.vue'
 import { sessionStore } from '@/stores/session'
+import { Badge } from "frappe-ui"
 
 const { isLoggedIn, user } = sessionStore()
 
diff --git a/frontend/src/components/CourseOutline.vue b/frontend/src/components/CourseOutline.vue
index 16a116f5..e00d6ee9 100644
--- a/frontend/src/components/CourseOutline.vue
+++ b/frontend/src/components/CourseOutline.vue
@@ -13,7 +13,7 @@
                 </DisclosureButton>
                 <DisclosurePanel class="px-10 pb-4" :static="index == 0">
                     <div v-for="lesson in chapter.lessons" :key="lesson.name">
-                        <div class="flex items-center text-base mb-2">
+                        <div class="flex items-center text-base mb-3">
                             <MonitorPlay v-if="lesson.icon === 'icon-youtube'" class="h-4 w-4 text-gray-900 stroke-1 mr-2"/>
                             <HelpCircle v-else-if="lesson.icon === 'icon-quiz'" class="h-4 w-4 text-gray-900 stroke-1 mr-2"/>
                             <FileText v-else-if="lesson.icon === 'icon-list'" class="h-4 w-4 text-gray-900 stroke-1 mr-2"/>
diff --git a/frontend/src/components/CourseReviews.vue b/frontend/src/components/CourseReviews.vue
index b8b3088c..d620e818 100644
--- a/frontend/src/components/CourseReviews.vue
+++ b/frontend/src/components/CourseReviews.vue
@@ -107,7 +107,6 @@ const rating_percent = computed(() => {
     }
 
     [1,2,3,4,5].forEach((key) => {
-        console.log(key, rating_count[key], reviews.data.length);
         rating_percent[key] = (rating_count[key] / reviews.data.length * 100).toFixed(2);
     });
     return rating_percent;
diff --git a/frontend/src/components/BatchDetail.vue b/frontend/src/pages/BatchDetail.vue
similarity index 60%
rename from frontend/src/components/BatchDetail.vue
rename to frontend/src/pages/BatchDetail.vue
index 01483065..28441353 100644
--- a/frontend/src/components/BatchDetail.vue
+++ b/frontend/src/pages/BatchDetail.vue
@@ -1,10 +1,12 @@
 <template>
-
+    <div class="h-screen">
+        this is a batch
+    </div>
 </template>
 <script setup>
 const props = defineProps({
     batchName: {
-        type: Object,
+        type: String,
         required: true,
     },
 })
diff --git a/frontend/src/pages/CourseDetail.vue b/frontend/src/pages/CourseDetail.vue
index e28c16df..d455b4c8 100644
--- a/frontend/src/pages/CourseDetail.vue
+++ b/frontend/src/pages/CourseDetail.vue
@@ -15,20 +15,20 @@
                     {{ course.data.short_introduction }}
                 </div>
                 <div class="flex items-center justify-between mt-3 w-1/3">
-                    <div class="flex items-center">
+                    <div v-if="course.data.avg_rating" class="flex items-center">
                         <Star class="h-5 w-5 text-gray-100 fill-orange-500"/>
                         <span class="ml-1">
                             {{ course.data.avg_rating }}
                         </span>
                     </div>
-                    &middot;
-                    <div class="flex items-center">
+                    <span v-if="course.data.avg_rating">&middot;</span>
+                    <div v-if="course.data.enrollment_count" class="flex items-center">
                         <Users class="h-4 w-4 text-gray-700"/>
                         <span class="ml-1">
                             {{ course.data.enrollment_count_formatted }}
                         </span>
                     </div>
-                    &middot;
+                    <span v-if="course.data.enrollment_count">&middot;</span>
                     <div class="flex items-center">
                         <span class="mr-1" :class="{ 'avatar-group overlap': course.data.instructors.length > 1 }">
                             <UserAvatar v-for="instructor in course.data.instructors" :user="instructor"/>
@@ -54,7 +54,7 @@
                         </div>
                         <CourseOutline :courseName="course.data.name"/>
                     </div>
-                    <CourseReviews :courseName="course.data.name" :avg_rating="course.data.avg_rating"/>
+                    <CourseReviews v-if="course.data.avg_rating" :courseName="course.data.name" :avg_rating="course.data.avg_rating"/>
                 </div>
                 <div>
                     <CourseCardOverlay :course="course"/>
diff --git a/frontend/src/pages/Courses.vue b/frontend/src/pages/Courses.vue
index caca40c6..44865d36 100644
--- a/frontend/src/pages/Courses.vue
+++ b/frontend/src/pages/Courses.vue
@@ -30,7 +30,17 @@
         <template #default="{ tab }">
           <div v-if="tab.courses && tab.courses.value.length" class="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-8 mt-5">
             <router-link v-for="course in tab.courses.value"
-              :to="{ name: 'CourseDetail', params: { courseName: course.name } }">
+              :to="
+							course.membership && course.current_lesson 
+								? {name: 'Lesson', params: { 
+										courseName: course.name, 
+										chapterNumber: course.current_lesson.split('.')[0], 
+										lessonNumber: course.current_lesson.split('.')[1] }} 
+								: course.membership ? { name: 'Lesson', params: { 
+										courseName: course.name, 
+										chapterNumber: 1, 
+										lessonNumber: 1 } 
+								} : { name: 'CourseDetail', params: { courseName: course.name } }">
               <CourseCard :course="course" />
             </router-link>
           </div>
diff --git a/frontend/src/pages/Lesson.vue b/frontend/src/pages/Lesson.vue
index 98250f62..5cd3ef50 100644
--- a/frontend/src/pages/Lesson.vue
+++ b/frontend/src/pages/Lesson.vue
@@ -1,7 +1,7 @@
 <template>
     <div v-if="lesson.data && course.data" class="h-screen text-base">
         <header class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5">
-            <Breadcrumbs class="h-7" :items="breadcrumbs"/>
+            <Breadcrumbs class="h-7" :items="breadcrumbs" />
         </header>
         <div class="grid grid-cols-[70%,30%] h-full">
             <div class="border-r-2 container pt-5 pb-10">
@@ -10,7 +10,7 @@
                 </div>
                 <div class="flex items-center mt-2">
                     <span class="mr-1" :class="{ 'avatar-group overlap': course.data.instructors.length > 1 }">
-                        <UserAvatar v-for="instructor in course.data.instructors" :user="instructor"/>
+                        <UserAvatar v-for="instructor in course.data.instructors" :user="instructor" />
                     </span>
                     <span v-if="course.data.instructors.length == 1">
                         {{ course.data.instructors[0].full_name }}
@@ -33,10 +33,11 @@
                         {{ Math.ceil(course.data.membership.progress) }}% completed
                     </div>
                     <div v-if="user && course.data.membership" class="w-full bg-gray-200 rounded-full h-1 my-2">
-                        <div class="bg-gray-900 h-1 rounded-full" :style="{ width: Math.ceil(course.data.membership.progress) + '%' }"></div>
+                        <div class="bg-gray-900 h-1 rounded-full"
+                            :style="{ width: Math.ceil(course.data.membership.progress) + '%' }"></div>
                     </div>
                 </div>
-                <CourseOutline :courseName="lesson.data.course"/>
+                <CourseOutline :courseName="lesson.data.course" />
             </div>
         </div>
     </div>
@@ -111,13 +112,14 @@ onUnmounted(() => {
 .youtube-video {
     border: 1px solid #ddd;
 }
+
 .avatar-group {
     display: inline-flex;
     align-items: center;
 }
 
 .avatar-group .avatar {
-	transition: margin 0.1s ease-in-out;
+    transition: margin 0.1s ease-in-out;
 }
 
 iframe {