Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -re4446044c4d5910e2248ff51b4db078cec1e6fc2
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision e4446044c4d5910e2248ff51b4db078cec1e6fc2)
@@ -445,7 +445,7 @@
 								</tr>
 							</tbody>
 						</table>
-						<div class="pull-right voffset20">
+						<div class="pull-right mt-3">
 							<input type="submit" class="btn btn-primary" value="<fmt:message key='admin.org.password.change.submit' />" />
 						</div>
 					</form:form>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec -re4446044c4d5910e2248ff51b4db078cec1e6fc2
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision e4446044c4d5910e2248ff51b4db078cec1e6fc2)
@@ -179,12 +179,7 @@
 	<c:set var="breadcrumbItems">${breadcrumbItems}, . | <fmt:message key="admin.user.edit"/></c:set>	
 	
 	<lams:Page type="admin" title="${title}" formID="userForm" breadcrumbItems="${breadcrumbItems}">	
-	
-	<form:form id="userForm" action="../usersave/saveUserDetails.do" modelAttribute="userForm" method="post">
-				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
-				<form:hidden path="orgId" />
-				<form:hidden path="userId" />						
-						
+							
 				<c:if test="${empty userForm.userId}">
 					<lams:Alert type="info" id="passwordConditions" close="false">
 					<fmt:message key='label.password.must.contain' />:
@@ -223,7 +218,7 @@
 						<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;">
+				    			<div id="portraitButton" class="text-center mt-2" 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">
@@ -238,6 +233,11 @@
 				    <div class="row justify-content-center">
 					<div class="col-10 col-md-6">
 					</c:if>
+
+					<form:form id="userForm" action="../usersave/saveUserDetails.do" modelAttribute="userForm" method="post">
+								<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
+								<form:hidden path="orgId" />
+								<form:hidden path="userId" />						
 					
 						<div class="form-group">
 							<label for="login">
@@ -498,16 +498,20 @@
 						</div>
 					</div>
 					</div>
-								
-			
+				</form:form>
+				
+					</div>
+					</div>
 				<c:if test="${not empty globalRoles || not empty userOrgRoles}">
 			
-					<h2 class="voffset20"><fmt:message key="admin.user.roles" /></h2>
+				<div class="row">
+					<div class="col-md-6 offset-md-3">
+					<h2 class="mt-3"><fmt:message key="admin.user.roles" /></h2>
 
 
 						<c:if test="${not empty globalRoles}">
 							<div class="ml-2">
-								<h4><fmt:message key="label.global.roles" /></h4>
+								<h3><fmt:message key="label.global.roles" /></h3>
 									<ul style="text-indent: 2em;">
 										<c:forEach var="role" items="${globalRoles.roles}">
 											<li><fmt:message>role.<lams:role role="${role}" />
@@ -559,9 +563,11 @@
 								</table>
 							</div>
 						</c:if>
+					</div>
+					</div>	
 				</c:if>
 			
-			</form:form>
+
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r173b2cd2375bd1d02d41f55461d7948a41b680c1 -re4446044c4d5910e2248ff51b4db078cec1e6fc2
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 173b2cd2375bd1d02d41f55461d7948a41b680c1)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision e4446044c4d5910e2248ff51b4db078cec1e6fc2)
@@ -178,7 +178,7 @@
 		</lams:TSTable>			
 		<hr>
 		<div class="pull-right">
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+			<a href="javascript:history.go(-1)" class="btn btn-outline-secondary btn-sm">
 				<fmt:message key="admin.cancel"/>
 			</a>
 		</div>