diff --git a/community/lms/doctype/lms_batch_membership/lms_batch_membership.py b/community/lms/doctype/lms_batch_membership/lms_batch_membership.py
index 3993eacd..5f4ac4d5 100644
--- a/community/lms/doctype/lms_batch_membership/lms_batch_membership.py
+++ b/community/lms/doctype/lms_batch_membership/lms_batch_membership.py
@@ -32,12 +32,12 @@ class LMSBatchMembership(Document):
                                     filters={
                                         "member": self.member
                                     },
-                                    fields=["batch", "member_type"]
+                                    fields=["batch", "member_type", "name"]
                                 )
 
         for membership in previous_membership:
             batch_course = frappe.db.get_value("LMS Batch", membership.batch, "course")
-            if batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
+            if self.name != membership.name and batch_course == course and (membership.member_type == "Student" or self.member_type == "Student"):
                 member_name = frappe.db.get_value("User", self.member, "full_name")
                 frappe.throw(_("{0} is already a {1} of {2} course through {3} batch").format(member_name, membership.member_type, course, membership.batch))
 
diff --git a/community/lms/widgets/BatchHeader.html b/community/lms/widgets/BatchHeader.html
new file mode 100644
index 00000000..1658d327
--- /dev/null
+++ b/community/lms/widgets/BatchHeader.html
@@ -0,0 +1,4 @@
+<div class="mt-5">
+  <h3>{{course_name}}</h3>
+  <div class="text-muted">{{member_count}} members</div>
+</div>
diff --git a/community/lms/widgets/BatchTabs.html b/community/lms/widgets/BatchTabs.html
index 00eed777..42264f55 100644
--- a/community/lms/widgets/BatchTabs.html
+++ b/community/lms/widgets/BatchTabs.html
@@ -1,28 +1,36 @@
-<ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
+<div class="mt-5">
+  <a class="font-weight-bold anchor_style" href="/courses">Courses</a> / <a class="font-weight-bold anchor_style" href="/courses/{{ course.name }}"> {{ course.title }}</a>
+</div>
+<ul class="nav nav-tabs mt-4">
   <li class="nav-item">
-    <a class="nav-link active" id="home-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/learn"
-      role="tab" aria-controls="home" aria-selected="true">Learn</a>
+    <a class="nav-link" id="learn" href="/courses/{{course.name}}/{{batch.name}}/learn">Learn</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" id="schedule-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/schedule"
-      role="tab" aria-controls="schedule" aria-selected="false">Schedule</a>
+    <a class="nav-link" id="schedule" href="/courses/{{course.name}}/{{batch.name}}/schedule">Schedule</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" id="members-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/members"
-      role="tab" aria-controls="members" aria-selected="false">Members</a>
+    <a class="nav-link" id="members" href="/courses/{{course.name}}/{{batch.name}}/members">Members</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" id="discussion-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/discuss"
-      role="tab" aria-controls="discussion" aria-selected="false">Discussion</a>
+    <a class="nav-link" id="discussion" href="/courses/{{course.name}}/{{batch.name}}/discuss">Discussion</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link" id="about-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/about" role="tab"
-      aria-controls="about" aria-selected="false">About</a>
+    <a class="nav-link" id="about" href="/courses/{{course.name}}/{{batch.name}}/about">About</a>
   </li>
   {% if batch.is_member(frappe.session.user, member_type="Mentor") %}
   <li class="nav-item">
-    <a class="nav-link" id="progress-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/progress"
-      role="tab" aria-controls="progress" aria-selected="false">Progress</a>
+    <a class="nav-link" id="progress" href="/courses/{{course.name}}/{{batch.name}}/progress">Progress</a>
   </li>
   {% endif %}
 </ul>
+<script>
+  frappe.ready(() => {
+    var selector = document.querySelector(`a[href="${decodeURIComponent(window.location.pathname)}"]`)
+    if (selector) {
+      selector.classList.add('active');
+    }
+    else {
+      $("#learn").addClass('active')
+    }
+  })
+</script>
diff --git a/community/www/batch/about.html b/community/www/batch/about.html
index 8463cf1c..b68dc726 100644
--- a/community/www/batch/about.html
+++ b/community/www/batch/about.html
@@ -10,9 +10,9 @@
 {% endblock %}
 
 {% block content %}
