Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e -rea2d5b224a225815c056c78f30b7f7f6d9b70dc0
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ea2d5b224a225815c056c78f30b7f7f6d9b70dc0)
@@ -6,8 +6,8 @@
  
 #=================== labels for LAMS Administration =================# 
 
-audit.organisation.change  =Changed {0} for organisation: {1} from: {2} to: {3}
-audit.organisation.create  =Created organisation: {0} of type: {1}
+audit.organisation.change  =Changed {0} for course: {1} from: {2} to: {3}
+audit.organisation.create  =Created course: {0} of type: {1}
 audit.user.disable  =Disabled account userId: {0}
 audit.user.delete  =Deleted userId: {0}
 label.yes  =Yes
@@ -18,8 +18,8 @@
 lable.job.start.date  =Job start date
 lable.job.description  =Job description
 error.system  =Oops! An unexpected exception thrown by the system. Contact your system administrator.
-error.org.invalid  =Invalid organisation Id. {0}
-error.orgtype.invalid  =Invalid operation for this type of organisation.
+error.org.invalid  =Invalid course Id. {0}
+error.orgtype.invalid  =Invalid operation for this type of course.
 error.name.required  =Name is required.
 error.login.required  =Login is required.
 error.login.unique  =Login is already taken. {0}
@@ -113,9 +113,11 @@
 admin.organisation.description  =Description
 admin.organisation.locale  =Locale
 admin.organisation.status  =Status
-admin.can.add.user  =Course managers can add new users
-admin.can.browse.user  =Course managers can browse all users in the system
-admin.can.change.status  =Course managers can change status of course
+admin.course.settings =Course settings
+admin.course.managers.can = Course managers can
+admin.can.add.user  =add new users
+admin.can.browse.user  =browse all users in the system
+admin.can.change.status  =change status of course
 admin.organisation  =Course/Subcourse
 admin.course  =Course
 admin.class  =Subcourse
@@ -146,7 +148,7 @@
 sysadmin.serverdesc  =Description
 sysadmin.prefix  =Prefix
 sysadmin.disabled  =Disabled
-sysadmin.organisation  =Organisation
+sysadmin.organisation  =Course
 sysadmin.userinfoUrl  =User information URL
 sysadmin.timeoutUrl  =Timeout URL
 sysadmin.integrated.servers  =integrated server(s) in total
@@ -170,8 +172,8 @@
 admin.config.key  =Key
 admin.config.value  =Value
 label.show.all.users  =Show all users
-msg.group.organisation_id  =The organisation_id of this course is
-msg.subgroup.organisation_id  =The organisation_id of this subcourse is
+msg.group.organisation_id  =The course_id of this course is
+msg.subgroup.organisation_id  =The course_id of this subcourse is
 msg.remove.from.subgroups  =Removed users will also be removed from subcourse.
 label.global.roles  =Global roles
 label.import  =Import
@@ -202,7 +204,7 @@
 label.login.as  =Login as
 sysadmin.import.groups.title  =Import courses
 heading.import.results  =Import results
-table.heading.organisation.id  =Organisation ID
+table.heading.organisation.id  =Course ID
 import.groups.intro  =Use this screen to bulk import courses and subcourses using an Excel spreadsheet.
 import.groups.instructions  =When creating a course, make sure the row above it is empty.  When creating a subcourse, place it directly under it's parent course.
 import.groups.download  =Download the courses template to create courses and subcourse.
@@ -302,7 +304,7 @@
 audit.spreadsheet.error  =Error processing spreadsheet row {0}: {1}
 audit.successful.user.import  =Successfully imported {0} users.
 audit.successful.role.import  =Successfully imported {0} role memberships.
-audit.successful.organisation.import  =Successfully imported {0} organisations.
+audit.successful.organisation.import  =Successfully imported {0} courses.
 config.forgot.password.allow.email  =Allow forgot password email link in front page?
 config.forgot.password.email  =Email address from which the forgotten password emails will be sent
 config.custom.tab.link  =Custom tab URL
