Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rea2d5b224a225815c056c78f30b7f7f6d9b70dc0 -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ea2d5b224a225815c056c78f30b7f7f6d9b70dc0)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
@@ -439,9 +439,9 @@
 			--%>
 			
 			
-
+			<header>
 			<c:if test="${not empty breadcrumbItems}">
-											
+
 				<nav aria-label="breadcrumb" role="navigation">
 				  <ol class="breadcrumb">
 
@@ -464,25 +464,23 @@
 					</c:forEach>
 					  </ol>
 				</nav>						    
-				
+			
 			</c:if>
-
+			</header>
+			
 			<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">
+				<c:if test="${not empty title}"><h1><c:out value="${title}" escapeXml="true" /></h1></c:if>
 				<jsp:doBody />
 			</main>
 			</div>
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -re090b2b85b2a9385d2498fd3c140865833c30a9a -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision e090b2b85b2a9385d2498fd3c140865833c30a9a)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
@@ -3,7 +3,23 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title"><fmt:message key="admin.organisation.entry"/></c:set>
+
+<c:set var="title">
+	<c:if test="${not empty organisationForm.orgId}">
+		<fmt:message key="admin.edit"/>: <c:out value="${organisationForm.name}"/>
+	</c:if>
+	<c:if test="${empty organisationForm.orgId}">
+		
+		<c:if test="${organisationForm.typeId == 2}">
+			<fmt:message key="admin.course.add"/>
+		</c:if>
+		<c:if test="${organisationForm.typeId == 3}">
+			<fmt:message key="admin.class.add"/>
+		</c:if>
+
+	</c:if>
+</c:set>	
+
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
@@ -51,147 +67,139 @@
 	
 
 
-	<lams:Page type="admin" title="${title}" formID="organisationForm" breadcrumbItems="${breadcrumbItems}">	
-		<form:form action="../orgsave.do" method="post" modelAttribute="organisationForm" id="organisationForm" onsubmit="return warnIfRemoved()">
-		    <input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
-			<form:hidden path="orgId" />
-			<form:hidden path="parentId" />
-			<form:hidden path="typeId" />
-			
-			<h2>
-				<c:if test="${not empty organisationForm.orgId}">
-					<fmt:message key="admin.edit"/>&nbsp;<c:out value="${organisationForm.name}"/>&nbsp;
-				</c:if>
-				<c:if test="${empty organisationForm.orgId}">
+	<lams:Page type="admin" title="${title}" formID="organisationForm" breadcrumbItems="${breadcrumbItems}">
+		<div class="row">
+			<div class="col-12 col-md-8 offset-md-2 col-lg-6 offset-lg-3">
+	
+				<form:form action="../orgsave.do" method="post" modelAttribute="organisationForm" id="organisationForm" onsubmit="return warnIfRemoved()">
+				    <input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
+					<form:hidden path="orgId" />
+					<form:hidden path="parentId" />
+					<form:hidden path="typeId" />
+		
+					
+					<lams:errors path="*"/>
+					
+					<div id="deleteAllLessonsBox" class="alert alert-info" style="display: none">
+						<fmt:message key="label.delete.all.lesson.count" />&nbsp;<span id="lessonCount"></span> / <span id="totalLessonCount"></span>
+						<fmt:message key="label.delete.all.lesson.progress" />
+					</div>
+		
+					<div class="form-group">
+						<label for="name">
+							<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/>			
+		
+						<label for="code">
+							<fmt:message key="admin.organisation.code"/>
+						</label>
+						<form:input path="code" size="20" cssClass="form-control form-control-sm" maxlength="20"/>	
+					</div>
+					<div class="form-group">
+						<label for="description">
+							<fmt:message key="admin.organisation.description"/>
+						</label>
+						
+						<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>
+						
+						<form:select name="stateId" path="stateId" cssClass="form-control" >
+							<c:forEach items="${status}" var="state">
+								<form:option value="${state.organisationStateId}"><fmt:message key="organisation.state.${state.description}"/></form:option>
+							</c:forEach>
+						</form:select>
+		
+					</div>
+					<h2><fmt:message key="admin.course.settings"/></h2>				
+					<div class="form-group">
 					<c:if test="${organisationForm.typeId == 2}">
