Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java
===================================================================
diff -u -r29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision 29a37489a63e5a95f42a5ef5fd8a7daeb65c53c5)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -79,12 +79,14 @@
 	if (organisation == null) {
 	    return forwardError(request, "error.org.invalid");
 	}
+	String orgCode = organisation.getCode();
 	String orgName = organisation.getName();
 	log.debug("orgName: " + orgName);
 
 	Organisation pOrg = organisation.getParentOrganisation();
 	if (pOrg != null) {
 	    request.setAttribute("pOrgId", pOrg.getOrganisationId());
+	    request.setAttribute("pOrgCode", pOrg.getCode());
 	    request.setAttribute("pOrgName", pOrg.getName());
 	}
 	OrganisationType orgType = organisation.getOrganisationType();
@@ -116,6 +118,7 @@
 	userManageForm.setCanResetOrgPassword(request.isUserInRole(Role.SYSADMIN));
 
 	userManageForm.setOrgId(orgId);
+	userManageForm.setOrgCode(orgCode);
 	userManageForm.setOrgName(orgName);
 	List<UserManageBean> userManageBeans = userManagementService.getUserManageBeans(orgId);
 	Collections.sort(userManageBeans);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -64,18 +64,22 @@
 	    return "error";
 	}
 
+	String orgCode = organisation.getCode();
+	
 	String orgName = organisation.getName();
 	log.debug("orgName: " + orgName);
 	Organisation parentOrg = organisation.getParentOrganisation();
 	if (parentOrg != null && !parentOrg.equals(userManagementService.getRootOrganisation())) {
 	    request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+	    request.setAttribute("pOrgCode", parentOrg.getCode());
 	    request.setAttribute("pOrgName", parentOrg.getName());
 	}
 	Integer orgType = organisation.getOrganisationType().getOrganisationTypeId();
 	request.setAttribute("orgType", orgType);
 
 	// create form object
 	userOrgForm.setOrgId(orgId);
+	userOrgForm.setOrgCode(orgCode);
 	userOrgForm.setOrgName(orgName);
 
 	String[] args = { "0" };
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -80,6 +80,7 @@
 	Organisation parentOrg = organisation.getParentOrganisation();
 	if (parentOrg != null && !parentOrg.equals(userManagementService.getRootOrganisation())) {
 	    request.setAttribute("pOrgId", parentOrg.getOrganisationId());
+	    request.setAttribute("pOrgCode", parentOrg.getCode());
 	    request.setAttribute("pOrgName", parentOrg.getName());
 	}
 	request.setAttribute("orgType", organisation.getOrganisationType().getOrganisationTypeId());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java
===================================================================
diff -u -rb5d493f6a41f8161b6a62a0cea53e78e069bac36 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java	(.../UserListDTO.java)	(revision b5d493f6a41f8161b6a62a0cea53e78e069bac36)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserListDTO.java	(.../UserListDTO.java)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -35,6 +35,7 @@
 public class UserListDTO {
     private List<UserManageBean> userManageBeans;
     private Integer orgId;
+    private String orgCode;
     private String orgName;
     private Boolean courseAdminCanAddNewUsers;
     private Boolean courseAdminCanBrowseAllUsers;
@@ -97,4 +98,12 @@
         this.canEditRole = canEditRole;
     }
 
+    public String getOrgCode() {
+	return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+	this.orgCode = orgCode;
+    }
+
 }
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgForm.java
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgForm.java	(.../UserOrgForm.java)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserOrgForm.java	(.../UserOrgForm.java)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -25,6 +25,8 @@
 public class UserOrgForm {
 
     private Integer orgId;
+    
+    private String orgCode;
 
     private String orgName;
 
@@ -54,4 +56,12 @@
 	this.userIds = userIds;
     }
 
+    public String getOrgCode() {
+	return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+	this.orgCode = orgCode;
+    }
+
 }
Index: lams_admin/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/web/WEB-INF/tags/Alert.tag	(.../Alert.tag)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
+++ lams_admin/web/WEB-INF/tags/Alert.tag	(.../Alert.tag)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -28,19 +28,19 @@
 	</c:when>
 </c:choose>
 
-<div class="container">
-	<div class="row justify-content-md-center">
-		<div class="col-md-auto">
-			<div id="${idName}" class="alert alert-${alertType} shadow" role="alert">
-				<c:if test="${not empty title}">
-					<span class="fa fa-${iconType}"></span> <span class="alert-title font-weight-bold">${title}</span>
-					<hr class="alert-separator">
-				</c:if>
-
-				<jsp:doBody />
-			</div>
+<div class="row justify-content-md-center">
+	<div class="col-md-auto">
+		<div id="${idName}" class="alert alert-${alertType} shadow" role="alert">
+			<c:if test="${not empty title}">
+				<span class="fa fa-${iconType} "></span> <span class="alert-heading font-weight-bold">${title}</span>
+				<hr>
+			</c:if>
+			<p class="mb-0">
+			<jsp:doBody />
+			</p>
 		</div>