-<div>
+<div class="container">
   {{ widgets.BatchTabs(course=course, batch=batch) }}
-  <div class="container">
+  <div class="tab-content" id="about">
     {{ CourseBasicDetail(course)}}
     {{ InstructorsSection(course.get_instructor()) }}
     {{ BatchDetails(batch)}}
diff --git a/community/www/batch/discuss.html b/community/www/batch/discuss.html
index 6076c28e..ce73e30e 100644
--- a/community/www/batch/discuss.html
+++ b/community/www/batch/discuss.html
@@ -1,5 +1,4 @@
 {% extends "templates/base.html" %}
-{% from "www/macros/common_macro.html" import BatchHearder %}
 
 {% block title %}Discuss{% endblock %}
 {% block head_include %}
@@ -10,19 +9,15 @@
 {% endblock %}
 
 {% block content %}
-<div>
-  {{ widgets.BatchTabs(course=course, batch=batch) }}
 
-  <div class="">
-    <div class="batch-header">
-      {{ BatchHearder(course.title, member_count) }}
-    </div>
-    <div class="messages">
-      <div class="message-section">
-        {{ Messages(messages) }}
-      </div>
-      {{ TextArea() }}
+<div class="container">
+  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  {{ widgets.BatchHeader(course_name=course.title, member_count=member_count)}}
+  <div class="messages">
+    <div class="message-section">
+      {{ Messages(messages) }}
     </div>
+    {{ TextArea() }}
   </div>
 </div>
 {% endblock %}
diff --git a/community/www/batch/learn.html b/community/www/batch/learn.html
index 311c3542..d8f9ba36 100644
--- a/community/www/batch/learn.html
+++ b/community/www/batch/learn.html
@@ -11,6 +11,7 @@
 <link rel="stylesheet" href="/assets/frappe/css/font-awesome.css">
 <link rel="stylesheet" href="{{ livecode_url }}/static/codemirror/lib/codemirror.css">
 <link rel="stylesheet" href="/assets/css/lms.css">
+<link rel="stylesheet" href="/assets/frappe/css/hljs-night-owl.css">
 
 <script src="{{ livecode_url }}/static/codemirror/lib/codemirror.js"></script>
 <script src="{{ livecode_url }}/static/codemirror/mode/python/python.js"></script>
@@ -22,23 +23,20 @@
 
 
 {% block content %}
-<div>
+
+<div class="container">
   {{ widgets.BatchTabs(course=course, batch=batch) }}
+  <div class="lesson-page">
 
-  <div class="container">
-    <div class="lesson-page">
-      {{ pagination(prev_url, next_url) }}
+    <h2>{{ lesson.title }}</h2>
 
-      <h2>{{ lesson.title }}</h2>
-
-      {% for s in lesson.get_sections() %}
-      <div class="section section-{{ s.type }}">
-        {{ render_section(s) }}
-      </div>
-      {% endfor %}
-
-      {{ pagination(prev_url, next_url) }}
+    {% for s in lesson.get_sections() %}
+    <div class="section section-{{ s.type }}">
+      {{ render_section(s) }}
     </div>
+    {% endfor %}
+
+    {{ pagination(prev_chap, prev_url, next_chap, next_url) }}
   </div>
 </div>
 {% endblock %}
@@ -68,13 +66,17 @@
 </div>
 {% endmacro %}
 
-{% macro pagination(prev_url, next_url) %}
+{% macro pagination(prev_chap, prev_url, next_chap, next_url) %}
 <div class="lesson-pagination">
   {% if prev_url %}
-  <a href="{{prev_url}}" class="btn">&larr; Prev</a>
+  <span>
+    Prev: <a href="{{prev_url}}">{{prev_chap}}</a>
+  </span>
   {% endif %}
   {% if next_url %}