-						<fmt:message key="admin.course.add"/>
-					</c:if>
-					<c:if test="${organisationForm.typeId == 3}">
-						<fmt:message key="admin.class.add"/>
-					</c:if>
-				</c:if>
-			</h2>
-			
-			<lams:errors path="*"/>
-			
-			<div id="deleteAllLessonsBox" class="alert alert-info" style="display: none">
-				<fmt:message key="label.delete.all.lesson.count" />&nbsp;<span id="lessonCount"></span> / <span id="totalLessonCount"></span>
-				<fmt:message key="label.delete.all.lesson.progress" />
-			</div>
-
-			<div class="form-group">
-				<label for="name">
-					<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/>			
-
-				<label for="code">
-					<fmt:message key="admin.organisation.code"/>
-				</label>
-				<form:input path="code" size="20" cssClass="form-control form-control-sm" maxlength="20"/>	
-			</div>
-			<div class="form-group">
-				<label for="description">
-					<fmt:message key="admin.organisation.description"/>
-				</label>
-				
-				<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>
-				
-				<form:select name="stateId" path="stateId" cssClass="form-control" >
-					<c:forEach items="${status}" var="state">
-						<form:option value="${state.organisationStateId}"><fmt:message key="organisation.state.${state.description}"/></form:option>
-					</c:forEach>
-				</form:select>
-
-			</div>
-			<h3><fmt:message key="admin.course.settings"/></h3>				
-			<div class="form-group">
-			<c:if test="${organisationForm.typeId == 2}">
-
-				<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"/>
+		
+						<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="enableCourseNotifications" id="enable-course-notifications" cssClass="form-check-input"/>
+					    	<label  class="form-check-label" for="enable-course-notifications">
+					    		<fmt:message key="admin.enable.course.notifications"/>
+					    	</label>
+						</div>
+		
+						<div class="form-check">
+							<form:checkbox id="enableGradebookForLearners" path="enableGradebookForLearners" cssClass="form-check-input"/>
+					    	<label  class="form-check-label" for="enableGradebookForLearners">
+					    		<fmt:message key="admin.gradebook.learner.enable"/>
+					    	</label>
+						</div>
+		
+						<div class="form-check">
+							<form:checkbox path="enableSingleActivityLessons" id="enable-single-activity-lessons" cssClass="form-check-input" />
+					    	<label  class="form-check-label" for="enable-single-activity-lessons">
+					    		<fmt:message key="config.authoring.single.activity"/>
+					    	</label>
+						</div>
+		
+					</c:if>	
+		
+					<div class="form-check">
+						<form:checkbox path="enableLiveEdit" id="enable-live-edit" cssClass="form-check-input" />
+				    	<label  class="form-check-label" for="enable-live-edit">
+				    		<fmt:message key="config.live.edit"/>
 				    	</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"/>
+		
+					<div class="form-check">
+						<form:checkbox path="enableKumalive" id="enable-kumalive" cssClass="form-check-input" />
+				    	<label  class="form-check-label" for="enable-kumalive">
+				    		<fmt:message key="config.kumalive.enable"/>
 				    	</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>
+		
+					<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-outline-secondary"><fmt:message key="admin.cancel"/></a>
+						<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
 					</div>
-				</div>
-				<div class="form-check">
-					<form:checkbox path="enableCourseNotifications" id="enable-course-notifications" cssClass="form-check-input"/>
-			    	<label  class="form-check-label" for="enable-course-notifications">
-			    		<fmt:message key="admin.enable.course.notifications"/>
-			    	</label>
-				</div>
-
-				<div class="form-check">
-					<form:checkbox id="enableGradebookForLearners" path="enableGradebookForLearners" cssClass="form-check-input"/>
-			    	<label  class="form-check-label" for="enableGradebookForLearners">
-			    		<fmt:message key="admin.gradebook.learner.enable"/>
-			    	</label>
-				</div>
-
-				<div class="form-check">
-					<form:checkbox path="enableSingleActivityLessons" id="enable-single-activity-lessons" cssClass="form-check-input" />
-			    	<label  class="form-check-label" for="enable-single-activity-lessons">
-			    		<fmt:message key="config.authoring.single.activity"/>
-			    	</label>
-				</div>
-
-			</c:if>	
-
-			<div class="form-check">
-				<form:checkbox path="enableLiveEdit" id="enable-live-edit" cssClass="form-check-input" />
-		    	<label  class="form-check-label" for="enable-live-edit">
-		    		<fmt:message key="config.live.edit"/>
-		    	</label>
-			</div>
-
-			<div class="form-check">
-				<form:checkbox path="enableKumalive" id="enable-kumalive" cssClass="form-check-input" />
-		    	<label  class="form-check-label" for="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-outline-secondary"><fmt:message key="admin.cancel"/></a>
-				<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
+				</form:form>
 			</div>
-			
 		</div>
-				
-		</form:form>
 
 	</lams:Page>
 </body>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -re090b2b85b2a9385d2498fd3c140865833c30a9a -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision e090b2b85b2a9385d2498fd3c140865833c30a9a)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
@@ -11,7 +11,13 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title"><fmt:message key="admin.user.entry"/></c:set>
+	<c:if test="${not empty userForm.userId}">
+		<c:set var="title"><fmt:message key="admin.user.edit"/></c:set>
+	</c:if> 
+	<c:if test="${empty userForm.userId}">
+		<c:set var="title"><fmt:message key="admin.user.create"/></c:set>
+	</c:if>
+
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
@@ -165,7 +171,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title">${title}: <fmt:message key="admin.user.edit"/></c:set>
 	
 	<%-- Build breadcrumb --%>
 	<c:set var="breadcrumbItems"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
@@ -196,366 +201,315 @@
 					</c:if>
 				</c:if>
 						
-				<c:if test="${not empty userForm.userId}">
-					<h2><fmt:message key="admin.user.edit" /></h2>
-				</c:if> 
-				<c:if test="${empty userForm.userId}">
-					<h2><fmt:message key="admin.user.create" /></h2>
-				</c:if>
-			    <div class="row">
-				<div class="col-xl-12">
 						