@@ -399,7 +401,7 @@
 config.profile.edit.enable  =Enable profile editing
 config.profile.partial.edit.enable  =Enable partial profile editing (only email and contact number can be changed)
 config.server2server.registration.enable  =Enable remote server user registration
-admin.enable.course.notifications  =Enable organisation notifications
+admin.enable.course.notifications  =Enable notifications
 cache.entries.title2  =Cacheable entities
 cache.explanation4  =Listed below are cacheable classes and collections. This keeps certain common objects in memory to speed up LAMS. It is managed automatically and should not require any intervention. However, if the system appears to be keeping "old values" e.g. an old first name, try clearing all the nodes in the cache. Once cleared, LAMS will reload the objects from the database.
 cache.button.remove.all  =Clear all cached objects
@@ -676,4 +678,5 @@
 config.wa.sync.time =Container auto sync time (HH:mm)
 
 
+
 #======= End labels: Exported 627 labels for en AU =====
Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rcd031f542f0bc641e1e5cf48ca7efd0a4a5819e3 -rea2d5b224a225815c056c78f30b7f7f6d9b70dc0
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision cd031f542f0bc641e1e5cf48ca7efd0a4a5819e3)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ea2d5b224a225815c056c78f30b7f7f6d9b70dc0)
@@ -416,19 +416,6 @@
 		<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
 		<c:choose>
 		<c:when test="${usePanel}">
-			<c:if test="${not empty title}">
-				<c:if test="${not empty titleHelpURL}">
-					<span class="pull-right">${titleHelpURL}</span>
-				</c:if>
-				<c:if test="${not empty headingContent}">
-					<c:out value="${headingContent}" escapeXml="true" />
-				</c:if>
-			
-				<header>
-					<h1><c:out value="${title}" escapeXml="true" /></h1>
-				</header>
-			</c:if>
-
 			<%-- The Breadcrumb
 			
 				We need to build the breadcrumb in the tag rather than on the page jsp as it is easier to do 
@@ -478,8 +465,22 @@
 					  </ol>
 				</nav>						    
 				
-			</c:if>			
+			</c:if>
+
+			<c:if test="${not empty title}">
+				<c:if test="${not empty titleHelpURL}">
+					<span class="pull-right">${titleHelpURL}</span>
+				</c:if>
+				<c:if test="${not empty headingContent}">
+					<c:out value="${headingContent}" escapeXml="true" />
+				</c:if>
 			
+				<header>
+					<h1><c:out value="${title}" escapeXml="true" /></h1>
+				</header>
+			</c:if>
+						
+			
 			<div id="content">
 			<main role="main">
 				<jsp:doBody />