-  <a href="{{next_url}}" class="btn pull-right">Next &rarr;</a>
+  <span class="pull-right">
+    Next: <a href="{{next_url}}">{{next_chap}}</a>
+  </span>
   {% endif %}
   <div style="clear: both;"></div>
 </div>
diff --git a/community/www/batch/learn.py b/community/www/batch/learn.py
index 538fa26c..08d6389d 100644
--- a/community/www/batch/learn.py
+++ b/community/www/batch/learn.py
@@ -1,3 +1,4 @@
+from re import I
 import frappe
 from . import utils
 
@@ -20,8 +21,10 @@ def get_context(context):
     context.chapter_index = chapter_index
     print(context.lesson)
     outline = context.course.get_outline()
-    next_ = outline.get_next(lesson_number)
     prev_ = outline.get_prev(lesson_number)
+    next_ = outline.get_next(lesson_number)
+    context.prev_chap = get_chapter_title(course_name, prev_)
+    context.next_chap = get_chapter_title(course_name, next_)
     context.next_url = get_learn_url(course_name, batch_name, next_)
     context.prev_url = get_learn_url(course_name, batch_name, prev_)
 
@@ -29,3 +32,11 @@ def get_learn_url(course_name, batch_name, lesson_number):
     if not lesson_number:
         return
     return f"/courses/{course_name}/{batch_name}/learn/{lesson_number}"
+
+def get_chapter_title(course_name, lesson_number):
+    if not lesson_number:
+        return
+    chapter_index = lesson_number.split(".")[0]
+    lesson_index = lesson_number.split(".")[1]
+    chapter_name = frappe.db.get_value("Chapter", {"course": course_name, "index_": chapter_index}, "name")
+    return frappe.db.get_value("Lesson", {"chapter": chapter_name, "index_": lesson_index}, "title")
diff --git a/community/www/batch/members.html b/community/www/batch/members.html
index 18f82026..4aae9ddc 100644
--- a/community/www/batch/members.html
+++ b/community/www/batch/members.html
@@ -1,5 +1,4 @@
 {% extends "templates/base.html" %}
-{% from "www/macros/common_macro.html" import BatchHearder %}
 
 {% block title %}Members{% endblock %}
 {% block head_include %}
@@ -9,32 +8,34 @@
 {% endblock %}
 
 {% block content %}
-<div>
-  {{ widgets.BatchTabs(course=course, batch=batch) }}
 
-  <div class="container">
-    {{ BatchHearder(course.title, member_count)}}
-    {{ MembersList(members)}}
-  </div>
+<div class="container">
+  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  {{ MembersList(members)}}
 </div>
 {% endblock %}
 
 
 {% macro MembersList(members) %}
-<div class="mt-5">
+<div class="mt-5 col">
   {% for member in members %}
-  <div class="d-flex align-items-center">
+  <div class="row">
     <div>
-      {{ widgets.Avatar(member=member, avatar_class="avatar-medium") }}
+      {{ widgets.Avatar(member=member, avatar_class="avatar-large") }}
     </div>
-    <div class="ml-5 mr-5">
-      <a href="/{{member.username}}">{{ member.full_name }}</a>
+    <div class="ml-5">
+      <a class="anchor_style" href="/{{member.username}}">
+        <h3>{{ member.full_name }}</h3>
+      </a>
+      {% if course.is_mentor(member.name) %}
+      <div class="badge badge-success">Mentor</div>
+      {% endif %}
+      {% if member.bio %}
+      <div class="mt-5">
+        <i>{{ member.bio }}</i>
+      </div>
+      {% endif %}
     </div>
-    {% if course.is_mentor(member.name) %}
-    <div class="badge badge-success">Mentor</div>
-    {% endif %}
-  </div>
-  <hr>
   {% endfor %}
 </div>
 {% endmacro %}
diff --git a/community/www/batch/progress.html b/community/www/batch/progress.html
index d45689cd..2083f046 100644
--- a/community/www/batch/progress.html
+++ b/community/www/batch/progress.html
@@ -22,26 +22,24 @@
 
 
 {% block content %}