-							<c:if test="${empty userForm.userId}">
-							<lams:Alert type="info" id="passwordConditions" close="false">
-							<fmt:message key='label.password.must.contain' />:
-								<ul class="list-unstyled" style="line-height: 1.2">
-									<li><span class="fa fa-check"></span> <fmt:message
-											key='label.password.min.length'>
-											<fmt:param value='${minNumChars}' />
-										</fmt:message></li>
-				
-									<c:if test="${mustHaveUppercase}">
-										<li><span class="fa fa-check"></span> <fmt:message
-												key='label.password.must.ucase' /></li>
+				<c:if test="${empty userForm.userId}">
+					<lams:Alert type="info" id="passwordConditions" close="false">
+					<fmt:message key='label.password.must.contain' />:
+						<ul class="list-unstyled ml-2" style="line-height: 1.2">
+							<li><span class="fa fa-check"  aria-hidden="true"></span> <fmt:message
+									key='label.password.min.length'>
+									<fmt:param value='${minNumChars}' />
+								</fmt:message></li>
+		
+							<c:if test="${mustHaveUppercase}">
+								<li><span class="fa fa-check" aria-hidden="true"></span> <fmt:message
+										key='label.password.must.ucase' /></li>
+							</c:if>
+							<c:if test="${mustHaveLowercase}">
+										<li><span class="fa fa-check aria-hidden="true""></span> <fmt:message
+												key='label.password.must.lcase' /></li>
 									</c:if>
-									<c:if test="${mustHaveLowercase}">
-												<li><span class="fa fa-check"></span> <fmt:message
-														key='label.password.must.lcase' /></li>
-											</c:if>
-				
-									<c:if test="${mustHaveNumerics}">
-										<li><span class="fa fa-check"></span> <fmt:message
-												key='label.password.must.number' /></li>
-									</c:if>
-				
-				
-									<c:if test="${mustHaveSymbols}">
-										<li><span class="fa fa-check"></span> <fmt:message
-												key='label.password.must.symbol' /></li>
-									</c:if>
-								</ul>
-							</lams:Alert>
-						</c:if>
-					</div>
-					</div>
+		
+							<c:if test="${mustHaveNumerics}">
+								<li><span class="fa fa-check" aria-hidden="true"></span> <fmt:message
+										key='label.password.must.number' /></li>
+							</c:if>
+		
+		
+							<c:if test="${mustHaveSymbols}">
+								<li><span class="fa fa-check" aria-hidden="true"></span> <fmt:message
+										key='label.password.must.symbol' /></li>
+							</c:if>
+						</ul>
+					</lams:Alert>
+				</c:if>
 					
 					<!--  Main panel. Do not show portrait area for new user. -->
 					<c:if test="${not empty userForm.userId}">
 				    <div class="row">
-						<div class="col-xl-2">
+						<div class="col-md-5">
 				    			<div class="text-center"><div id="portraitPicture" ></div></div>
 							<c:if test="${isSysadmin}">
 				    			<div id="portraitButton" class="text-center voffset10" style="display:none; margin-bottom: 5px;">
 				    			<a href="#" onclick="javascript:deletePortrait();" class="btn btn-outline-secondary btn-sm"><fmt:message key="label.delete.portrait" /></a></div>
 				    			</c:if>
+							<div class="mt-3 text-center">
+							<a href="<lams:LAMSURL/>admin/userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}" class="btn btn-outline-secondary btn-sm"><fmt:message key="admin.user.changePassword" /></a>
+							</div>
+				    			
 				    	</div>
-					<div class="col-xl-10">
+					<div class="col-md-6">
+					
 					</c:if>
 					<c:if test="${empty userForm.userId}">
-				    <div class="row">
-					<div class="col-xl-12">
+				    <div class="row justify-content-center">
+					<div class="col-10 col-md-6">
 					</c:if>
 					