-	</div>	
-</div></div>
+	</div>
+</div>	
 
 
+
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -90,7 +90,8 @@
 							<fmt:message key="admin.organisation.name"/> 
 						</label>&nbsp;<span class="text-danger">*</span>
 						<input id="name" maxlength="40" name="name" value="${organisationForm.name}" class="form-control form-control-sm" maxlength="240" required/>			
-		
+					</div>	
+					<div class="form-group">
 						<label for="code">
 							<fmt:message key="admin.organisation.code"/>
 						</label>
Index: lams_admin/web/user/basiclist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/web/user/basiclist.jsp	(.../basiclist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/user/basiclist.jsp	(.../basiclist.jsp)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -1,7 +1,5 @@
 <%@ include file="/taglibs.jsp"%>
 
-<lams:css/>
-
 <c:forEach var="user" items="${users}">
-	<li id="<c:out value="${user.userId}"/>"><c:out value="${user.login}" /> (<c:out value="${user.firstName}" />&nbsp;<c:out value="${user.lastName}" />) - <c:out value="${user.email}" /></li>
+	<li role="presentation" id="<c:out value="${user.userId}"/>"><c:out value="${user.login}" /> (<c:out value="${user.firstName}" />&nbsp;<c:out value="${user.lastName}" />) - <c:out value="${user.email}" /></li>
 </c:forEach>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -59,17 +59,17 @@
 	
 
 	<c:if test="${orgType == 2}">
-		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${userManageForm.orgId} | <c:out value="${userManageForm.orgName}" escapeXml="true" /> </c:set>
+		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${userManageForm.orgId} | <c:out value="${userManageForm.orgCode}" escapeXml="true" /> :  <c:out value="${userManageForm.orgName}" escapeXml="true" /> </c:set>
 	</c:if>
 	<c:if test="${orgType == 3}">
-		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${pOrgId} | <c:out value="${pOrgName}" escapeXml="true"/></c:set>
-		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${userManageForm.orgId} | <c:out value="${userManageForm.orgName}" escapeXml="true"/></c:set>
+		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${pOrgId} | <c:out value="${pOrgCode}" escapeXml="true"/> : <c:out value="${pOrgName}" escapeXml="true"/></c:set>
+		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${userManageForm.orgId} |  <c:out value="${userManageForm.orgCode}" escapeXml="true" /> : <c:out value="${userManageForm.orgName}" escapeXml="true"/></c:set>
 	</c:if>
 
 	<c:set var="breadcrumbItems">${breadcrumbItems}, . | <fmt:message key="admin.user.management"/></c:set>
 
 
-	<lams:Page type="admin" title="${title}" breadcrumbItems="${breadcrumbItems}" >
+	<lams:Page type="admin" breadcrumbItems="${breadcrumbItems}" >
 							
 		<section id="userDetails" class="pl-3 pr-3">	
 			<div class="row bg-light text-dark pt-2 pb-2">
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -r92b07870b09c49b9db34996fab8e99651d2d2538 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 92b07870b09c49b9db34996fab8e99651d2d2538)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -12,6 +12,7 @@
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
 	<style>
