diff --git a/lms/www/courses/index.html b/lms/www/courses/index.html
index 52aaeece..0a596fe3 100644
--- a/lms/www/courses/index.html
+++ b/lms/www/courses/index.html
@@ -49,20 +49,20 @@
             <ul class="nav lms-nav" id="courses-tab">
                 <li class="nav-item">
                     <a class="nav-link active" data-toggle="tab" href="#live">
-                        {{ _("Live") }}
+                        {{ _("Live") }} ({{ live_courses | length }})
                     </a>
                 </li>
 
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#upcoming">
-                        {{ _("Upcoming") }}
+                        {{ _("Upcoming") }} ({{ upcoming_courses | length }})
                     </a>
                 </li>
 
                 {% if frappe.session.user != "Guest" %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#courses-enrolled">
-                        {{ _("Enrolled") }}
+                        {{ _("Enrolled") }} ({{ enrolled_courses | length }})
                     </a>
                 </li>
                 {% endif %}
@@ -70,7 +70,7 @@
                 {% if show_creators_section %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#courses-created">
-                        {{ _("Created") }}
+                        {{ _("Created") }} ({{ created_courses | length }})
                     </a>
                 </li>
                 {% endif %}
@@ -78,7 +78,7 @@
                 {% if show_review_section %}
                 <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#courses-under-review">
-                        {{ _("Under Review") }}
+                        {{ _("Under Review") }} ({{ review_courses | length }})
                     </a>
                 </li>
                 {% endif %}
@@ -104,19 +104,28 @@
 
                 {% if frappe.session.user != "Guest" %}
                 <div class="tab-pane fade" id="courses-enrolled" role="tabpanel" aria-labelledby="courses-enrolled">
-                    {% include "lms/lms/web_template/courses_enrolled/courses_enrolled.html" %}
+					{% set courses = enrolled_courses %}
+                    {% set title = _("Enrolled Courses") %}
+                    {% set classes = "enrolled-courses" %}
+                    {% include "lms/templates/course_list.html" %}
                 </div>
                 {% endif %}
 
                 {% if show_creators_section %}
                 <div class="tab-pane fade" id="courses-created" role="tabpanel" aria-labelledby="courses-created">
-                    {% include "lms/templates/courses_created.html" %}
+                    {% set courses = created_courses %}
+                    {% set title = _("Created Courses") %}
+                    {% set classes = "created-courses" %}
+                    {% include "lms/templates/course_list.html" %}
                 </div>
                 {% endif %}
 
                 {% if show_review_section %}
                 <div class="tab-pane fade" id="courses-under-review" role="tabpanel" aria-labelledby="courses-under-review">
-                    {% include "lms/templates/courses_under_review.html" %}
+                    {% set courses = review_courses %}
+                    {% set title = _("Review Courses") %}
+                    {% set classes = "review-courses" %}
+                    {% include "lms/templates/course_list.html" %}
                 </div>
                 {% endif %}
 
diff --git a/lms/www/courses/index.py b/lms/www/courses/index.py
index 68e6acf3..07e0ede1 100644
--- a/lms/www/courses/index.py
+++ b/lms/www/courses/index.py
@@ -1,17 +1,21 @@
 import frappe
 from frappe import _
-
 from lms.lms.utils import (
 	can_create_courses,
 	check_profile_restriction,
 	get_restriction_details,
 	has_course_moderator_role,
+	get_courses_under_review
 )
+from lms.overrides.user import get_enrolled_courses, get_authored_courses
 
 
 def get_context(context):
 	context.no_cache = 1
 	context.live_courses, context.upcoming_courses = get_courses()
+	context.enrolled_courses = get_enrolled_courses()["in_progress"] + get_enrolled_courses()["completed"]
+	context.created_courses = get_authored_courses(None, False)
+	context.review_courses = get_courses_under_review()
 	context.restriction = check_profile_restriction()
 	context.show_creators_section = can_create_courses()
 	context.show_review_section = (