-						<table class="table table-borderless" role="presentation">
-							<tr>
-								<td class="text-right">
-									<label for="login">
-										<fmt:message key="admin.user.login" />
-									</label>:&nbsp;<span class="text-danger">*</span>
-								</td>
-								<td><lams:errors path="login"/>
-								<form:input id="login" path="login"  maxlength="50"
-										cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<c:if test="${empty userForm.userId}">
-							<tr>
-								<td class="text-right">
-									<label for="password">
-										<fmt:message key="admin.user.password" />
-									</label>:&nbsp;<span class="text-danger">*</span>
-								</td>
-								<td><lams:errors path="password"/>
-									<form:input type="password" path="password" 
-										maxlength="25" id="password" cssClass="form-control form-control-sm" /></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="password2">
-										<fmt:message key="admin.user.password.confirm" />
-									</label>:&nbsp;<span class="text-danger">*</span>
-								</td>
-								<td><form:input type="password" path="password2" 
-										maxlength="25" id="password2" cssClass="form-control form-control-sm" /></td>
-							</tr>
-							</c:if>
-							<tr>
-								<td class="text-right">
-									<label for="authenticationMethodId">
-										<fmt:message key="admin.user.authentication.method" />
-									</label>:
-								</td>
-								<td><form:select id="authenticationMethodId" path="authenticationMethodId"
-										cssClass="form-control form-control-sm">
-										<c:forEach items="${authenticationMethods}" var="method">
-											<form:option value="${method.authenticationMethodId}">
-												<c:out value="${method.authenticationMethodName}" />
-											</form:option>
-										</c:forEach>
-									</form:select></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="title">
-										<fmt:message key="admin.user.title" />
-									</label>:
-								</td>
-								<td><form:input type="text" path="title" size="32" maxlength="32"
-										id="title" cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="firstName">
-										<fmt:message key="admin.user.first_name" />
-									</label>:&nbsp;<span class="text-danger">*</span>
-								</td>
-								<td><lams:errors path="firstName"/>
-									<form:input path="firstName" 
-										id="firstName" maxlength="128" cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="lastName">
-										<fmt:message key="admin.user.last_name" />
-									</label>:&nbsp;<span class="text-danger">*</span>
-								</td>
-								<td><lams:errors path="lastName"/>
-									<form:input path="lastName" 
-										id="lastName" maxlength="128" cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="email">
-										<fmt:message key="admin.user.email" />
-									</label>:&nbsp;<span class="text-danger">*</span>
-								</td>
-								<td><lams:errors path="email"/>
-									<form:input path="email" maxlength="128" id="email"
-										cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="addressLine1">
-										<fmt:message key="admin.user.address_line_1" />
-									</label>:
-								</td>
-								<td><form:input path="addressLine1" 
-										maxlength="64" cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="addressLine2">
-										<fmt:message key="admin.user.address_line_2" />
-									</label>:
-								</td>
-								<td><form:input path="addressLine2" 
-										maxlength="64" cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="addressLine3">
-										<fmt:message key="admin.user.address_line_3" />
-									</label>:
-								</td>
-								<td><form:input path="addressLine3" 
-										maxlength="64" cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="city">
-										<fmt:message key="admin.user.city" />
-									</label>:
-								</td>
-								<td><form:input path="city"  maxlength="64"
-										cssClass="form-control form-control-sm"/></td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="postcode">
-										<fmt:message key="admin.user.postcode" />
-									</label>:
-								</td>
-								<td>
-									<form:input path="postcode" size="10" maxlength="10" cssClass="form-control form-control-sm"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="text-right">	
-									<label for="state">
-										<fmt:message key="admin.user.state" />
-									</label>:
-								</td>
-								<td><form:input path="state"  maxlength="64"
-										cssClass="form-control form-control-sm" />
-								</td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="country">
-										<fmt:message key="admin.user.country" />
-									</label>:
-								</td>
-								<td>
-									<form:select path="country" cssClass="form-control form-control-sm">
-										<form:option value="0"><fmt:message key="label.select.country" /></form:option>
-										<c:forEach items="${countryCodes}" var="countryCode">
-											<form:option value="${countryCode.key}">
-												${countryCode.value}
-											</form:option>
-										</c:forEach>
-									</form:select>
-								</td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="dayPhone">
-										<fmt:message key="admin.user.day_phone" />
-									</label>:
-								</td>
-								<td>
-									<form:input path="dayPhone"  maxlength="64" cssClass="form-control form-control-sm"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="eveningPhone">
-										<fmt:message key="admin.user.evening_phone" />
-									</label>:
-								</td>
-								<td>
-									<form:input path="eveningPhone" maxlength="64" cssClass="form-control form-control-sm"/>		
-								</td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="mobilePhone">
-										<fmt:message key="admin.user.mobile_phone" />
-									</label>:
-								</td>
-								<td>
-									<form:input path="mobilePhone" maxlength="64" cssClass="form-control form-control-sm"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="text-right">
-									<label for="fax">
-										<fmt:message key="admin.user.fax" />
-									</label>:
-								</td>
-								<td>
-									<form:input path="fax" maxlength="64" cssClass="form-control form-control-sm"/>
-								</td>
-							</tr>
-			
-							<tr>
-								<td class="text-right">
-									<label for="localeId">
-										<fmt:message key="admin.organisation.locale" />
-									</label>:
-								</td>
-								<td>
-									<form:select path="localeId" cssClass="form-control form-control-sm">
-										<c:forEach items="${locales}" var="locale">
-											<form:option value="${locale.localeId}">
-												<c:out value="${locale.description}" />
-											</form:option>
-										</c:forEach>
-									</form:select>
-								</td>
-							</tr>
-			
-							<tr>
-								<td class="text-right">
-									<label for="timeZone">
-										<fmt:message key="admin.user.time.zone" />
-									</label>:
-								</td>
-								<td>
-									<form:select path="timeZone" cssClass="form-control form-control-sm">
-										<c:forEach items="${timezoneDtos}" var="timezoneDto">
-											<form:option value="${timezoneDto.timeZoneId}">
-												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-											</form:option>
-										</c:forEach>
-									</form:select>
-								</td>
-							</tr>
-			
-							<tr>
-								<td class="text-right">
-									<label for="userTheme">
-										<fmt:message key="label.theme" />
-									</label>:
-								</td>
-								<td>
-									<form:select path="userTheme" class="form-control form-control-sm">
-										<c:forEach items="${themes}" var="theme">
-											<form:option value="${theme.themeId}">${theme.name}</form:option>
-										</c:forEach>
-									</form:select>
-								</td>
-							</tr>
+						<div class="form-group">
+							<label for="login">
+								<fmt:message key="admin.user.login" />:&nbsp;<span class="text-danger">*</span>
+							</label>
+							<form:input id="login" path="login"  maxlength="50"
+									cssClass="form-control form-control-sm"/>
+							<small id="loginHelpBlock" class="form-text text-muted">
+								<lams:errors path="login"/>
+							</small>		
+						</div>	
+					
+						<c:if test="${empty userForm.userId}">
+
+							<div class="form-group">
+								<label for="password">
+									<fmt:message key="admin.user.password" />:&nbsp;<span class="text-danger">*</span>
+								</label>
+								<form:input type="password" path="password" 
+									maxlength="25" id="password" cssClass="form-control form-control-sm" />
+								<small id="passwordHelpBlock" class="form-text text-muted">
+									<lams:errors path="password"/>
+								</small>		
+							</div>
 							
