diff --git a/community/hackathon/doctype/community_project_member/community_project_member.py b/community/hackathon/doctype/community_project_member/community_project_member.py
index 50fb2d4a..6068c39c 100644
--- a/community/hackathon/doctype/community_project_member/community_project_member.py
+++ b/community/hackathon/doctype/community_project_member/community_project_member.py
@@ -3,13 +3,14 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-# import frappe
+import frappe
 from frappe.model.document import Document
+from frappe import _
 
 class CommunityProjectMember(Document):
     def validate(self):
         self.validate_if_already_member()
-    
+
     def validate_if_already_member(self):
         if frappe.get_all("Community Project Member", {"owner": self.owner}):
             frappe.throw(_("You have already applied for the membership of this project."))
diff --git a/community/lms/doctype/code_revision/__init__.py b/community/lms/doctype/code_revision/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/community/lms/doctype/code_revision/code_revision.js b/community/lms/doctype/code_revision/code_revision.js
deleted file mode 100644
index 4f9451ce..00000000
--- a/community/lms/doctype/code_revision/code_revision.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2021, FOSS United and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Code Revision', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/community/lms/doctype/code_revision/code_revision.json b/community/lms/doctype/code_revision/code_revision.json
deleted file mode 100644
index 4b2cc036..00000000
--- a/community/lms/doctype/code_revision/code_revision.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "actions": [],
- "creation": "2021-04-07 00:26:28.806520",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "section",
-  "code",
-  "author"
- ],
- "fields": [
-  {
-   "fieldname": "section",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Section",
-   "options": "LMS Section"
-  },
-  {
-   "fieldname": "code",
-   "fieldtype": "Code",
-   "label": "Code"
-  },
-  {
-   "fieldname": "author",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Author",
-   "options": "User"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-04-14 11:26:19.628317",
- "modified_by": "Administrator",
- "module": "LMS",
- "name": "Code Revision",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "section",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/community/lms/doctype/code_revision/code_revision.py b/community/lms/doctype/code_revision/code_revision.py
deleted file mode 100644
index 5ca32baa..00000000
--- a/community/lms/doctype/code_revision/code_revision.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
-
-class CodeRevision(Document):
-	pass
diff --git a/community/lms/doctype/code_revision/test_code_revision.py b/community/lms/doctype/code_revision/test_code_revision.py
deleted file mode 100644
index 3ce8a443..00000000
--- a/community/lms/doctype/code_revision/test_code_revision.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, FOSS United and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestCodeRevision(unittest.TestCase):
-	pass
diff --git a/community/lms/doctype/lesson/lesson.py b/community/lms/doctype/lesson/lesson.py
index 49abb2d7..c96d3315 100644
--- a/community/lms/doctype/lesson/lesson.py
+++ b/community/lms/doctype/lesson/lesson.py
@@ -92,7 +92,7 @@ def update_progress(lesson):
         course_progress.save(ignore_permissions=True)
 
 def all_dynamic_content_submitted(lesson, user):
-    exercise_names = frappe.get_list("Exercise", {"lesson": lesson}, pluck="name")
+    exercise_names = frappe.get_list("Exercise", {"lesson": lesson}, pluck="name", ignore_permissions=True)
     all_exercises_submitted = False
     query = {
         "exercise": ["in", exercise_names],
diff --git a/community/lms/doctype/lms_course/lms_course.py b/community/lms/doctype/lms_course/lms_course.py
index 30e25b85..e4a35ad2 100644
--- a/community/lms/doctype/lms_course/lms_course.py
+++ b/community/lms/doctype/lms_course/lms_course.py
@@ -194,12 +194,16 @@ class LMSCourse(Document):
 
     def get_current_batch(self, member=frappe.session.user):
         current_membership = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name, "is_current": 1}, pluck="batch")
+        print(current_membership, member, self.name)
         if len(current_membership):
             return current_membership[0]
+        print(frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch"))
         return frappe.db.get_value("LMS Batch Membership", {"member": member, "course": self.name}, "batch")
 
     def get_all_memberships(self, member=frappe.session.user):
+        print(member)
         all_memberships = frappe.get_all("LMS Batch Membership", {"member": member, "course": self.name}, ["batch", "is_current"])
+        print(all_memberships)
         for membership in all_memberships:
             membership.batch_title = frappe.db.get_value("LMS Batch", membership.batch, "title")
         return all_memberships
diff --git a/community/lms/widgets/ChapterTeaser.html b/community/lms/widgets/ChapterTeaser.html
index 2d900a60..b0cf37c9 100644
--- a/community/lms/widgets/ChapterTeaser.html
+++ b/community/lms/widgets/ChapterTeaser.html
@@ -45,7 +45,9 @@
     }
 
     window.checkout_upcoming_batches = () => {
-      $('html,body').animate({scrollTop: $(".upcoming").offset().top}, 300);
+      if ($(".upcoming").length > 0) {
+        $('html,body').animate({ scrollTop: $(".upcoming").offset().top }, 300);
+      }
       frappe.hide_msgprint();
     }
   })
