diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
index ee1a8cbf1a..ad4372b88b 100644
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -11,10 +11,24 @@ def get_data():
 					"type": "doctype",
 					"name": "Student"
 				},
+				{
+					"type": "doctype",
+					"name": "Student Batch"
+				},
 				{
 					"type": "doctype",
 					"name": "Student Group"
 				},
+				{
+					"type": "doctype",
+					"name": "Student Group Creation Tool"
+				}
+			]
+		},
+		{
+			"label": _("Admission"),
+			"items": [
+
 				{
 					"type": "doctype",
 					"name": "Student Applicant"
@@ -26,10 +40,6 @@ def get_data():
 				{
 					"type": "doctype",
 					"name": "Program Enrollment Tool"
-				},
-				{
-					"type": "doctype",
-					"name": "Student Group Creation Tool"
 				}
 			]
 		},
@@ -47,11 +57,11 @@ def get_data():
 				},
 				{
 					"type": "doctype",
-					"name": "Scheduling Tool"
+					"name": "Examination"
 				},
 				{
 					"type": "doctype",
-					"name": "Examination"
+					"name": "Scheduling Tool"
 				}
 			]
 		},
@@ -78,6 +88,23 @@ def get_data():
 				}
 			]
 		},
+		{
+			"label": _("LMS"),
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Announcement"
+				},
+				{
+					"type": "doctype",
+					"name": "Topic"
+				},
+				{
+					"type": "doctype",
+					"name": "Discussion"
+				}
+			]
+		},
 		{
 			"label": _("Setup"),
 			"items": [
diff --git a/erpnext/schools/doctype/student_batch/student_batch.json b/erpnext/schools/doctype/student_batch/student_batch.json
index f153845986..a806ae32f7 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.json
+++ b/erpnext/schools/doctype/student_batch/student_batch.json
@@ -126,7 +126,7 @@
    "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Academic Year", 
+   "options": "Academic Term", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -199,7 +199,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-22 05:31:12.683404", 
+ "modified": "2016-07-22 09:19:51.141234", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Batch",