-							<tr>
-								<td class="text-right">
-									<label for="changePassword">
-										<fmt:message key="admin.user.change.password" />
-									</label>:
-								</td>
-								<td>
-									<form:checkbox path="changePassword" value="true" id="changePassword"  />
-								</td>
-							</tr>
+						
+							<div class="form-group">
+								<label for="password2">
+									<fmt:message key="admin.user.password.confirm" />:&nbsp;<span class="text-danger">*</span>
+								</label>
+								<form:input type="password" path="password2" 
+									maxlength="25" id="password2" cssClass="form-control form-control-sm" />
 							
-							<c:if test="${isSysadmin}">
-								<tr>
-									<td class="text-right">
-										<label for="twoFactorAuthenticationEnabled">
-											<fmt:message key="label.2FA.property.enable" /> 
-										</label>:
-									</td>
-									<td>
-										<form:checkbox id="twoFactorAuthenticationEnabled" path="twoFactorAuthenticationEnabled" value="true"  />
-									</td>
-								</tr>
-							</c:if>
-							
-							<c:if test="${not empty createDate}">
-								<tr>
-									<td class="text-right">
-										<label>
-											<fmt:message key="admin.user.create.date" />
-										</label>:
-									</td>
-									<td>
-										<lams:Date value="${createDate}"/>
-									</td>
-								</tr>
-							</c:if>
-				
-				
-						</table>
-					</div>
-					</div>
-					
-					<div class="row">
-					<div class="col-xl-12">
-						<c:if test="${not empty userForm.userId}">
-							<div class="pull-left">
-							<a href="<lams:LAMSURL/>admin/userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}" class="btn btn-outline-secondary btn-sm"><fmt:message key="admin.user.changePassword" /></a>
 							</div>
 						</c:if>
 						