diff --git a/community/www/batch/discuss.py b/community/www/batch/discuss.py
index 5da3db2d..95ffcb34 100644
--- a/community/www/batch/discuss.py
+++ b/community/www/batch/discuss.py
@@ -4,3 +4,5 @@ from . import utils
 def get_context(context):
     utils.get_common_context(context)
     context.messages = context.batch.get_messages()
+    if not context.batch:
+        utils.redirect_to_lesson(context.course)
diff --git a/community/www/batch/home.html b/community/www/batch/home.html
index a1f6a4a9..4b930430 100644
--- a/community/www/batch/home.html
+++ b/community/www/batch/home.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-{% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/" + batch.name + "/join" %}
+{% set invite_link = frappe.utils.get_url() + "/courses/" + course.name + "/join?batch=" + batch.name %}
 <div class="container mt-5">
   {{ widgets.BatchTabs(course=course, batch=batch) }}
   <!-- <div>
@@ -34,7 +34,7 @@
     <h3> Invite Members </h3>
     <a href="" class="" id="invite-link" data-link="{{ invite_link }}">Get Batch Invitation
       Link</a>
-    <small id="copy-message" class="text-muted pull-right" style="display: none;">Copied to Clipboard.</small>
+    <small id="copy-message" class="text-muted" style="display: none;">Copied to Clipboard.</small>
   </div>
   {% endif %}
 
@@ -54,7 +54,7 @@
       $("#copy-message").slideDown(function () {
         setTimeout(function () {
           $("#copy-message").slideUp();
-        }, 5000);
+        }, 2000);
       });
     })
   })
diff --git a/community/www/batch/home.py b/community/www/batch/home.py
index 48be81c9..bb2a53a2 100644
--- a/community/www/batch/home.py
+++ b/community/www/batch/home.py
@@ -3,3 +3,5 @@ from . import utils
 
 def get_context(context):
     utils.get_common_context(context)
+    if not context.batch:
+        utils.redirect_to_lesson(context.course)
diff --git a/community/www/batch/join.html b/community/www/batch/join.html
index 0bcb73e9..0b2ba3ac 100644
--- a/community/www/batch/join.html
+++ b/community/www/batch/join.html
@@ -13,9 +13,9 @@
   <div class='page-card-head'>
     <span class='indicator blue password-box'>Login Required</span>
   </div>
-  <div class=''>Please log in to confirm to join the course {{ batch.course_title }}.</div>
+  <div class=''>Please log in to confirm joining the course {{ batch.course_title }}.</div>
   <a type="submit" id="login" class="btn btn-primary w-100"
-    href="/login?redirect-to=/courses/{{ batch.course }}/{{ batch.name }}/join">{{_("Login")}}</a>
+    href="/login?redirect-to=/courses/{{ batch.course }}/join?batch={{ batch.name }}">{{_("Login")}}</a>
 </div>
 
 {% elif already_a_member %}