+	
 		.listBoundingBox {
 			border:thin solid #c1c1c1;
 			margin-left:5px;
@@ -150,70 +151,71 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title">${title}: <fmt:message key="admin.user.add"/></c:set>
-	<lams:Page type="admin" title="${title}">
-				<p>
-					<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-				    <c:if test="${not empty pOrgId}">
-				        : <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="pOrgId" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
-				    </c:if>
-				    <c:if test="${userOrgForm.orgId != 1}">
-						: <a href="<lams:LAMSURL/>admin/<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
-						<c:out value="${userOrgForm.orgName}"/></a>
-					</c:if>
-					<c:if test="${userOrgForm.orgId == 1}">
-						: <a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
-					</c:if>
-				</p>
+	<%-- Build breadcrumb --%>
+	<c:set var="breadcrumbItems"><lams:LAMSURL/>admin/orgmanage.do?org=1" | <fmt:message key="admin.course.manage" /></c:set>
+    <c:if test="${not empty pOrgId}">
+    	<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${pOrgId} | <c:out value="${pOrgCode}" escapeXml="true"/> : <c:out value="${pOrgName}" escapeXml="true"/></c:set>
+    </c:if>
+    <c:if test="${userOrgForm.orgId != 1}">
+    	<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=${userOrgForm.orgId} | <c:out value="${userOrgForm.orgCode}" escapeXml="true"/> : <c:out value="${userOrgForm.orgName}" escapeXml="true"/></c:set>
+    	<c:set var="breadcrumbItems">${breadcrumbItems}, javascript:history.go(-1) | <fmt:message key="admin.user.management"/></c:set>
+    	<c:set var="breadcrumbItems">${breadcrumbItems}, . | <fmt:message key="admin.user.add"/></c:set>
+	</c:if>
+	<c:if test="${userOrgForm.orgId == 1}">
+		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/usermanage.do?org=${userOrgForm.orgId} | <fmt:message key="admin.global.roles.manage" /></c:set>
+	</c:if>	
+
+
+	<lams:Page type="admin" breadcrumbItems="${breadcrumbItems}">
+		<div class="row">
+			<div class="col bg-light ml-3 mr-3 p-4">
+
+
+				<h1><c:out value="${userOrgForm.orgName}" escapeXml="true"/>: <fmt:message key="admin.user.add"/></h1>
 				
-				<h3><fmt:message key="admin.user.add"/></h3>
-				
-				<div align="center">
-				</div>
-				
 				<c:if test="${orgType == 2}">
 					<lams:Alert id="subgroup-warning" type="info" close="false">
 						<fmt:message key="msg.remove.from.subgroups"/>
 					</lams:Alert>
 				</c:if>
+
 				
-				<h4><fmt:message key="heading.users"/></h4>
+				<h2><fmt:message key="heading.users"/></h2>
 				<div class="pull-right"><span id="totalUsers"><c:out value="${numExistUsers}"/></span></div>
 				<p>
 					 <fmt:message key="msg.click.remove.user"/>
 				</p>
-				<div class="listBoundingBox">
+				<div class="listBoundingBox border-success bg-white">
 					<div id="existing" class="listScrollable">
 					</div>
 				</div>
 				
-				<p>&nbsp;</p>
 				
-				<h4><fmt:message key="heading.potential.users"/></h4>
+				<h2 class="mt-3"><fmt:message key="heading.potential.users"/></h2>
 				<p>
 					<fmt:message key="msg.click.add.user"/>
 				</p>
 				<div class="pull-right"><span id="potentialUsers"><c:out value="${numPotentialUsers}"/></span></div>
 				<form onsubmit="return loadSearchResults(0);">
 					<p>
-						<fmt:message key="admin.search"/>: <input id="term" type="text"/> or <a onclick="loadSearchResults(1);"><fmt:message key="msg.show.all.potential.users"/></a>
+						<label for="term"><fmt:message key="admin.search"/></label>: <input id="term" class="form-control-inline form-control-sm" type="text"/> or <a onclick="loadSearchResults(1);" ><fmt:message key="msg.show.all.potential.users"/></a>
 					</p>
 				</form>
-				<div class="listBoundingBox">
+				<div class="listBoundingBox border-secondary bg-white">
 					<div id="potential" class="listScrollable">
 					</div>
 				</div>
-				
-				<p>&nbsp;</p>
-				
-				<div id="form" class="pull-right">
+								
+				<div id="form" class="pull-right mt-3 mb-1">
 					<form:form action="./userorgsave.do" modelAttribute="userOrgForm" id="userOrgForm" method="post">
 						<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 						<form:hidden path="orgId" />
-						<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
-						<input type="submit" id="nextButton" class="btn btn-primary loffset5" onclick="return populateForm();" value="<fmt:message key="label.next"/>" />
+						<a href="javascript:history.go(-1)" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+						<input type="submit" id="nextButton" class="btn btn-primary ml-2" onclick="return populateForm();" value="<fmt:message key="label.next"/>" />
 					</form:form>
 				</div>
+			</div>
+		</div>				
 	</lams:Page>
 
 </body>
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r173b2cd2375bd1d02d41f55461d7948a41b680c1 -rc4f00d46b2c0f39f7a7261bc242ff0cbf4daae07
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 173b2cd2375bd1d02d41f55461d7948a41b680c1)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision c4f00d46b2c0f39f7a7261bc242ff0cbf4daae07)
@@ -21,11 +21,11 @@
 
 	<c:if test="${not empty pOrgId}">
 		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${pOrgId} | <c:out value="${parentName}" escapeXml="true"/> </c:set>
-		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/usermanage.do?org=${userRolesForm.orgId} |<c:out value="${orgName}" escapeXml="true"/></c:set>
+		<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/usermanage.do?org=${userRolesForm.orgId} | <c:out value="${orgName}" escapeXml="true"/></c:set>
 	</c:if>
 	<c:if test="${empty pOrgId}">
 		<c:if test="${userRolesForm.orgId != 1}">
-			<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${userRolesForm.orgId} | <c:out value="${orgName}" escapeXml="true"/></c:set>
+			<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=${userRolesForm.orgId} |  <c:out value="${orgName}" escapeXml="true"/></c:set>
 		</c:if>
 		<c:if test="${userRolesForm.orgId == 1}">
 			<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/usermanage.do?org=${userRolesForm.orgId} | <fmt:message key="admin.global.roles.manage" />  </c:set>