-						<div class="pull-right">
+						<div class="form-group">
+							<label for="authenticationMethodId">
+								<fmt:message key="admin.user.authentication.method" />:
+							</label>
+							<form:select id="authenticationMethodId" path="authenticationMethodId"
+								cssClass="form-control form-control-sm">
+								<c:forEach items="${authenticationMethods}" var="method">
+									<form:option value="${method.authenticationMethodId}">
+										<c:out value="${method.authenticationMethodName}" />
+									</form:option>
+								</c:forEach>
+							</form:select>
+						</div>						
+					
+						<div class="form-group">
+							<label for="title">
+								<fmt:message key="admin.user.title" />:
+							</label>
+							<form:input type="text" path="title" size="32" maxlength="32"
+								id="title" cssClass="form-control form-control-sm"/>
+						</div>	
+						
+						<div class="form-group">
+							<label for="firstName">
+								<fmt:message key="admin.user.first_name" />:&nbsp;<span class="text-danger">*</span>
+							</label>
+							<form:input path="firstName" 
+								id="firstName" maxlength="128" cssClass="form-control form-control-sm"/>
+							<small id="firstNameHelpBlock" class="form-text text-muted">
+								<lams:errors path="firstName"/>
+							</small>	
+						</div>	
+									
+						<div class="form-group">
+							<label for="lastName">
+								<fmt:message key="admin.user.last_name" />:&nbsp;<span class="text-danger">*</span>
+							</label>
+							<form:input path="lastName" 
+								id="lastName" maxlength="128" cssClass="form-control form-control-sm"/>
+							<small id="lastNameHelpBlock" class="form-text text-muted">
+								<lams:errors path="lastName"/>
+							</small>	
+						</div>	
+
+						<div class="form-group">
+							<label for="email">
+								<fmt:message key="admin.user.email" />:&nbsp;<span class="text-danger">*</span>
+							</label>
+							<form:input path="email" maxlength="128" id="email"
+								cssClass="form-control form-control-sm"/>
+							<small id="emailHelpBlock" class="form-text text-muted">
+								<lams:errors path="email"/>
+							</small>	
+						</div>	
+
+
+						<div class="form-group">
+							<label for="addressLine1">
+								<fmt:message key="admin.user.address_line_1" />:
+							</label>
+							<form:input path="addressLine1" 
+								maxlength="64" cssClass="form-control form-control-sm"/>
+						</div>
+						
+						
+						<div class="form-group">
+							<label for="addressLine2">
+								<fmt:message key="admin.user.address_line_2" />:
+							</label>	
+							<form:input path="addressLine2" 
+								maxlength="64" cssClass="form-control form-control-sm"/>
+										
+						</div>
+						
+						<div class="form-group">
+							<label for="addressLine3">
+								<fmt:message key="admin.user.address_line_3" />:
+							</label>	
+							<form:input path="addressLine3" 
+								maxlength="64" cssClass="form-control form-control-sm"/>
+										
+						</div>
+						
+						<div class="form-group">
+							<label for="city">
+								<fmt:message key="admin.user.city" />:
+							</label>	
+							<form:input path="city" 
+								maxlength="64" cssClass="form-control form-control-sm"/>
+										
+						</div>
+
+						<div class="form-group">
+							<label for="postcode">
+								<fmt:message key="admin.user.postcode" />:
+							</label>	
+							<form:input path="postcode" 
+								maxlength="10" cssClass="form-control form-control-sm"/>
+										
+						</div>
+
+						<div class="form-group">
+							<label for="state">
+								<fmt:message key="admin.user.state" />:
+							</label>	
+							<form:input path="state" 
+								maxlength="64" cssClass="form-control form-control-sm"/>
+										
+						</div>
+						
+						<div class="form-group">
+							<label for="country">
+								<fmt:message key="admin.user.country" />:&nbsp;<span class="text-danger">*</span>
+							</label>	
+							<form:select path="country" cssClass="form-control form-control-sm">
+								<form:option value="0"><fmt:message key="label.select.country" /></form:option>
+								<c:forEach items="${countryCodes}" var="countryCode">
+									<form:option value="${countryCode.key}">
+										${countryCode.value}
+									</form:option>
+								</c:forEach>
+							</form:select>
+						</div>
+						
+						<div class="form-group">
+							<label for="dayPhone">
+								<fmt:message key="admin.user.day_phone" />:
+							</label>	
+							<form:input path="dayPhone" maxlength="64" cssClass="form-control form-control-sm"/>
+						</div>
+
+						<div class="form-group">
+							<label for="eveningPhone">
+								<fmt:message key="admin.user.evening_phone" />:
+							</label>	
+							<form:input path="eveningPhone" maxlength="64" cssClass="form-control form-control-sm"/>
+						</div>
+
+						<div class="form-group">
+							<label for="mobilePhone">
+								<fmt:message key="admin.user.mobile_phone" />:
+							</label>	
+							<form:input path="mobilePhone" maxlength="64" cssClass="form-control form-control-sm"/>
+						</div>
+																								
+						<div class="form-group">
+							<label for="fax">
+								<fmt:message key="admin.user.fax" />:
+							</label>	
+							<form:input path="fax" maxlength="64" cssClass="form-control form-control-sm"/>
+						</div>
+
+						<div class="form-group">
+							<label for="localeId">
+								<fmt:message key="admin.organisation.locale" />:
+							</label>	
+							<form:select path="localeId" cssClass="form-control form-control-sm">
+								<c:forEach items="${locales}" var="locale">
+									<form:option value="${locale.localeId}">
+										<c:out value="${locale.description}" />
+									</form:option>
+								</c:forEach>
+							</form:select>
+						</div>
+						
+						<div class="form-group">
+							<label for="timeZone">
+								<fmt:message key="admin.user.time.zone" />:
+							</label>
+							<form:select path="timeZone" cssClass="form-control form-control-sm">
+								<c:forEach items="${timezoneDtos}" var="timezoneDto">
+									<form:option value="${timezoneDto.timeZoneId}">
+										${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
+									</form:option>
+								</c:forEach>
+							</form:select>
+						</div>
+						
+						<div class="form-group">
+							<label for="userTheme">
+								<fmt:message key="label.theme" />:
+							</label>
+							<form:select path="userTheme" class="form-control form-control-sm">
+								<c:forEach items="${themes}" var="theme">
+									<form:option value="${theme.themeId}">${theme.name}</form:option>
+								</c:forEach>
+							</form:select>
+						</div>
+						
+						<div class="form-group form-check ml-3">
+							<form:checkbox cssClass="form-check-input" path="changePassword" value="true" id="changePassword"  />
+							<label class="form-check-label"  for="changePassword">
+										<fmt:message key="admin.user.change.password" />
+							</label>
+						</div>
+												
+						
+						<c:if test="${isSysadmin}">
+							<div class="form-group form-check ml-3">
+							<form:checkbox cssClass="form-check-input" id="twoFactorAuthenticationEnabled" path="twoFactorAuthenticationEnabled" value="true"  />
+							<label class="form-check-label"  for="twoFactorAuthenticationEnabled">
+								<fmt:message key="label.2FA.property.enable" /> 
+							</label>:							
+							</div>
+						</c:if>	
+						
+						<c:if test="${not empty createDate}">
+							<div class="form-group">
+								<label>
+										<fmt:message key="admin.user.create.date" />
+									</label>: <lams:Date value="${createDate}"/>
+							</div> 
+						</c:if>
+
+					
+					<div class="row">
+					<div class="col-12">
+					<hr>
+						<div class="pull-right mb-3">
 							<a href="<lams:LAMSURL/>admin/usersearch.do" class="btn btn-outline-secondary btn-sm"> <fmt:message key="admin.cancel" /> </a>
 							<input type="submit" id="saveButton" class="btn btn-primary btn-sm loffset5" value="<fmt:message key="admin.save" />" />
 						</div>
@@ -565,7 +519,7 @@
 			
 				<c:if test="${not empty globalRoles || not empty userOrgRoles}">
 			
-					<h3 class="voffset20"><fmt:message key="admin.user.roles" /></h3>
+					<h2 class="voffset20"><fmt:message key="admin.user.roles" /></h2>
 
 
 						<c:if test="${not empty globalRoles}">
@@ -584,7 +538,7 @@
 			
 						<c:if test="${not empty userOrgRoles}">
 							<div class="ml-2">
-								<h4><fmt:message key="admin.organisation" /></h4>
+								<h3><fmt:message key="admin.organisation" /></h3>
 						
 								<table id="tableRoles" class="table table-striped table-bordered">
 									<thead class="thead-light">
Index: lams_admin/web/userChangePass.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1
--- lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <%@ include file="/taglibs.jsp"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
@@ -8,6 +9,14 @@
 <c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
 <c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 
+<lams:html>
+<lams:head>
+
+	<c:set var="title"><fmt:message key="admin.user.changePassword"/></c:set>
+	
+	<title>${title}</title>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+
 <lams:css/>
 
 <%-- javascript --%>
@@ -38,10 +47,6 @@
 							errorClass : 'help-block',
 							//  validation rules
 							rules : {
-								login : {
-									required: true,
-									maxlength : 50
-								},
 								password : {
 									required: true,
 									minlength : <c:out value="${minNumChars}"/>,
@@ -81,83 +86,82 @@
 
 	});
 </script>
+</lams:head>
 
-
 <body class="stripes">
-	<form id="userForm" modelAttribute="userForm" action="usersave/changePass.do" method="post">
-		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
-		<input type="hidden" name="userId" value="${param.userId}" />
-		<div class="panel panel-default">
-			<div
-				class="col-12 col-md-8 offset-md-2 col-lg-6 offset-lg-3">
-				<div class="panel voffset20">
+	<%-- Build breadcrumb --%>
+	<c:set var="breadcrumbItems"><lams:LAMSURL/>admin/sysadminstart.do | <fmt:message key="sysadmin.maintain" /></c:set>
+	<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/orgmanage.do?org=1 | <fmt:message key="admin.course.manage" /></c:set>
+	<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/usersearch.do | <fmt:message key="admin.user.management"/></c:set>
+	<c:set var="breadcrumbItems">${breadcrumbItems}, <lams:LAMSURL/>admin/user/edit.do?userId=${param.userId} | <fmt:message key="admin.user.edit"/></c:set>
+	<c:set var="breadcrumbItems">${breadcrumbItems}, . | <fmt:message key="admin.user.changePassword" /></c:set>	
 
-					<div class="panel panel-default">
+<lams:Page type="admin" title="${title}" formID="userForm" breadcrumbItems="${breadcrumbItems}">	
 
-						<div class="panel-heading">
-							<div class="panel-title">
-								<fmt:message key="admin.user.edit" />
-							</div>
-						</div>
-					</div>
-					<div class="panel-body">
-						<lams:Alert type="info" id="passwordConditions" close="false">
-							<fmt:message key='label.password.must.contain' />:
-				<ul class="list-unstyled" style="line-height: 1.2">
-								<li><span class="fa fa-check"></span> <fmt:message
-										key='label.password.min.length'>
-										<fmt:param value='${minNumChars}' />
-									</fmt:message></li>
 
-								<c:if test="${mustHaveUppercase}">
-									<li><span class="fa fa-check"></span> <fmt:message
-											key='label.password.must.ucase' /></li>
-								</c:if>
-								<c:if test="${mustHaveLowercase}">
-									<li><span class="fa fa-check"></span> <fmt:message
-											key='label.password.must.lcase' /></li>
-								</c:if>
+	<lams:Alert type="info" id="passwordConditions" close="false">
+	<fmt:message key='label.password.must.contain' />:
+		<ul class="list-unstyled ml-2" style="line-height: 1.2">
+			<li><span class="fa fa-check"  aria-hidden="true"></span> <fmt:message
+					key='label.password.min.length'>
+					<fmt:param value='${minNumChars}' />
+				</fmt:message></li>
 
-								<c:if test="${mustHaveNumerics}">
-									<li><span class="fa fa-check"></span> <fmt:message
-											key='label.password.must.number' /></li>
-								</c:if>
+			<c:if test="${mustHaveUppercase}">
+				<li><span class="fa fa-check" aria-hidden="true"></span> <fmt:message
+						key='label.password.must.ucase' /></li>
+			</c:if>
+			<c:if test="${mustHaveLowercase}">
+						<li><span class="fa fa-check aria-hidden="true""></span> <fmt:message
+								key='label.password.must.lcase' /></li>
+					</c:if>
 
+			<c:if test="${mustHaveNumerics}">
+				<li><span class="fa fa-check" aria-hidden="true"></span> <fmt:message
+						key='label.password.must.number' /></li>
+			</c:if>
 
-								<c:if test="${mustHaveSymbols}">
-									<li><span class="fa fa-check"></span> <fmt:message
-											key='label.password.must.symbol' /></li>
-								</c:if>
-							</ul>
-						</lams:Alert>
-						
-						<lams:errors path="password"/>
-						
-						<div>
-							<label for="login"><fmt:message key="admin.user.login" />:</label>
-							<span>${param.login}</span>
-						</div>
-						<div class="form-group">
-							<label for="password"><fmt:message
-									key="admin.user.password" />:</label> <input type="password"
-								name="password" maxlength="25" id="password"
-								class="form-control" />
-						</div>
-						<div class="form-group">
-							<label for="password2"><fmt:message
-									key="admin.user.password.confirm" />:</label> <input type="password"
-								name="password2" maxlength="25" id="password2"
-								class="form-control" />
-						</div>
-						<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"
-								value="<fmt:message key="admin.save" />" />
-						</div>
-					</div>
+
+			<c:if test="${mustHaveSymbols}">
+				<li><span class="fa fa-check" aria-hidden="true"></span> <fmt:message
+						key='label.password.must.symbol' /></li>
+			</c:if>
+		</ul>
+	</lams:Alert>
+
+	<div class="row">
+		<div class="col-12 col-md-8 offset-md-2 col-lg-6 offset-lg-3">
+
+			<form id="userForm" modelAttribute="userForm" action="usersave/changePass.do" method="post">
+				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
+				<input type="hidden" name="userId" value="${param.userId}" />
+							
+				<lams:errors path="password"/>
+							
+				<div >
+					<h2><fmt:message key="admin.user.login" />:
+					<span id="login"><c:out value="${param.login}" escapeXml="true"/></span></h2>
 				</div>
-			</div>
+				<div class="form-group">
+					<label for="password"><fmt:message
+							key="admin.user.password" />:</label> 
+					<input type="password" name="password" maxlength="25" id="password" minlength="${minNumChars}"
+						class="form-control  form-control-sm" required >
+				</div>
+				<div class="form-group">
+					<label for="password2"><fmt:message
+							key="admin.user.password.confirm" />:</label> 
+					<input type="password" name="password2" maxlength="25"  minlength="${minNumChars}" id="password2" class="form-control form-control-sm" required>
+				</div>
+				<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" value="<fmt:message key="admin.save" />" />
+				</div>
+			</form>		
 		</div>
-	</form>
+	</div>
+	
+</lams:Page>	
 </body>
+</lams:html>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r173b2cd2375bd1d02d41f55461d7948a41b680c1 -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 173b2cd2375bd1d02d41f55461d7948a41b680c1)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
@@ -70,19 +70,8 @@
 
 
 	<lams:Page type="admin" title="${title}" breadcrumbItems="${breadcrumbItems}" >