@@ -26,7 +26,7 @@
   </div>
   <div class=''>You are already a member of the batch {{ batch.title }} for the course {{ batch.course_title }}.
   </div>
-  <a type="submit" id="batch-home" class="btn btn-primary w-100" href="/courses/{{batch.course}}/{{batch.name}}/home">{{_("Go to Batch Home")}}</a>
+  <a type="submit" id="batch-home" class="btn btn-primary w-100" href="">{{_("Go to Batch Home")}}</a>
 </div>
 
 {% else %}
@@ -38,23 +38,20 @@
   <div>Please provide your confirmation to be a part of the batch {{ batch.title }} for the course
     {{ batch.course_title }}.
   </div>
-  <a type="submit" id="confirm" class="btn btn-primary w-100" data-batch="{{ batch.name | urlencode }}"
-    data-course="{{ batch.course | urlencode }}">{{_("Confirm")}}</a>
+  <a type="submit" id="confirm" class="btn btn-primary w-100">{{_("Confirm")}}</a>
 </div>
 
 {% endif %}
+{% endblock %}
 
+{% block script %}
 <script>
-  frappe.ready(() => {
-    var confirm_element = $("#confirm");
-    var batch = decodeURIComponent(confirm_element.attr("data-batch"));
-    var course = decodeURIComponent(confirm_element.attr("data-course"));
-
-    confirm_element.click((e) => {
+frappe.ready(() => {
+    $("#confirm").click((e) => {
       frappe.call({
         "method": "community.lms.doctype.lms_batch_membership.lms_batch_membership.create_membership",
         "args": {
-          "batch": batch
+          "batch": "{{ batch.name }}"
         },
         "callback": (data) => {
           if (data.message == "OK") {
@@ -63,12 +60,25 @@
               clear: true
             });
             setTimeout(function () {
-              window.location.href = "/courses/" + course + "/" + batch + "/home";
+              window.location.href = "/courses/{{ batch.course }}/home";
             }, 2000);
           }
         }
       })
     })
+
+    $("#batch-home").click((e) => {
+      frappe.call({
+        method: "community.lms.doctype.lms_batch_membership.lms_batch_membership.update_current_membership",
+        args: {
+          "batch": "{{ batch.name }}",
+          "course": "{{ batch.course}}"
+        },
+        callback: (data) => {
+          window.location.href = "/courses/{{ batch.course }}/home"
+        }
+      })
+    })
   })
 </script>
 {% endblock %}
diff --git a/community/www/batch/members.py b/community/www/batch/members.py
index bdf6e2c3..bb2a53a2 100644
--- a/community/www/batch/members.py
+++ b/community/www/batch/members.py
@@ -3,4 +3,5 @@ from . import utils
 
 def get_context(context):
     utils.get_common_context(context)
-    print(context.members[0].bio)
+    if not context.batch:
+        utils.redirect_to_lesson(context.course)
diff --git a/community/www/batch/utils.py b/community/www/batch/utils.py
index 4405ba2c..b99fb129 100644
--- a/community/www/batch/utils.py
+++ b/community/www/batch/utils.py
@@ -25,3 +25,6 @@ def get_common_context(context):
 def get_livecode_url():
     return frappe.db.get_single_value("LMS Settings", "livecode_url")
 
+def redirect_to_lesson(course, index_="1.1"):
+    frappe.local.flags.redirect_location = course.get_learn_url(index_)
+    raise frappe.Redirect
diff --git a/community/www/courses/course.html b/community/www/courses/course.html
index 7a34fb21..1401ef1f 100644
--- a/community/www/courses/course.html
+++ b/community/www/courses/course.html
@@ -96,6 +96,8 @@
     </div>
     {% endfor %}
   </div>
-  {% endif %}
+{% else %}
+<div class="mt-5 upcoming">There are no Upcoming Batches for this course currently.</div>
+{% endif %}
 </div>
 {% endmacro %}