Index: lams_admin/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rea2d5b224a225815c056c78f30b7f7f6d9b70dc0
--- lams_admin/web/WEB-INF/tags/TSTable.tag	(.../TSTable.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/TSTable.tag	(.../TSTable.tag)	(revision ea2d5b224a225815c056c78f30b7f7f6d9b70dc0)
@@ -5,6 +5,7 @@
 <%@ attribute name="numColumns" required="true" rtexprvalue="true"%>
 <%@ attribute name="dataId" required="false" rtexprvalue="true"%>
 <%@ attribute name="tableClass" required="false" rtexprvalue="true"%>
+<%@ attribute name="tableHeaderClass" required="false" rtexprvalue="true"%>
 <%@ attribute name="pagerClass" required="false" rtexprvalue="true"%>
 <%@ attribute name="test" required="false" rtexprvalue="true"%>
 
@@ -16,25 +17,30 @@
 	<c:set var="pagerClass" value="ts-pager" />
 </c:if>
 
+<c:if test="${empty tableHeaderClass}">
+	<c:set var="tableHeaderClass" value=""/>
+</c:if>	
+
+
 <c:if test="${empty dataId}">
-	<c:set var="dataId" value="" />
+	<c:set var="dataId" value="thead-light" />
 </c:if>
 
-<table class="${tableClass}" ${dataId}>
-	<thead>
+<table class="${tableClass}" ${dataId} role="presentation">
+	<thead class="${tableHeaderClass}">
 		<tr>
 			<jsp:doBody />
 		</tr>
 	</thead>
 	<tfoot>
 		<tr>
 	    	<th colspan="${numColumns}" class="${pagerClass} form-horizontal">
-	        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
-	        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
+	        <button type="button" class="btn btn-xs first" aria-label="first"><i class="fa fa-step-backward" aria-hidden="true"></i></button>
+	        <button type="button" class="btn btn-xs prev" aria-label="previous"><i class="fa fa-backward" aria-hidden="true"></i></button>
 	        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-	        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
-	        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
-	        <select class="pagesize" title="Select page size">
+	        <button type="button" class="btn btn-xs next" aria-label="next"><i class="fa fa-forward aria-hidden="true""></i></button>
+	        <button type="button" class="btn btn-xs last" aria-label="last"><i class="fa fa-step-forward aria-hidden="true""></i></button>
+	        <select class="pagesize" aria-label="Select page size">
 	      		<c:if test="${not empty test}"><option value="2">2</option></c:if>
 	      		<option selected="selected" value="10">10</option>
 	      		<option value="20">20</option>
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -rdbcb0f360525c386a55e74c6c876f031edb923f9 -rea2d5b224a225815c056c78f30b7f7f6d9b70dc0
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision dbcb0f360525c386a55e74c6c876f031edb923f9)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision ea2d5b224a225815c056c78f30b7f7f6d9b70dc0)
@@ -89,14 +89,16 @@
 					<fmt:message key="admin.organisation.code"/>
 				</label>
 				<form:input path="code" size="20" cssClass="form-control form-control-sm" maxlength="20"/>	
-
-
-				<label for="code">
+			</div>
+			<div class="form-group">
+				<label for="description">
 					<fmt:message key="admin.organisation.description"/>
 				</label>
 				
-				<form:textarea path="description" cols="50" rows="3" cssClass="form-control form-control-sm" id="description"/>
+				<form:textarea path="description" rows="3" cssClass="form-control form-control-sm" id="description"/>
+			</div>
 				
+			<div class="form-group">
 				<label for="stateId">
 					<fmt:message key="admin.organisation.status"/>
 				</label>
@@ -106,34 +108,36 @@
 						<form:option value="${state.organisationStateId}"><fmt:message key="organisation.state.${state.description}"/></form:option>
 					</c:forEach>
 				</form:select>
-				
 
-			</div>				
+			</div>
+			<h3><fmt:message key="admin.course.settings"/></h3>				
 			<div class="form-group">
 			<c:if test="${organisationForm.typeId == 2}">
 
-				<div class="form-check">
-					<form:checkbox path="courseAdminCanAddNewUsers" cssClass="form-check-input" id="course-admin-can-add-new-users" />
-			    	<label  class="form-check-label" for="course-admin-can-add-new-users">
-			    		<fmt:message key="admin.can.add.user"/>
-			    	</label>
+				<div class="form-group">
+					<div class=""><fmt:message key="admin.course.managers.can"/>:</div>
+					<div class="form-check ml-3">
+						<form:checkbox path="courseAdminCanAddNewUsers" cssClass="form-check-input" id="course-admin-can-add-new-users" />
+				    	<label  class="form-check-label" for="course-admin-can-add-new-users">
+				    		<fmt:message key="admin.can.add.user"/>
+				    	</label>
+					</div>
+					
+					<div class="form-check ml-3">
+						<form:checkbox path="courseAdminCanBrowseAllUsers" cssClass="form-check-input" id="course-admin-can-browse-all-users"/>
+				    	<label  class="form-check-label" for="course-admin-can-browse-all-users">
+				    		<fmt:message key="admin.can.browse.user"/>
+				    	</label>
+					</div>
+					
+					<div class="form-check ml-3">
+						<form:checkbox path="courseAdminCanChangeStatusOfCourse" cssClass="form-check-input" id="course-admin-can-change-status-of-course"/>
+				    	<label  class="form-check-label" for="course-admin-can-change-status-of-course">
+				    		<fmt:message key="admin.can.change.status"/>
+				    	</label>
+					</div>
 				</div>