-				
-			<p>
-				<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-				<c:if test="${orgType == 2}">
-					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}" /></a>
-				</c:if>
-				<c:if test="${orgType == 3}">
-					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
-					: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}"/></a>
-				</c:if>
-			</p>
-			
-			<div class="panel panel-default voffset5" >
+							
+			<div class="panel panel-default mt-2" >
 				<div id="courseHeading" class="panel-heading">
 					<span class="panel-title">
 						<c:if test="${orgType == 1}">
@@ -158,32 +147,39 @@
 				<c:forEach var="userManageBean" items="${userManageForm.userManageBeans}">
 					<tr>
 						<td>
-							<c:out value="${userManageBean.login}" />
+							<c:out value="${userManageBean.login}" escapeXml="true"/>
 						</td>
 						<td>
-							<c:out value="${userManageBean.firstName}" />
+							<c:out value="${userManageBean.firstName}" escapeXml="true"/>
 						</td>
 						<td>
-							<c:out value="${userManageBean.lastName}" />
+							<c:out value="${userManageBean.lastName}" escapeXml="true"/>
 						</td>
 						<td>
 						    <small>
 						    <c:forEach var="role" items="${userManageBean.roles}">
-						        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message>&nbsp;
+						        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message> &nbsp;
 						    </c:forEach>
 						    </small>
 						</td>
 						<td>
 							<c:if test="${userManageForm.canEditRole}">
