diff --git a/school/lms/doctype/cohort/cohort.json b/school/lms/doctype/cohort/cohort.json
index 62caae8a..2efa1428 100644
--- a/school/lms/doctype/cohort/cohort.json
+++ b/school/lms/doctype/cohort/cohort.json
@@ -8,8 +8,8 @@
  "engine": "InnoDB",
  "field_order": [
   "course",
-  "slug",
   "title",
+  "slug",
   "section_break_2",
   "instructor",
   "status",
@@ -61,7 +61,6 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Slug",
-   "reqd": 1,
    "unique": 1
   },
   {
@@ -80,7 +79,7 @@
    "fieldname": "title",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "title",
+   "label": "Title",
    "reqd": 1
   },
   {
@@ -106,7 +105,7 @@
    "link_fieldname": "cohort"
   }
  ],
- "modified": "2021-12-16 11:45:12.451226",
+ "modified": "2021-12-16 14:44:25.406301",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Cohort",
diff --git a/school/lms/doctype/cohort_join_request/cohort_join_request.json b/school/lms/doctype/cohort_join_request/cohort_join_request.json
index 476d05ed..8ecd4be3 100644
--- a/school/lms/doctype/cohort_join_request/cohort_join_request.json
+++ b/school/lms/doctype/cohort_join_request/cohort_join_request.json
@@ -7,8 +7,9 @@
  "engine": "InnoDB",
  "field_order": [
   "cohort",
-  "subgroup",
   "email",
+  "column_break_3",
+  "subgroup",
   "status"
  ],
  "fields": [
@@ -42,11 +43,15 @@
    "in_list_view": 1,
    "label": "Status",
    "options": "Pending\nAccepted\nRejected"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-11-29 12:18:15.947544",
+ "modified": "2021-12-16 15:06:03.985221",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Cohort Join Request",
diff --git a/school/lms/doctype/cohort_staff/cohort_staff.json b/school/lms/doctype/cohort_staff/cohort_staff.json
index 1fd207d7..dca4e0f9 100644
--- a/school/lms/doctype/cohort_staff/cohort_staff.json
+++ b/school/lms/doctype/cohort_staff/cohort_staff.json
@@ -8,6 +8,7 @@
  "field_order": [
   "cohort",
   "course",
+  "column_break_3",
   "email",
   "role"
  ],
@@ -24,7 +25,7 @@
    "fieldname": "email",
    "fieldtype": "Link",
    "in_list_view": 1,
-   "label": "E-mail",
+   "label": "User",
    "options": "User",
    "reqd": 1
   },
@@ -43,11 +44,15 @@
    "label": "Course",
    "options": "LMS Course",
    "read_only": 1
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-11-29 16:31:57.214875",
+ "modified": "2021-12-16 15:16:04.042372",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Cohort Staff",
diff --git a/school/lms/doctype/cohort_subgroup/cohort_subgroup.json b/school/lms/doctype/cohort_subgroup/cohort_subgroup.json
index 71732e24..06bc00ab 100644
--- a/school/lms/doctype/cohort_subgroup/cohort_subgroup.json
+++ b/school/lms/doctype/cohort_subgroup/cohort_subgroup.json
@@ -10,9 +10,11 @@
   "cohort",
   "slug",
   "title",
-  "description",
+  "column_break_4",
   "invite_code",
-  "course"
+  "course",
+  "section_break_7",
+  "description"
  ],
  "fields": [
   {
@@ -31,18 +33,18 @@
    "in_list_view": 1,
    "in_preview": 1,
    "in_standard_filter": 1,
-   "label": "title",
+   "label": "Title",
    "reqd": 1
   },
   {
    "fieldname": "description",
    "fieldtype": "Markdown Editor",
-   "label": "description"
+   "label": "Description"
   },
   {
    "fieldname": "invite_code",
    "fieldtype": "Data",
-   "label": "invite_code",
+   "label": "Invite Code",
    "read_only": 1
   },
   {
@@ -58,22 +60,25 @@
    "label": "Course",
    "options": "LMS Course",
    "read_only": 1
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [
-  {
-   "group": "Links",
-   "link_doctype": "Cohort Student",
-   "link_fieldname": "subgroup"
-  },
   {
    "group": "Links",
    "link_doctype": "Cohort Join Request",
    "link_fieldname": "subgroup"
   }
  ],
- "modified": "2021-11-30 07:41:54.893270",
+ "modified": "2021-12-16 15:12:42.504883",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "Cohort Subgroup",
diff --git a/school/lms/doctype/lms_batch_membership/lms_batch_membership.json b/school/lms/doctype/lms_batch_membership/lms_batch_membership.json
index 8514100f..35f74e35 100644
--- a/school/lms/doctype/lms_batch_membership/lms_batch_membership.json
+++ b/school/lms/doctype/lms_batch_membership/lms_batch_membership.json
@@ -6,17 +6,19 @@
  "engine": "InnoDB",
  "field_order": [
   "course",
-  "member",
-  "member_name",
-  "member_username",
+  "cohort",
+  "subgroup",
   "column_break_3",
   "batch",
-  "member_type",
-  "progress",
   "current_lesson",
   "role",
-  "cohort",
-  "subgroup"
+  "member_section",
+  "member",
+  "member_type",
+  "progress",
+  "column_break_12",
+  "member_name",
+  "member_username"
  ],
  "fields": [
   {
@@ -102,11 +104,20 @@
    "fieldtype": "Link",
    "label": "Subgroup",
    "options": "Cohort Subgroup"
+  },
+  {
+   "fieldname": "member_section",
+   "fieldtype": "Section Break",
+   "label": "Member"
+  },
+  {
+   "fieldname": "column_break_12",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-11-29 15:22:31.609216",
+ "modified": "2021-12-16 14:49:25.964853",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Batch Membership",
diff --git a/school/www/cohorts/__init__.py b/school/www/cohorts/__init__.py
new file mode 100644
index 00000000..e69de29b