-				
 				<div class="form-check">
-					<form:checkbox path="courseAdminCanBrowseAllUsers" cssClass="form-check-input" id="course-admin-can-browse-all-users"/>
-			    	<label  class="form-check-label" for="course-admin-can-browse-all-users">
-			    		<fmt:message key="admin.can.browse.user"/>
-			    	</label>
-				</div>
-				
-				<div class="form-check">
-					<form:checkbox path="courseAdminCanChangeStatusOfCourse" cssClass="form-check-input" id="course-admin-can-change-status-of-course"/>
-			    	<label  class="form-check-label" for="course-admin-can-change-status-of-course">
-			    		<fmt:message key="admin.can.change.status"/>
-			    	</label>
-				</div>
-				
-				<div class="form-check">
 					<form:checkbox path="enableCourseNotifications" id="enable-course-notifications" cssClass="form-check-input"/>
 			    	<label  class="form-check-label" for="enableCourseNotifications">
 			    		<fmt:message key="admin.enable.course.notifications"/>
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -rdbcb0f360525c386a55e74c6c876f031edb923f9 -rea2d5b224a225815c056c78f30b7f7f6d9b70dc0
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision dbcb0f360525c386a55e74c6c876f031edb923f9)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision ea2d5b224a225815c056c78f30b7f7f6d9b70dc0)
@@ -20,7 +20,9 @@
 	<link type="text/css" href="<lams:LAMSURL/>css/jquery.tablesorter.pager.css" rel="stylesheet">
 
 	<style >
-		
+		.switch {
+			font-size: larger;
+		}
 
 	</style>
 	