-                            	<a title="<fmt:message key="admin.user.assign.roles"/>" href="<lams:LAMSURL/>admin/userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-users"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.assign.roles"/></span></button></a>
+                            	
+                            	<a aria-label="<fmt:message key="admin.user.assign.roles"/>" title="<fmt:message key="admin.user.assign.roles"/>" href="<lams:LAMSURL/>admin/userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>" type="button" class="btn btn-outline-secondary btn-sm">
+                            		<i class="fa fa-users" aria-hidden="true"></i>
+                            	</a>
 								&nbsp;
 							</c:if>
 							<c:if test="${userManageForm.courseAdminCanAddNewUsers}">
-                            	<a title="<fmt:message key="admin.edit" />" href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-pencil"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit" /></span></button></a>
+                            	<a aria-label ="<fmt:message key="admin.edit" />" title="<fmt:message key="admin.edit" />" href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"  type="button" class="btn btn-outline-secondary btn-sm">
+                            		<i class="fa fa-pencil" aria-hidden="true"></i>
+                            	</a>
 								&nbsp;
 							</c:if>
 							<c:if test="${canDeleteUser}">
-                            	<a title="<fmt:message key="admin.user.delete"/>" href="<lams:LAMSURL/>admin/user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-danger btn-xs"><i class="fa fa-trash"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.delete"/></span></button></a>
+                            	<a aria-label="<fmt:message key="admin.user.delete"/>" title="<fmt:message key="admin.user.delete"/>" href="<lams:LAMSURL/>admin/user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>" type="button" class="btn btn-outline-danger btn-sm">
+                            		<i class="fa fa-trash" aria-hidden="true"></i>
+                            	</a>
 							</c:if>
 							<br/>
 						</td>		
@@ -193,13 +189,13 @@
 				<tfoot>
 					<tr>
 				    	<th colspan="5" class="ts-pager form-horizontal">
-				    	<form onsubmit="return false;">	    	
-					        <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>
+				    	<form onsubmit="return false;">
+				   	        <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">
 					      		<option selected="selected" value="10">10</option>
 					      		<option value="20">20</option>
 					      		<option value="30">30</option>