Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -rbd330a50f2e8eabc50ad5bb2c2beddb3096abd4d -rf9b8a80738536bf566671eea1a399827d73fefb7
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision bd330a50f2e8eabc50ad5bb2c2beddb3096abd4d)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision f9b8a80738536bf566671eea1a399827d73fefb7)
@@ -102,72 +102,73 @@
 					</tr>
 				</table>
 					
-					<c:if test="${organisationForm.typeId == 2}">
-						<div class="checkbox">
-							<label for="course-admin-can-add-new-users">
-							<form:checkbox path="courseAdminCanAddNewUsers" id="course-admin-can-add-new-users" />
-								<fmt:message key="admin.can.add.user"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="course-admin-can-browse-all-users">
-							<form:checkbox path="courseAdminCanBrowseAllUsers" id="course-admin-can-browse-all-users"/>
-								<fmt:message key="admin.can.browse.user"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="course-admin-can-change-status-of-course">
-							<form:checkbox path="courseAdminCanChangeStatusOfCourse" id="course-admin-can-change-status-of-course"/>
-								<fmt:message key="admin.can.change.status"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="enable-course-notifications">
-							<form:checkbox path="enableCourseNotifications" id="enable-course-notifications"/>
-								<fmt:message key="admin.enable.course.notifications"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="enableGradebookForLearners">
-							<form:checkbox id="enableGradebookForLearners" path="enableGradebookForLearners" />
-								<fmt:message key="admin.gradebook.learner.enable"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="enable-single-activity-lessons">
-							<form:checkbox path="enableSingleActivityLessons" id="enable-single-activity-lessons"/>
-								<fmt:message key="config.authoring.single.activity"/>
-							</label>
-						</div>
-					</c:if>
+				<c:if test="${organisationForm.typeId == 2}">
+					<span><fmt:message key="role.GROUP.MANAGER"/>:</span>
+					<div class="checkbox loffset10">
+						<label for="course-admin-can-add-new-users">
+						<form:checkbox path="courseAdminCanAddNewUsers" id="course-admin-can-add-new-users" />
+							<fmt:message key="admin.can.add.user"/>
+						</label>
+					</div>
+					<div class="checkbox loffset10">
+						<label for="course-admin-can-browse-all-users">
+						<form:checkbox path="courseAdminCanBrowseAllUsers" id="course-admin-can-browse-all-users"/>
+							<fmt:message key="admin.can.browse.user"/>
+						</label>
+					</div>
+					<div class="checkbox loffset10">
+						<label for="course-admin-can-change-status-of-course">
+						<form:checkbox path="courseAdminCanChangeStatusOfCourse" id="course-admin-can-change-status-of-course"/>
+							<fmt:message key="admin.can.change.status"/>
+						</label>
+					</div>
+					<div class="checkbox">
+						<label for="enable-course-notifications">
+						<form:checkbox path="enableCourseNotifications" id="enable-course-notifications"/>
+							<fmt:message key="admin.enable.course.notifications"/>
+						</label>
+					</div>
+					<div class="checkbox">
+						<label for="enableGradebookForLearners">
+						<form:checkbox id="enableGradebookForLearners" path="enableGradebookForLearners" />
+							<fmt:message key="admin.gradebook.learner.enable"/>
+						</label>
+					</div>
+					<div class="checkbox">
+						<label for="enable-single-activity-lessons">
+						<form:checkbox path="enableSingleActivityLessons" id="enable-single-activity-lessons"/>
+							<fmt:message key="config.authoring.single.activity"/>
+						</label>
+					</div>
+				</c:if>
 					
-						<div class="checkbox">
-							<label for="enable-live-edit">
-							<form:checkbox path="enableLiveEdit" id="enable-live-edit"/>
-								<fmt:message key="config.live.edit"/>
-							</label>
-						</div>
-						
-						<div class="checkbox">
-							<label for="enable-kumalive">
-							<form:checkbox path="enableKumalive" id="enable-kumalive"/>
-								<fmt:message key="config.kumalive.enable"/>
-							</label>
-						</div>
+				<div class="checkbox">
+					<label for="enable-live-edit">
+					<form:checkbox path="enableLiveEdit" id="enable-live-edit"/>
+						<fmt:message key="config.live.edit"/>
+					</label>
+				</div>
+				
+				<div class="checkbox">
+					<label for="enable-kumalive">
+					<form:checkbox path="enableKumalive" id="enable-kumalive"/>
+						<fmt:message key="config.kumalive.enable"/>
+					</label>
+				</div>
 					
-					<c:if test="${not empty organisationForm.orgId}">
-						<div class="voffset10">
-							<c:if test="${organisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
-							<c:if test="${organisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
-							&nbsp;<c:out value="${organisationForm.orgId}" />.
-						</div>
-					</c:if>
-					
-					<div class="pull-right">
-						<a href="javascript:history.back();" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
-						<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
+				<c:if test="${not empty organisationForm.orgId}">
+					<div class="voffset10">
+						<c:if test="${organisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
+						<c:if test="${organisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
+						&nbsp;<c:out value="${organisationForm.orgId}" />.
 					</div>
+				</c:if>
 				
+				<div class="pull-right">
+					<a href="javascript:history.back();" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+					<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
+				</div>
+				
 		</form:form>
 	</lams:Page>
 </body>
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -rf9b8a80738536bf566671eea1a399827d73fefb7
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision f9b8a80738536bf566671eea1a399827d73fefb7)
@@ -33,6 +33,10 @@
 			display: inline-block;
 			margin-top: 5px;
 		}
+		
+		.course-admin-property {
+			padding-left: 20px !important;
+		}
 	</style>
 	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
@@ -197,15 +201,18 @@
 							<td><fmt:formatDate value="${org.createDate}" pattern="${datePattern}" /></td>
 						</tr>
 						<tr>
-							<td><fmt:message key="admin.can.add.user"/>:</td>
+							<td colspan="2"><fmt:message key="role.GROUP.MANAGER"/>:</td>
+						</tr>
+						<tr>
+							<td class="course-admin-property"><fmt:message key="admin.can.add.user"/>:</td>
 							<td><c:out value="${org.courseAdminCanAddNewUsers}" /></td>
 						</tr>
 						<tr>
-							<td><fmt:message key="admin.can.browse.user"/>:</td>
+							<td class="course-admin-property"><fmt:message key="admin.can.browse.user"/>:</td>
 							<td><c:out value="${org.courseAdminCanBrowseAllUsers}" /></td>
 						</tr>
 						<tr>
-							<td><fmt:message key="admin.can.change.status"/>:</td>
+							<td class="course-admin-property"><fmt:message key="admin.can.change.status"/>:</td>
 							<td><c:out value="${org.courseAdminCanChangeStatusOfCourse}" /></td>
 						</tr>
 						<tr>