@@ -34,6 +36,11 @@
 
 	<script>
 	  	$(document).ready(function(){
+	  		
+	  		$('#extendedCourseSettings').readmore({
+				speed: 500,
+				collapsedHeight: 75
+			});
 
 	  		<c:if test="${not empty org.description}">
 			$('#description').readmore({
@@ -147,12 +154,17 @@
 		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${parentGroupId}"/> | <c:out value="${parentCode}" escapeXml="true"/> : <c:out value="${parentGroupName}" escapeXml="true"/></c:set>
 		<c:set var="breadcrumbItems">${breadcrumbItems}, . | <c:out value="${org.code}" escapeXml="true" /> : <c:out value="${org.name}" escapeXml="true"/></c:set>
 	</c:if>	
+	
+	<%-- Only show Header if root organisation --%>
+	<c:if test="${orgManageForm.type == 1}">
+		<c:set var="headerTitle">${title}</c:set>
+	</c:if>	
 
-	<lams:Page type="admin" title="${title}" formID="orgManageForm" breadcrumbItems="${breadcrumbItems}">
+	<lams:Page type="admin" title="${headerTitle}" formID="orgManageForm" breadcrumbItems="${breadcrumbItems}">
 		<c:if test="${orgManageForm.type == 1}">
 				<form>
 				
-				<div class="btn-group" role="group" >
+				<div class="btn-group pull-right" role="group" aria-label="${headerTitle}">
 					<c:if test="${createGroup == true}">
 					<a id="userCreate" class="btn btn-sm btn-outline-secondary" href="user/edit.do?orgId=1"><i class="fa fa-user-plus"></i> <fmt:message key="admin.user.create"/></a>
 					<a id="findUsers" class="btn btn-sm btn-outline-secondary" href="usersearch.do"><i class="fa fa-search"></i> <fmt:message key="admin.user.find"/></a>
@@ -172,16 +184,6 @@
 				<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 				</form>
 			
-				<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
-					<input type="hidden" name="org" value="${orgManageForm.parentId}" />
-					<fmt:message key="label.show"/>&nbsp;
-					<form:select path="stateId" id="org-state-id" cssClass="form-control form-control-inline form-control-sm">
-						<form:option value="1"><fmt:message key="organisation.state.ACTIVE"/></form:option>
-						<form:option value="2"><fmt:message key="organisation.state.HIDDEN"/></form:option>
-						<form:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></form:option>
-					</form:select> &nbsp;
-					<fmt:message key="label.groups"/>:
-				</form:form>
 		</c:if>
 			
 		<c:if test="${((orgManageForm.type == 2) || (orgManageForm.type == 3))}">
@@ -217,7 +219,7 @@
 				
 					<span title="<fmt:message key="admin.organisation.status"/>" class="badge badge-success py-2 px-2 pull-right text-uppercase">Active</span>
 					
-					<h2 id="courseName" class="font-weight-bolder"><c:out value="${orgManageForm.parentName}" escapeXml="true"/></h2>
+					<h1 id="courseName" class="font-weight-bolder"><c:out value="${orgManageForm.parentName}" escapeXml="true"/></h1>
 					
 					<label title="<fmt:message key="admin.organisation.create.date"/>" style="position:relative;top:-1rem;font-size: x-small;"><lams:Date value="${org.createDate}"/></label>
 					
@@ -250,42 +252,98 @@
 					<div class="card shadow-sm"  >
 						<div class="card-body">
 							<p class="border-bottom"">
-								<i class="fa fa-sliders">&nbsp;</i> <strong>Course settings</strong>
+								<i class="fa fa-sliders">&nbsp;</i> <strong><fmt:message key="admin.course.settings"/></strong>
 							</p>
-							<p>
-							Course managers can:
-							</p>
-							<p>
-							Add new users
+							<p id="extendedCourseSettings" style="overflow: hidden;">
+							<c:if test="${orgManageForm.type == 2}">
+							<fmt:message key="admin.course.managers.can"/>
+							</br>
+							 - <fmt:message key="admin.can.add.user"/>
 							<c:choose>
 								<c:when test="${org.courseAdminCanAddNewUsers}">
-									<i class="fa text-success fa-toggle-on pull-right  mt-1" aria-label="On"></i>
+									<i class="fa text-success fa-toggle-on pull-right  mt-1 switch" aria-label="On"></i> 
 								</c:when>
 								<c:otherwise>
-									<i class="fa  pull-right fa-toggle-off  mt-1" aria-label="Off"></i>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
 								</c:otherwise>
 							</c:choose> 
 							
 							<br/>
-							Browse all users
-							<c:choose>
+							 - <fmt:message key="admin.can.browse.user"/>
+							<c:choose> 
 								<c:when test="${org.courseAdminCanBrowseAllUsers}">
-									<i class="fa text-success fa-toggle-on pull-right  mt-1" aria-label="On"></i>
+									<i class="fa text-success fa-toggle-on pull-right  mt-1 switch" aria-label="On"></i>
 								</c:when>
 								<c:otherwise>
-									<i class="fa  pull-right fa-toggle-off  mt-1" aria-label="Off"></i>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
 								</c:otherwise>
 							</c:choose> 
 							<br/>
-							Change course status
+							 - <fmt:message key="admin.can.change.status"/>
 							<c:choose>
 								<c:when test="${org.courseAdminCanChangeStatusOfCourse}">
-									<i class="fa text-success fa-toggle-on pull-right mt-1" aria-label="On"></i>
+									<i class="fa text-success fa-toggle-on pull-right mt-1 switch" aria-label="On"></i>
 								</c:when>
 								<c:otherwise>
-									<i class="fa  pull-right fa-toggle-off  mt-1" aria-label="Off"></i>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
 								</c:otherwise>
+							</c:choose>
+							</br> 
+							</br> 
+							
+							<fmt:message key="admin.enable.course.notifications"/>
+							<c:choose>
+								<c:when test="${org.enableCourseNotifications}">
+									<i class="fa text-success fa-toggle-on pull-right  mt-1 switch" aria-label="On"></i>
+								</c:when>
+								<c:otherwise>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
+								</c:otherwise>
 							</c:choose> 
+							<br/>
+							 
+							<fmt:message key="admin.gradebook.learner.enable"/>
+							<c:choose>
+								<c:when test="${org.enableGradebookForLearners}">
+									<i class="fa text-success fa-toggle-on pull-right  mt-1 switch" aria-label="On"></i>
+								</c:when>
+								<c:otherwise>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
+								</c:otherwise>
+							</c:choose> 
+							<br/>
+							 
+							<fmt:message key="config.authoring.single.activity"/>
+							<c:choose>
+								<c:when test="${org.enableSingleActivityLessons}">
+									<i class="fa text-success fa-toggle-on pull-right  mt-1 switch" aria-label="On"></i>
+								</c:when>
+								<c:otherwise>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
+								</c:otherwise>
+							</c:choose> 
+							<br/>
+							</c:if>
+							<fmt:message key="config.live.edit"/>
+							<c:choose>
+								<c:when test="${org.enableLiveEdit}">
+									<i class="fa text-success fa-toggle-on pull-right  mt-1 switch" aria-label="On"></i>
+								</c:when>
+								<c:otherwise>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
+								</c:otherwise>
+							</c:choose> 
+							</br>
+							<fmt:message key="config.allow.kumalive"/>
+							<c:choose>
+								<c:when test="${org.enableKumalive}">
+									<i class="fa text-success fa-toggle-on pull-right  mt-1 switch" aria-label="On"></i>
+								</c:when>
+								<c:otherwise>
+									<i class="fa  pull-right fa-toggle-off  mt-1 switch" aria-label="Off"></i>
+								</c:otherwise>
+							</c:choose> 
+							<br/>
 							</p>
 
 						</div>
@@ -329,11 +387,14 @@
 				<div class="row bg-light pt-0 pb-2">
 				 <div class="col-12">
 		
-					<h3><span class="text-capitalize"><fmt:message key="label.subgroups"/></span></h3>
+					<%-- Only display this if it is for type 2 orgs --%>
+					<c:if test="${orgManageForm.type == 3}">
+					<h2><span class="text-capitalize"><fmt:message key="label.subgroups"/></span></h2>
+					</c:if>
 					<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
 						<input type="hidden" name="org" value="<c:out value="${orgManageForm.parentId}"/>" />
-						<fmt:message key="label.show"/>&nbsp;
-						<form:select path="stateId" id="org-state-id" cssClass="form-control form-control-inline form-control-sm">
+						<label for="org-state-id"><fmt:message key="label.show"/></label>&nbsp;
+						<form:select path="stateId" id="org-state-id"  cssClass="form-control form-control-inline form-control-sm">
 							<form:option value="1"><fmt:message key="organisation.state.ACTIVE"/></form:option>
 							<form:option value="2"><fmt:message key="organisation.state.HIDDEN"/></form:option>
 							<form:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></form:option>
@@ -343,17 +404,17 @@
 		
 					
 					<div class="mt-2">
-						<lams:TSTable numColumns="4"> 
-							<th  id="idsorter" class="filter-false">
+						<lams:TSTable numColumns="4" tableHeaderClass="thead-light" > 
+							<th scope="col" style="width: 10px" id="idsorter" class="filter-false">
 								Id
 							</th>
-							<th align="center"> 
+							<th scope="col" align="center"> 
 								<fmt:message key="admin.organisation.name"/>
 							</th>
-							<th  align="center">
+							<th scope="col" align="center">
 								<fmt:message key="admin.organisation.code"/>
 							</th>
-							<th  align="center" class="sorter-shortDate dateFormat-ddmmyyyy">
+							<th scope="col" align="center">
 								<fmt:message key="admin.organisation.create.date"/>
 							</th>
 						</lams:TSTable>