-<div>
-  {{ widgets.BatchTabs(course=course, batch=batch) }}
 
-  <div class="container">
-    <div class="mentor-dashboard">
-      <h1>Batch Progress</h1>
-      {% for exercise in report.exercises %}
-      <div class="exercise-submissions">
-        <h2>{{exercise.title}}</h2>
-        {% for s in report.get_submissions_of_exercise(exercise.name) %}
-        <div class="submission">
-          <h4><a href="/{{s.owner.username}}">{{s.owner.full_name}}</a></h4>
-          <div class="livecode-editor-small">
-            {{ LiveCodeEditor(name=s.name, code=s.solution, reset_code=s.solution) }}
-          </div>
+<div class="container">
+  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  <div class="mentor-dashboard">
+    <h1>Batch Progress</h1>
+    {% for exercise in report.exercises %}
+    <div class="exercise-submissions">
+      <h2>{{exercise.title}}</h2>
+      {% for s in report.get_submissions_of_exercise(exercise.name) %}
+      <div class="submission">
+        <h4><a href="/{{s.owner.username}}">{{s.owner.full_name}}</a></h4>
+        <div class="livecode-editor-small">
+          {{ LiveCodeEditor(name=s.name, code=s.solution, reset_code=s.solution) }}
         </div>
-        {% endfor %}
       </div>
       {% endfor %}
     </div>
+    {% endfor %}
   </div>
 </div>
 {% endblock %}
diff --git a/community/www/batch/schedule.html b/community/www/batch/schedule.html
index 01dd5121..36e87c48 100644
--- a/community/www/batch/schedule.html
+++ b/community/www/batch/schedule.html
@@ -8,12 +8,10 @@
 {% endblock %}
 
 {% block content %}
-<div>
-  {{ widgetsBatchTabs(course=course, batch=batch) }}
-  <div class="container">
-    <h3>
-      Schedule
-    </h3>
-  </div>
+<div class="container">
+  {{ widgets.BatchTabs(course=course, batch=batch) }}
+  <h3>
+    Schedule
+  </h3>
 </div>
 {% endblock %}
diff --git a/community/www/macros/common_macro.html b/community/www/macros/common_macro.html
index 50a4ffc9..e9aae793 100644
--- a/community/www/macros/common_macro.html
+++ b/community/www/macros/common_macro.html
@@ -27,11 +27,3 @@
   </div>
   {% endif %}
 {% endmacro %}
-
-
-{% macro BatchHearder(course_name, member_count) %}
-<div class="border p-3">
-  <h3>{{course_name}}</h3>
-  <div class="text-muted">{{member_count}} members</div>
-</div>
-{% endmacro %}
diff --git a/community/www/macros/sidebar.html b/community/www/macros/sidebar.html
deleted file mode 100644
index d6d28186..00000000
--- a/community/www/macros/sidebar.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% macro BatchTabs(course, batch, is_mentor=False) %}
-<ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
-  <li class="nav-item">
-    <a class="nav-link active" id="home-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/learn"
-      role="tab" aria-controls="home" aria-selected="true">Learn</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" id="schedule-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/schedule"
-      role="tab" aria-controls="schedule" aria-selected="false">Schedule</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" id="members-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/members"
-      role="tab" aria-controls="members" aria-selected="false">Members</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" id="discussion-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/discuss"
-      role="tab" aria-controls="discussion" aria-selected="false">Discussion</a>
-  </li>
-  <li class="nav-item">
-    <a class="nav-link" id="about-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/about" role="tab"
-      aria-controls="about" aria-selected="false">About</a>
-  </li>
-  {% if batch.is_member(frappe.session.user, member_type="Mentor") %}
-  <li class="nav-item">
-    <a class="nav-link" id="progress-tab" data-toggle="tab" href="/courses/{{course.name}}/{{batch.name}}/progress"
-      role="tab" aria-controls="progress" aria-selected="false">Progress</a>
-  </li>
-  {% endif %}
-</ul>
-{% endmacro %}