Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4a1ad7b61b0141448170272d2f64723056a05807 -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a1ad7b61b0141448170272d2f64723056a05807)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -136,7 +136,7 @@
 admin.search  =Search
 admin.enable  =Enable
 admin.disable  =Disable
-sysadmin.maintain  =Maintain LAMS
+sysadmin.maintain  =LAMS Administration
 sysadmin.maintain.loginpage  =Maintain login page
 sysadmin.maintain.external.servers  =Maintain integrated servers
 sysadmin.maintain.server.edit  =Edit integrated server
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -38,51 +38,48 @@
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				
 			<c:forEach items="${config}" var="group">
-				<div class="col-xl">
-					<h2 class="voffset20"><fmt:message key="${group.key}"/></h2>
+				<h2 class="voffset20"><fmt:message key="${group.key}"/></h2>
 
-									
-					<table class="table table-striped table-bordered" >
-						<c:forEach items="${group.value}" var="row">
-							<tr>
-								<td>
-									<label for="${row.key}"><fmt:message key="${row.descriptionKey}"/></label>
-									<c:if test="${row.required}">&nbsp;&nbsp;<span class="text-danger">*</span></c:if>
-								</td>
-								<td>
-									<input type="hidden" name="key" value="${row.key}"/>
-									<c:set var="BOOLEAN"><c:out value="<%= ConfigurationItem.BOOLEAN_FORMAT %>" /></c:set>
-									<c:choose>
-									<c:when test="${row.key == 'SMTPAuthSecurity'}">
-										<select name="value" class="form-control form-control-sm" id="${row.key}">
-											<c:forEach items="${smtpAuthTypes}" var="authType">
-												<option value="${authType.key}" ${authType.key == row.value ? 'selected="selected"' : '' }>
-													${authType.value}
-												</option>
-											</c:forEach>
-										</select>
-									</c:when>
-									<c:when test="${row.format==BOOLEAN}">
-										<select id="${row.key}" name="value" class="form-control form-control-sm">
-											<option value="true" ${row.value ? 'selected="selected"' : '' }>true</option>
-											<option value="false" ${row.value ? '' : 'selected="selected"' }>false&nbsp;&nbsp;</option>
-										</select>
-									</c:when>
-									<c:when test="${row.format==BOOLEAN}">
-										<select id="${row.key}" name="value" class="form-control form-control-sm">
-											<option value="true" ${row.value ? 'selected="selected"' : '' }>true</option>
-											<option value="false" ${row.value ? '' : 'selected="selected"' }>false&nbsp;&nbsp;</option>
-										</select>
-									</c:when>
-									<c:otherwise>
-										<input id="${row.key}" type="text" id="${row.key}" name="value" value="${row.value}" size="50" maxlength="255" class="form-control" <c:if test="${row.required}">required</c:if>/>
-									</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-						</c:forEach>
-					</table>
-				</div>
+				<table class="table table-striped table-bordered" >
+					<c:forEach items="${group.value}" var="row">
+						<tr>
+							<td>
+								<label for="${row.key}"><fmt:message key="${row.descriptionKey}"/></label>
+								<c:if test="${row.required}">&nbsp;&nbsp;<span class="text-danger">*</span></c:if>
+							</td>
+							<td>
+								<input type="hidden" name="key" value="${row.key}"/>
+								<c:set var="BOOLEAN"><c:out value="<%= ConfigurationItem.BOOLEAN_FORMAT %>" /></c:set>
+								<c:choose>
+								<c:when test="${row.key == 'SMTPAuthSecurity'}">
+									<select name="value" class="form-control form-control-sm" id="${row.key}">
+										<c:forEach items="${smtpAuthTypes}" var="authType">
+											<option value="${authType.key}" ${authType.key == row.value ? 'selected="selected"' : '' }>
+												${authType.value}
+											</option>
+										</c:forEach>
+									</select>
+								</c:when>
+								<c:when test="${row.format==BOOLEAN}">
+									<select id="${row.key}" name="value" class="form-control form-control-sm">
+										<option value="true" ${row.value ? 'selected="selected"' : '' }>true</option>
+										<option value="false" ${row.value ? '' : 'selected="selected"' }>false&nbsp;&nbsp;</option>
+									</select>
+								</c:when>
+								<c:when test="${row.format==BOOLEAN}">
+									<select id="${row.key}" name="value" class="form-control form-control-sm">
+										<option value="true" ${row.value ? 'selected="selected"' : '' }>true</option>
+										<option value="false" ${row.value ? '' : 'selected="selected"' }>false&nbsp;&nbsp;</option>
+									</select>
+								</c:when>
+								<c:otherwise>
+									<input id="${row.key}" type="text" id="${row.key}" name="value" value="${row.value}" size="50" maxlength="255" class="form-control" <c:if test="${row.required}">required</c:if>/>
+								</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</c:forEach>
+				</table>
 			</c:forEach>
 				
 			<div class="pull-right">
Index: lams_admin/web/integration/extLessonForm.jsp
===================================================================
diff -u -rccc788f07597ad3fde52adb6ff13e964b552c35d -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/integration/extLessonForm.jsp	(.../extLessonForm.jsp)	(revision ccc788f07597ad3fde52adb6ff13e964b552c35d)
+++ lams_admin/web/integration/extLessonForm.jsp	(.../extLessonForm.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -1,38 +1,54 @@
 <%@ include file="/taglibs.jsp"%>
 
-		<h3><fmt:message key="sysadmin.lesson.default" /></h3>
-		<div class="checkbox">
-		    <label>
-		    <form:checkbox path="gradebookOnComplete" /><fmt:message key="sysadmin.lesson.gradebook.complete" />
-		    </label>
-		</div>
-		<div class="checkbox">
-		    <label>
-		     <form:checkbox path="forceLearnerRestart" /><fmt:message key="sysadmin.lesson.force.restart" />
-		    </label>
-		</div>
-		<div class="checkbox">
-		    <label>
-		     <form:checkbox path="allowLearnerRestart" /><fmt:message key="sysadmin.lesson.allow.restart" />
-		    </label>
-		</div>
-		<div class="checkbox">
-		    <label>
-		     <form:checkbox path="liveEditEnabled" /><fmt:message key="sysadmin.lesson.liveedit" />
-		    </label>
-		</div>
-		<div class="checkbox">
-		    <label>
-		    <form:checkbox path="enableLessonNotifications" /><fmt:message key="sysadmin.lesson.notification" />
-		    </label>
-		</div>
-		<div class="checkbox">
-		    <label>
-		     <form:checkbox path="learnerPresenceAvailable" styleId="learnerPresenceAvailable" /><fmt:message key="sysadmin.lesson.presence" />
-		    </label>
-		</div>
-		<div class="checkbox">
-		    <label>
-		     <form:checkbox path="learnerImAvailable" styleId="learnerImAvailable" /><fmt:message key="sysadmin.lesson.im" />
-		    </label>
-		</div>
\ No newline at end of file
+		<h2><fmt:message key="sysadmin.lesson.default" /></h2>
+			<div class="form-group">
+				<div class="form-check">
+					<form:checkbox id="gradebookOnComplete" path="gradebookOnComplete" cssClass="form-check-input"/>
+					<label class="form-check-label" for="gradebookOnComplete">
+						<fmt:message key="sysadmin.lesson.gradebook.complete" />
+					</label>
+				</div>	
+					
+				<div class="form-check">
+					<form:checkbox path="forceLearnerRestart" id="forceLearnerRestart" cssClass="form-check-input"/>
+					<label class="form-check-label" for="forceLearnerRestart">
+						<fmt:message key="sysadmin.lesson.force.restart" />
+					</label>
+				</div>	
+
+				<div class="form-check">
+					<form:checkbox id="allowLearnerRestart" path="allowLearnerRestart" cssClass="form-check-input"/>
+					<label class="form-check-label" for="allowLearnerRestart">
+						<fmt:message key="sysadmin.lesson.allow.restart" />
+					</label>
+				</div>	
+		    
+				<div class="form-check">
+					<form:checkbox id="liveEditEnabled" path="liveEditEnabled" cssClass="form-check-input"/>
+					<label class="form-check-label" for="liveEditEnabled">
+						<fmt:message key="sysadmin.lesson.liveedit" />
+					</label>
+				</div>	
+
+				<div class="form-check">
+					<form:checkbox id="enableLessonNotifications" path="enableLessonNotifications" cssClass="form-check-input"/>
+					<label class="form-check-label" for="enableLessonNotifications">
+						<fmt:message key="sysadmin.lesson.notification" />
+					</label>
+				</div>	
+
+				<div class="form-check">
+					<form:checkbox id="learnerPresenceAvailable" path="learnerPresenceAvailable" cssClass="form-check-input" styleId="learnerPresenceAvailable" />
+					<label class="form-check-label" for="learnerPresenceAvailable">
+						<fmt:message key="sysadmin.lesson.presence" />
+					</label>
+				</div>	
+
+				<div class="form-check">
+					<form:checkbox id="learnerImAvailable" path="learnerImAvailable" cssClass="form-check-input" styleId="learnerImAvailable" />
+					<label class="form-check-label" for="learnerImAvailable">
+						<fmt:message key="sysadmin.lesson.im" />
+					</label>
+				</div>	
+			</div>
+
Index: lams_admin/web/integration/ltiConsumer.jsp
===================================================================
diff -u -rcdfd865f5b09b49251732b2de7456ba7c09192bb -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision cdfd865f5b09b49251732b2de7456ba7c09192bb)
+++ lams_admin/web/integration/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -22,6 +22,7 @@
 		$(document).ready(function(){
 			// validate signup form on keyup and submit
 			var validator = $("#ltiConsumerForm").validate({
+				errorClass: 'text-danger form-text font-italic',
  				rules: {
 					serverid: "required", 
 					serverkey: "required",
@@ -41,88 +42,81 @@
     
 <body class="stripes">
 	<lams:Page type="admin" title="${title}" formID="ltiConsumerForm">
-		<p>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
-				<fmt:message key="sysadmin.maintain" />
-			</a>
-					
-			<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do" class="btn btn-default">
-				<fmt:message key="label.manage.tool.consumers" />
-			</a>
-		</p>
+	
+		<nav aria-label="breadcrumb" role="navigation">
+		  <ol class="breadcrumb">
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+		    </li>
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do"><fmt:message key="label.manage.tool.consumers" /></a>
+		    </li>
+		    <li class="breadcrumb-item active" aria-current="page"><fmt:message key="sysadmin.maintain.server.edit"/></li>
+		  </ol>
+		</nav>
 
+	
 		<lams:errors path="*"/>
 		<form:form action="save.do" id="ltiConsumerForm" modelAttribute="ltiConsumerForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<form:hidden path="sid" />
 						
-			<table class="table table-no-border">
-				<tr>
-					<td><fmt:message key="sysadmin.serverkey" />&nbsp;*</td>
-					<td>
-						<lams:errors path="serverid"/>
-						<form:input path="serverid" size="20" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="sysadmin.serversecret" />&nbsp;*</td>
-					<td>
-						<lams:errors path="serverkey"/>
-						<form:input path="serverkey" size="30" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="sysadmin.servername" />&nbsp;*</td>
-					<td>
-						<lams:errors path="servername"/>
-						<form:input path="servername" size="30" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td valign="top"><fmt:message key="sysadmin.serverdesc" />:</td>
-					<td>
-						<form:input path="serverdesc" cols="40" rows="3" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="sysadmin.prefix" />&nbsp;*</td>
-					<td>
-						<lams:errors path="prefix"/>
-						<form:input path="prefix" size="10" cssClass="form-control"/>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="sysadmin.disabled" />:</td>
-					<td>
-						<form:checkbox path="disabled" />
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="sysadmin.lessonFinishUrl" />:</td>
-					<td>
-						<form:hidden path="lessonFinishUrl"/>
-						<c:out value="${ltiConsumerForm.lessonFinishUrl}"/>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="sysadmin.lti.consumer.monitor.roles" />:</td>
-					<td>
-						<form:input path="ltiToolConsumerMonitorRoles" size="30"/>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="sysadmin.alternative.user.id.name" />:</td>
-					<td>
-						<form:checkbox path="useAlternativeUseridParameterName" />
-					</td>
-				</tr>
-			</table>
+		<div class="form-group">
+		    <label for="serverid"><fmt:message key="sysadmin.serverkey" /></label>&nbsp;<span class="text-danger">*</span>
+		    <input id="serverid" maxlength="20" name="serverid" value="${ltiConsumerForm.serverid}" class="form-control form-control-sm" required/>
+			<lams:errors path="serverid"/>
+			
+			<label for="serverkey"><fmt:message key="sysadmin.serversecret" /></label>&nbsp;<span class="text-danger">*</span>
+			<input id="serverkey" maxlength="20" name="serverkey" value="${ltiConsumerForm.serverkey}" class="form-control form-control-sm" required/>
+			<lams:errors path="serverkey"/>
+
+			<label for="servername"><fmt:message key="sysadmin.servername" /></label>&nbsp;<span class="text-danger">*</span>
+			<input id="servername" maxlength="20" name="servername" value="${ltiConsumerForm.servername}" class="form-control form-control-sm" required/>
+			<lams:errors path="servername"/>
+			
+			<label for="serverdesc"><fmt:message key="sysadmin.serverdesc" /></label>&nbsp;<span class="text-danger">*</span>
+			<input id="serverdesc" maxlength="20" name="serverdesc" value="${ltiConsumerForm.serverdesc}" class="form-control form-control-sm"/>
+			<lams:errors path="servername"/>
+
+			<label for="prefix"><fmt:message key="sysadmin.prefix" /></label>&nbsp;<span class="text-danger">*</span>
+			<input id="prefix" maxlength="10" name="prefix" value="${ltiConsumerForm.prefix}" class="form-control form-control-sm"/>
+			<lams:errors path="servername"/>
+		</div>
+		<div class="form-group">
+			<div class="form-check">
+				<form:checkbox id="disabled" path="disabled" name="disabled" cssClass="form-check-input"/>
+		    	<label class="form-check-label" for="disabled">
+		    		<fmt:message key="sysadmin.disabled" />
+		    	</label>
+		    </div>
+		</div>
+		<div class="form-group">
+			<label for="lessonFinishUrl"><fmt:message key="sysadmin.lessonFinishUrl" /></label>:
+			<form:hidden id="lessonFinishUrl" path="lessonFinishUrl"/>
+			<c:out value="${ltiConsumerForm.lessonFinishUrl}"/>
+		</div>
+
+		<div class="form-group">
+			<label for="ltiToolConsumerMonitorRoles"><fmt:message key="sysadmin.lti.consumer.monitor.roles" /></label>:
+			<form:input id="ltiToolConsumerMonitorRoles" path="ltiToolConsumerMonitorRoles" size="30"/>
+		</div>
+
+		<div class="form-group">
+			<div class="form-check">
+				<form:checkbox id="useAlternativeUseridParameterName" name="useAlternativeUseridParameterName" path="useAlternativeUseridParameterName" cssClass="form-check-input"/>
+		    	<label class="form-check-label" for="disabled">
+		    		<fmt:message key="sysadmin.alternative.user.id.name" />
+		    	</label>
+			</div>
+		</div>	
 				
 			<%@ include file="extLessonForm.jsp"%>
+			
+			<hr>
 					
 			<div class="pull-right">
-				<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
-				<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+				<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do" class="btn btn-outline-secondary btn-sm"><fmt:message key="admin.cancel"/></a>
+				<input type="submit" name="submitbutton" class="btn btn-primary btn-sm loffset5" value="<fmt:message key="admin.save" />" />
 			</div>
 			
 		</form:form>
Index: lams_admin/web/integration/servermaintain.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/integration/servermaintain.jsp	(.../servermaintain.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_admin/web/integration/servermaintain.jsp	(.../servermaintain.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -28,6 +28,7 @@
 			
 			// validate signup form on keyup and submit
 			var validator = $("#extServerForm").validate({
+				errorClass: 'text-danger form-text font-italic',
 				rules: {
 					serverid: "required", 
 					serverkey: "required",
@@ -60,80 +61,82 @@
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="extServerForm">
 	
-	<p>
-		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
-			<fmt:message key="sysadmin.maintain" />
-		</a>
-		
-		<a href="<lams:LAMSURL/>admin/extserver/serverlist.do" class="btn btn-default">
-			<fmt:message key="sysadmin.maintain.external.servers" />
-		</a>
-	</p>
+		<nav aria-label="breadcrumb" role="navigation">
+		  <ol class="breadcrumb">
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+		    </li>
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/extserver/serverlist.do"><fmt:message key="sysadmin.maintain.external.servers" /></a>
+		    </li>
+		    <li class="breadcrumb-item active" aria-current="page"><fmt:message key="sysadmin.maintain.server.edit"/></li>
+		  </ol>
+		</nav>
 	
 	<lams:errors/>
     <form:form action="serversave.do" id="extServerForm" modelAttribute="extServerForm" method="post">
 		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 		<form:hidden path="sid" />
 		
 		<div class="form-group">
-		    <label for="serverid"><strong><fmt:message key="sysadmin.serverid" /> *</strong></label>
-		    <form:input path="serverid" size="20" cssClass="form-control"/>
+		    <label for="serverid"><fmt:message key="sysadmin.serverid" /></label>&nbsp;<span class="text-danger">*</span>
+		    <input id="serverid" name="serverid" value="${extServerForm.serverid}" class="form-control form-control-sm" maxlength="20" required/>
+		    <label for="serverkey"><fmt:message key="sysadmin.serverkey" /></label>&nbsp;<span class="text-danger">*</span>
+		    <input id="serverkey" name="serverkey" value="${extServerForm.serverkey} " class="form-control form-control-sm" maxlength="20" required/>
 		</div>
 		<div class="form-group">
-		    <label for="serverkey"><strong><fmt:message key="sysadmin.serverkey" /> *</strong></label>
-		    <form:input path="serverkey" size="30" cssClass="form-control"/>
+		    <label for="servername"><fmt:message key="sysadmin.servername" /></label>&nbsp;<span class="text-danger">*</span>
+		    <input id="servername" name="servername" value="${extServerForm.servername}"  class="form-control form-control-sm" maxlength="20" required/>
+		    <label for="serverdesc"><fmt:message key="sysadmin.serverdesc" /></label>
+		    <form:input path="serverdesc" cols="40" rows="3" cssClass="form-control form-control-sm"/>
 		</div>
 		<div class="form-group">
-		    <label for="servername"><strong><fmt:message key="sysadmin.servername" /> *</strong></label>
-		    <form:input path="servername" size="30" cssClass="form-control"/>
+		    <label for="prefix"><fmt:message key="sysadmin.prefix" /></label>&nbsp;<span class="text-danger">*</span>
+		    <input id="prefix" name="prefix" class="form-control form-control-sm" value="${extServerForm.prefix}" required maxlength="10"/>
 		</div>
 		<div class="form-group">
-		    <label for="serverdesc"><fmt:message key="sysadmin.serverdesc" /></label>
-		    <form:input path="serverdesc" cols="40" rows="3" cssClass="form-control"/>
+			<div class="form-check">
+				<form:checkbox id="disabled" path="disabled" name="disabled" cssClass="form-check-input"/>
+		    	<label class="form-check-label" for="disabled">
+		    		<fmt:message key="sysadmin.disabled" />
+		    	</label>
+		    </div>
+			<div class="form-check">
+			    <form:checkbox path="timeToLiveLoginRequestEnabled" id="ttl-login-request-enabled" cssClass="form-check-input"/>
+			    <label class="form-check-label" for="ttl-login-request-enabled">
+			    	<fmt:message key="sysadmin.login.request.ttl.enable" />
+			    </label>
+			</div>
 		</div>
-		<div class="form-group">
-		    <label for="prefix"><strong><fmt:message key="sysadmin.prefix" /> *</strong></label>
-		  	<form:input path="prefix" size="10" cssClass="form-control"/>
-		</div>
-		<div class="checkbox">
-		    <label>
-		    <form:checkbox path="disabled" /><fmt:message key="sysadmin.disabled" />
-		    </label>
-		</div>
-		<div class="checkbox">
-		    <label>
-		    <form:checkbox path="timeToLiveLoginRequestEnabled" id="ttl-login-request-enabled"/><fmt:message key="sysadmin.login.request.ttl.enable" />
-		    </label>
-		</div>
 		<div class="form-group" <c:if test="${!formBean.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if> >
 		    <label for="ttl-login-request"><fmt:message key="sysadmin.login.request.ttl" /></label>
-		    <form:input path="timeToLiveLoginRequest" size="10" id="ttl-login-request" cssClass="form-control"/>
+		    <form:input path="timeToLiveLoginRequest" size="10" id="ttl-login-request" maxlength="120" cssClass="form-control"/>
 		</div>
 		<div class="form-group">
 		    <label for="userinfoUrl"><fmt:message key="sysadmin.userinfoUrl" /></label>
-		    <form:input path="userinfoUrl" size="70" cssClass="form-control"/>
+		    <form:input path="userinfoUrl" size="70" cssClass="form-control form-control-sm"/>
 		</div> 
 		<div class="form-group">
 		    <label for="lessonFinishUrl"><fmt:message key="sysadmin.lessonFinishUrl" /></label>
-		    <form:input path="lessonFinishUrl" size="70" cssClass="form-control"/>
+		    <form:input path="lessonFinishUrl" size="70" cssClass="form-control form-control-sm"/>
 		</div>
 		<div class="form-group">
 		    <label for="extGroupsUrl"><fmt:message key="sysadmin.extGroupsUrl" /></label>
-		    <form:input path="extGroupsUrl" size="70" cssClass="form-control"/>
+		    <form:input path="extGroupsUrl" size="70" cssClass="form-control form-control-sm"/>
 		</div>
 		<div class="form-group">
 		    <label for="logoutUrl"><fmt:message key="sysadmin.logoutUrl" /></label>
-		    <form:input path="logoutUrl" size="70" cssClass="form-control"/>
+		    <form:input path="logoutUrl" size="70" cssClass="form-control form-control-sm"/>
 		</div>
 		
 		<%@ include file="extLessonForm.jsp"%>
-
+		<hr>
 		<div class="pull-right">
-			<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
-			<a href="<lams:LAMSURL/>admin/extserver/serverlist.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
-			<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+			<a href="<lams:LAMSURL/>admin/extserver/serverlist.do" class="btn btn-outline-secondary btn-sm"><fmt:message key="admin.cancel"/></a>
+			<input type="submit" name="submitbutton" class="btn btn-primary btn-sm loffset5" value="<fmt:message key="admin.save" />" />
 		</div>
 	</form:form>
+	
 </lams:Page>
 
 </body>
Index: lams_admin/web/loginmaintain.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -24,7 +24,6 @@
 		    <li class="breadcrumb-item active" aria-current="page"><fmt:message key="sysadmin.maintain.loginpage"/></li>
 		  </ol>
 		</nav>
-		<div class="col-xl">
 		<form:form action="./loginsave.do" modelAttribute="loginMaintainForm" id="loginMaintainForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<c:set var="language"><lams:user property="localeLanguage"/></c:set>
@@ -39,7 +38,6 @@
 				<input type="submit" id="saveButton" class="btn btn-primary btn-sm loffset5" value="<fmt:message key="admin.save" />" />
 			</div>
 		</form:form>
-		</div>
 		
 	</lams:Page>
 </body>
Index: lams_admin/web/policies/editPolicy.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_admin/web/policies/editPolicy.jsp	(.../editPolicy.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -17,6 +17,7 @@
 		$(document).ready(function(){
 			// validate signup form on keyup and submit
 			var validator = $("#policy-form").validate({
+				errorClass: 'text-danger form-text font-italic',
 				ignore: [],
 				rules: {
 					policyName: "required", 
@@ -59,100 +60,100 @@
 	</script>
 </lams:head>
 <body class="stripes">
-	<c:set var="title">${title}: <fmt:message key="admin.add.edit.policy"/></c:set>
+	<c:set var="title"><fmt:message key="admin.add.edit.policy"/></c:set>
 
 	<lams:Page type="admin" title="${title}" >
-		<div>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
-				<fmt:message key="sysadmin.maintain" />
-			</a>
-			<a href="../policyManagement/list.do" class="btn btn-default loffset5">
-				<fmt:message key="admin.policies.title" />
-			</a>
-		</div>
+
+		<nav aria-label="breadcrumb" role="navigation">
+		  <ol class="breadcrumb">
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+		    </li>
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/policyManagement/list.do"><fmt:message key="admin.policies.title" /></a>
+		    </li>
+		    <li class="breadcrumb-item active" aria-current="page"><fmt:message key="admin.add.edit.policy"/></li>
+		  </ol>
+		</nav>
+
+
     <form:form action="../policyManagement/save.do" modelAttribute="policyForm" id="policy-form" cssClass="voffset20" method="post">
 		<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 			<form:hidden path="policyUid" />
 			<form:hidden path="policyId" />
-			<table class="table table-condensed table-no-border">
-				<tr>
-					<td><fmt:message key="label.name" />&nbsp;&nbsp;*</td>
-					<td><form:input path="policyName" size="40" maxlength="255" cssClass="form-control" /></td>
-				</tr>
-				<tr>
-					<td style="width: 250px;"><fmt:message key="label.policy.type" />:</td>
-					<td>
-						<form:select path="policyTypeId" cssClass="form-control">
-							<form:option value="1"><fmt:message key="label.policy.type.site" /></form:option>
-							<form:option value="2"><fmt:message key="label.policy.type.privacy" /></form:option>
-							<form:option value="3"><fmt:message key="label.policy.type.third.party" /></form:option>
-							<form:option value="4"><fmt:message key="label.policy.type.other" /></form:option>
-						</form:select>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="label.version" /></td>
-					<td><form:input path="version" size="40" maxlength="255" cssClass="form-control"/></td>
-				</tr>
-				<tr>
-					<td><fmt:message key="label.summary" />&nbsp;&nbsp;*</td>
-					<td>
-					  <lams:CKEditor id="summary" 
-					     value="${policyForm.summary}" 
-					     contentFolderID="../public/policies">
-					  </lams:CKEditor>
-					  <span id="summary-error"></span>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="label.full.policy" />&nbsp;&nbsp;*</td>
-					<td>
-					  <lams:CKEditor id="fullPolicy" 
-					     value="${policyForm.fullPolicy}" 
-					     contentFolderID="../public/policies">
-					  </lams:CKEditor>
-					  <span id="full-policy-error"></span>
-					</td>
-				</tr>
-				<tr>
-					<td><fmt:message key="label.policy.status" /></td>
-					<td>
-		                <div class="radio">
-		                    <label>
-		                    	<form:radiobutton path="policyStateId" value="1" />
-		                        <fmt:message key="label.policy.status.active" />
-		                    </label>
-		                </div>
-		                <div class="radio">
-		                    <label>
-		                    	<form:radiobutton path="policyStateId" value="2" />
-		                        <fmt:message key="label.policy.status.inactive" />
-		                    </label>
-		                    <span id="helpBlock" class="help-block"><fmt:message key="label.policy.status.hint" /></span>
-		                </div>
-					</td>
-				</tr>
-				
-				<c:if test="${policyForm.policyUid != null}">
-					<tr>
-						<td><fmt:message key="label.minor.change" /></td>
-						<td>
-		                    <div class="radio">
-		                        <form:checkbox path="minorChange" />
-		                        <span id="helpBlock" class="help-block"><fmt:message key="label.policy.minor.change.hint" /></span>
-		                    </div>
-		                </td>
-					</tr>
-				</c:if>
-				
-			</table>
+
+
+		<div class="form-group">
+		    <label for="policyName"><fmt:message key="label.name" /></label>&nbsp;<span class="text-danger">*</span>
+		    <input id="policyName" maxlength="40" name="policyName" value="${policyForm.policyName}" class="form-control form-control-sm" required/>
+
+		    <label for="policyTypeId"><fmt:message key="label.policy.type" /></label>
+			<form:select path="policyTypeId" cssClass="form-control form-control-sm">
+				<form:option value="1"><fmt:message key="label.policy.type.site" /></form:option>
+				<form:option value="2"><fmt:message key="label.policy.type.privacy" /></form:option>
+				<form:option value="3"><fmt:message key="label.policy.type.third.party" /></form:option>
+				<form:option value="4"><fmt:message key="label.policy.type.other" /></form:option>
+			</form:select>
+
+		    <label for="version"><fmt:message key="label.version" /></label>&nbsp;<span class="text-danger">*</span>
+		    <input id="version" maxlength="40" name="version" value="${policyForm.version}" class="form-control form-control-sm" required/>
+
+		    <label for="summary"><fmt:message key="label.summary" /></label>&nbsp;<span class="text-danger">*</span>
+			<lams:CKEditor id="summary" 
+			   value="${policyForm.summary}" 
+			   contentFolderID="../public/policies">
+			</lams:CKEditor>
+			<span id="summary-error"></span>
+
+		    <label for="fullPolicy"><fmt:message key="label.full.policy" /></label>&nbsp;<span class="text-danger">*</span>
+			<lams:CKEditor id="fullPolicy" 
+			   value="${policyForm.fullPolicy}" 
+			   contentFolderID="../public/policies">
+			</lams:CKEditor>
+			<span id="full-policy-error"></span>
+		</div>
+		
+		<div class="form-group">
+			<h2><fmt:message key="label.policy.status" /></h2>
+	    	<small id="policyStatusHelpBlock" class="form-text text-muted">
+				<fmt:message key="label.policy.status.hint" />
+			</small>
 			
-			<div class="pull-right">
-				<a href="<lams:LAMSURL/>admin/policyManagement/list.do" class="btn btn-default">
-					<fmt:message key="admin.cancel" />
-				</a>
-				<button type="submit" id="submitButton" class="btn btn-primary loffset5"><fmt:message key="admin.submit" /></button>
+			<div class="form-check">
+				<form:radiobutton path="policyStateId" value="1" id="policyStateId" name="policyStateId" cssClass="form-check-input"/>
+		    	<label class="form-check-label" for="policyStateId">
+		    		<fmt:message key="label.policy.status.active" />
+		    	</label>
 			</div>
+			
+			<div class="form-check">
+				<form:radiobutton path="policyStateId" value="2" id="policyStateId2" name="policyStateId" cssClass="form-check-input"/>
+		    	<label class="form-check-label" for="policyStateId2">
+		    		<fmt:message key="label.policy.status.inactive" />
+		    	</label>
+			</div>
+					
+		</div>
+		<c:if test="${policyForm.policyUid != null}">
+			<div class="form-group">
+				<div class="form-check">
+					<form:checkbox id="minorChange" path="minorChange" name="minorChange" cssClass="form-check-input"/>
+			    	<label class="form-check-label" for="disabled">
+			    		<fmt:message key="label.minor.change" />
+			    	</label>
+					<small id="policyMinorChangeHelpBlock" class="form-text text-muted">
+			    		<fmt:message key="label.policy.minor.change.hint" />
+			    	</small>
+			    </div>
+			</div>
+		</c:if>	
+			
+		<div class="pull-right">
+			<a href="<lams:LAMSURL/>admin/policyManagement/list.do" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel" />
+			</a>
+			<button type="submit" id="submitButton" class="btn btn-primary btn-sm loffset5"><fmt:message key="admin.submit" /></button>
+		</div>
 		
 		</form:form>
 	</lams:Page>
Index: lams_admin/web/policies/policies.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -82,31 +82,39 @@
 		    <li class="breadcrumb-item">
 		    	<a href="<lams:LAMSURL/>admin/sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
 		    </li>
-		    <li class="breadcrumb-item active" aria-current="page"><fmt:message key="admin.policies.title"/></li>
+		    <c:choose>
+		    <c:when test="${viewPreviousVersions}">
+			    <li class="breadcrumb-item">
+			    	<a href="<lams:WebAppURL />policyManagement/list.do"><fmt:message key="admin.policies.title" /></a>
+			    </li>
+			    <li class="breadcrumb-item active" aria-current="page"><fmt:message key="label.view.previous.versions"/></li>
+			</c:when>
+			<c:otherwise>
+				<li class="breadcrumb-item active" aria-current="page"><fmt:message key="admin.policies.title"/></li>
+			</c:otherwise>
+			</c:choose>
+
+
 		  </ol>
 		</nav>
 
-			<c:if test="${viewPreviousVersions}">
-				<a class="btn btn-default" href="<lams:WebAppURL />policyManagement/list.do">
-					<fmt:message key="admin.policies.title"/>
-				</a>
-			</c:if>
 		
 		<div id="policy-table">
 			<%@ include file="policyTable.jsp"%>
 		</div>
 		
-		<c:if test="${!viewPreviousVersions}">
 			<div class="pull-right">
-				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+				<a href="<lams:WebAppURL />policyManagement/list.do" class="btn btn-outline-secondary btn-sm">
 					<fmt:message key="admin.cancel"/>
 				</a>
+				<c:if test="${!viewPreviousVersions}">
 				
 				<a class="btn btn-primary btn-sm" href="<lams:WebAppURL />policyManagement/edit.do">
 					<fmt:message key="label.add.new.policy"/>
 				</a>
+				</c:if>
+				
 			</div>
-		</c:if>
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -3,7 +3,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title"><fmt:message key="admin.signup.title"/></c:set>
+	<c:set var="title"><fmt:message key="admin.add.edit.signup.page"/></c:set>
 	<title>${title}</title>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 
@@ -13,94 +13,88 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title">${title}: <fmt:message key="admin.add.edit.signup.page"/></c:set>
+	<c:set var="title"><fmt:message key="admin.add.edit.signup.page"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="signupForm">
 	
-		<div>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
-			<a href="<lams:LAMSURL/>admin/signupManagement/start.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
-		</div>
+		<nav aria-label="breadcrumb" role="navigation">
+		  <ol class="breadcrumb">
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/sysadminstart.do"><fmt:message key="sysadmin.maintain" /></a>
+		    </li>
+		    <li class="breadcrumb-item">
+		    	<a href="<lams:LAMSURL/>admin/signupManagement/start.do"><fmt:message key="admin.signup.title"/></a>
+		    </li>
+		    <li class="breadcrumb-item active" aria-current="page"><fmt:message key="admin.add.edit.signup.page"/></li>
+		  </ol>
+		</nav>			
+	
 		<form:form action="add.do" modelAttribute="signupForm" id="signupForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
-				<form:hidden path="signupOrganisationId" />
+			<form:hidden path="signupOrganisationId" />
 				
-				<table class="table table-condensed table-no-border">
-					<tr>
-						<td style="width: 250px;"><fmt:message key="admin.group" />:</td>
-						<td>
-							<form:select path="organisationId" cssClass="form-control">
-								<c:forEach items="${organisations}" var="organisation">
-									<form:option value="${organisation.organisationId}"><c:out value="${organisation.name}" /></form:option>
-								</c:forEach>
-							</form:select>
-						</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.lessons" />:</td>
-						<td><form:checkbox path="addToLessons" /></td>
-						<td></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.staff" />:</td>
-						<td><form:checkbox path="addAsStaff" /></td>
-						<td></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.email.verify" />:</td>
-						<td colspan="2">
-							<form:checkbox path="emailVerify" />&nbsp;&nbsp;
-							<span class="signupFieldDescription">
-								<fmt:message key="admin.email.verify.desc" />
-							</span>
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2">
-						<lams:errors path="courseKey"/>
-						</td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.course.key" />:</td>
-						<td><form:input path="courseKey" size="40" maxlength="255" cssClass="form-control"/></td>
-					<tr>
-						<td><fmt:message key="admin.confirm.course.key" />:</td>
-						<td><form:input path="confirmCourseKey" size="40" maxlength="255" cssClass="form-control"/></td>
-						<td></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.description.txt" />:</td>
-						<td>
-						  <lams:CKEditor id="blurb" 
-						     value="${signupForm.blurb}" 
-						     contentFolderID="../public/signups">
-						  </lams:CKEditor>
-						</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.disable.option" />:</td>
-						<td><form:checkbox path="disabled" /></td>
-						<td></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.login.tab" />:</td>
-						<td><form:checkbox path="loginTabActive" /></td>
-						<td></td>
-					</tr>		
-					<tr>
-						<td colspan="2">
-						<lams:errors path="context"/>
-						</td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.context.path" />:</td>
-						<td style="vertical-align: middle;"><lams:LAMSURL/>signup/<form:input path="context" /></td>
-					</tr>
-				</table>
+			<div class="form-group">
+				<label for="selector"><fmt:message key="admin.group" /></label>:
+				<form:select id="selector" path="organisationId" cssClass="form-control">
+					<c:forEach items="${organisations}" var="organisation">
+						<form:option value="${organisation.organisationId}"><c:out value="${organisation.name}" escapeXml="true" /></form:option>
+					</c:forEach>
+				</form:select>
+			</div>
+			<div class="form-group">
+				<div class="form-check">
+					<form:checkbox path="addToLessons" id="addToLessons" cssClass="form-check-input"/>
+					<label class="form-check-label" for="addToLessons"><fmt:message key="admin.lessons" /></label>
+				</div>	
+				<div class="form-check">
+					<form:checkbox id="addAsStaff" path="addAsStaff" cssClass="form-check-input"/>
+					<label class="form-check-label" for="addToLessons"><fmt:message key="admin.staff" /></label>
+				</div>
+				<div class="form-check">
+					<form:checkbox id="emailVerify" path="emailVerify" cssClass="form-check-input" />
+					<label class="form-check-label" for="emailVerify"><fmt:message key="admin.email.verify" /></label>
+					<small id="passwordHelpBlock" class="form-text text-muted">
+						<fmt:message key="admin.email.verify.desc" />
+					</small>
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="courseKey"><fmt:message key="admin.course.key" /></label>
+				<input value="${signupForm.courseKey}" required id="courseKey" name="courseKey" maxlength="20" class="form-control form-control-sm"/>
+				<small id="passwordHelpBlock" class="form-text text-muted">
+					<lams:errors path="courseKey"/>
+				</small>	
+			</div>
+			<div class="form-group">
+				<label for="confirmCourseKey"><fmt:message key="admin.confirm.course.key" /></label>
+				<input value="${signupForm.courseKey}" id="confirmCourseKey"  name="confirmCourseKey" required  maxlength="20" class="form-control form-control-sm"/>
+			</div>
+			<div class="form-group">
+				<label for="blurb"><fmt:message key="admin.description.txt" /></label>
+				  <lams:CKEditor id="blurb" 
+				     value="${signupForm.blurb}" 
+				     contentFolderID="../public/signups">
+				  </lams:CKEditor>
+			</div>
+			<div class="form-group">
+				<div class="form-check">
+					<form:checkbox id="disabled" path="disabled" cssClass="form-check-input"/>
+					<label class="form-check-label" for="disabled"><fmt:message key="admin.disable.option" /></label>
+				</div>
+				<div class="form-check">
+					<form:checkbox id="loginTabActive" path="loginTabActive" cssClass="form-check-input"/>
+					<label class="form-check-label" for="loginTabActive"><fmt:message key="admin.login.tab" /></label>
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="context"><fmt:message key="admin.context.path" /></label>:</br>
+				<lams:LAMSURL/>signup/<input id="context" value="${signupForm.context}" name="context" required class="form-control form-control-sm form-control-inline"/>
+				<small id="passwordHelpBlock" class="form-text text-danger">
+					<lams:errors path="context"/>
+				</small>				
+			</div>
 				
 				<div class="pull-right">
-					<a href="<lams:LAMSURL/>admin/signupManagement/start.do" class="btn btn-default loffset5"><fmt:message key="admin.cancel" /></a>
+					<a href="<lams:LAMSURL/>admin/signupManagement/start.do" 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>
 			
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -36,7 +36,6 @@
 		  </ol>
 		</nav>
 
-		<div class="col-xl">
 		<c:if test="${not empty error}">
 			<lams:Alert type="warn" id="errorMessage" close="false">	
 				<c:out value="${error}" />
@@ -51,7 +50,7 @@
 				<th><fmt:message key="admin.lessons" /></th>
 				<th><fmt:message key="admin.staff" /></th>
 				<th><fmt:message key="admin.added.on"/></th>
-				<th><fmt:message key="admin.actions"/></th>
+				<th class="text-center"><fmt:message key="admin.actions"/></th>
 			</tr>
 			</thead>
 			<tbody>
@@ -108,7 +107,6 @@
 			<a href="<lams:LAMSURL/>admin/signupManagement/add.do" class="btn btn-primary btn-sm loffset5"><fmt:message key="admin.add.new.signup.page"/></a>
 
 		</div>
-		</div>
 	</lams:Page>
 
 </body>
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -66,7 +66,6 @@
 			</fmt:message>
 		</p>
 
-		<div class="col-xl">			
 		<lams:errors/>
 			
         <form:form action="save.do" id="timezoneForm" modelAttribute="timezoneForm" method="post">
@@ -79,10 +78,10 @@
 						<!-- added this check box for the user to enable all available time zones -->
 						  <form:checkbox path="selected" value="currentSelectAllTZ" id="currentSelectAllTZ"/>
 						</th>
-						<th><fmt:message key="admin.timezone.time.zone.id" /></th>
+						<th class="text-center"><fmt:message key="admin.timezone.time.zone.id" /></th>
 						<th class="text-center"><fmt:message key="admin.timezone.raw.offset" /></th>
 						<th class="text-center"><fmt:message key="admin.timezone.dst.offset" /></th>
-						<th><fmt:message key="admin.timezone.display.name" /></th>
+						<th class="text-center"><fmt:message key="admin.timezone.display.name" /></th>
 					</tr>
 					</thead>
 					<tbody>
@@ -120,7 +119,6 @@
 				</p>
 				
 			</form:form>
-		</div>	
 		</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r1e14304ff8caba5d2c4da4245450bd6f470f1c0e
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -91,18 +91,18 @@
 								rows += '</td>';
 								
 								rows += '<td class="text-center">';
-								rows +=		'<form style="display: inline-block;" id="delete_' + orgData["userId"] +'" method="post" action="/lams/admin/user/remove.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-danger btn-sm" type="submit"><i class="fa fa-trash" title="<fmt:message key="admin.user.delete"/>"/></button></form>';
+								rows +=		'<form style="display: inline-block;" id="delete_' + orgData["userId"] +'" method="post" action="/lams/admin/user/remove.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-outline-danger btn-sm" type="submit"><i class="fa fa-trash" title="<fmt:message key="admin.user.delete"/>"/></button></form>';
 								rows += 	'&nbsp;';
-								rows +=     '<form style="display: inline-block;" id="edit_' + orgData["userId"] +'" method="post" action="/lams/admin/user/edit.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-primary btn-sm" type="submit"><i class="fa fa-pencil" title="<fmt:message key="admin.edit"/>"/></button></form>';
+								rows +=     '<form style="display: inline-block;" id="edit_' + orgData["userId"] +'" method="post" action="/lams/admin/user/edit.do"><input type="hidden" name="userId" value="' + orgData["userId"] + '"/><input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/><button class="btn btn-outline-primary btn-sm" type="submit"><i class="fa fa-pencil" title="<fmt:message key="admin.edit"/>"/></button></form>';
 								rows += 	'&nbsp;';
 								rows += 	'<a title="<fmt:message key="label.login.as"/>" href="<lams:LAMSURL/>loginas.do?login=' + orgData["login"] + '">';
-								rows += 		'<button type="button" class="btn btn-primary btn-sm" title="<fmt:message key="label.login.as"/>"><i class="fa fa-sign-in"/></button>';
+								rows += 		'<button type="button" class="btn btn-outline-primary btn-sm" title="<fmt:message key="label.login.as"/>"><i class="fa fa-sign-in"/></button>';
 								rows += 	'</a>';
 								rows += 	'&nbsp;';
 	
 								if (${(useInternalSMTPServer || not empty smtpServer)} && orgData["email"] != null && orgData["email"] != "") {
 								rows += 	'<a title="<fmt:message key="label.email"/>" href="<lams:LAMSURL/>emailUser/composeMail.do?returnUrl=/lams/admin/usersearch.do&userID=' + orgData["userId"] + '">';
-								rows += 		'<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-envelope"/> <span class="hidden-xs hidden-sm"><fmt:message key="label.email"/></span></button>';
+								rows += 		'<button type="button" class="btn btn-outline-primary btn-sm"><i class="fa fa-envelope"/> <span class="hidden-xs hidden-sm"><fmt:message key="label.email"/></span></button>';
 								rows += 	'</a>';
 								}
 								
Index: lams_central/web/css/jquery.tablesorter.theme.bootstrap4.css
===================================================================
diff -u
--- lams_central/web/css/jquery.tablesorter.theme.bootstrap4.css	(revision 0)
+++ lams_central/web/css/jquery.tablesorter.theme.bootstrap4.css	(revision 1e14304ff8caba5d2c4da4245450bd6f470f1c0e)
@@ -0,0 +1 @@
+.tablesorter-bootstrap{width:100%}.tablesorter-bootstrap tfoot td,.tablesorter-bootstrap tfoot th,.tablesorter-bootstrap thead td,.tablesorter-bootstrap thead th{font:14px/20px Arial,Sans-serif;font-weight:700;padding:4px;margin:0 0 18px}.tablesorter-bootstrap thead .tablesorter-header{background-position:right 5px center;background-repeat:no-repeat;cursor:pointer;white-space:normal}.tablesorter-bootstrap:not(.table-dark) tfoot td,.tablesorter-bootstrap:not(.table-dark) tfoot th,.tablesorter-bootstrap:not(.table-dark) thead:not(.thead-dark) .tablesorter-header{background-color:#eee}.tablesorter-bootstrap thead .sorter-false{cursor:default;background-image:none}.tablesorter-bootstrap .tablesorter-header-inner{position:relative;padding:4px 18px 4px 4px}.tablesorter-bootstrap .sorter-false .tablesorter-header-inner{padding:4px}.tablesorter-bootstrap thead .tablesorter-headerUnSorted:not(.sorter-false){background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE0IDIwIj48cGF0aCBkPSJNMTQgMTNsLTIuNS0yLjVMNyAxNWwtNC41LTQuNUwwIDEzbDcgN3pNMTQgNy41TDExLjUgMTAgNyA1LjUgMi41IDEwIDAgNy41bDctN3oiLz48L3N2Zz4=)}.tablesorter-bootstrap thead .tablesorter-headerAsc{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDE0IDE0Ij48cGF0aCBkPSJNMTQgOS41TDExLjUgMTIgNyA3LjUgMi41IDEyIDAgOS41bDctN3oiLz48L3N2Zz4=)}.tablesorter-bootstrap thead .tablesorter-headerDesc{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDE0IDE0Ij48cGF0aCBkPSJNMTQgNWwtMi41LTIuNS00LjUgNC41LTQuNS00LjVMMCA1IDcgMTJ6Ii8+PC9zdmc+)}.tablesorter-bootstrap thead.thead-dark .tablesorter-headerUnSorted:not(.sorter-false),.tablesorter-bootstrap.table-dark thead .tablesorter-headerUnSorted:not(.sorter-false){background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE0IDIwIj48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTQgMTNsLTIuNS0yLjVMNyAxNWwtNC41LTQuNUwwIDEzbDcgN3pNMTQgNy41TDExLjUgMTAgNyA1LjUgMi41IDEwIDAgNy41bDctN3oiLz48L3N2Zz4=)}.tablesorter-bootstrap thead.thead-dark .tablesorter-headerAsc,.tablesorter-bootstrap.table-dark thead .tablesorter-headerAsc{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDE0IDE0Ij48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTQgOS41TDExLjUgMTIgNyA3LjUgMi41IDEyIDAgOS41bDctN3oiLz48L3N2Zz4=)}.tablesorter-bootstrap thead.thead-dark .tablesorter-headerDesc,.tablesorter-bootstrap.table-dark thead .tablesorter-headerDesc{background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMiIgaGVpZ2h0PSIxMiIgdmlld0JveD0iMCAwIDE0IDE0Ij48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTQgNWwtMi41LTIuNS00LjUgNC41LTQuNS00LjVMMCA1IDcgMTJ6Ii8+PC9zdmc+)}.tablesorter-bootstrap:not(.table-dark)>tbody>tr.odd>td,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.tablesorter-hasChildRow.odd:hover~tr.tablesorter-hasChildRow.odd~.tablesorter-childRow.odd>td{background-color:#f9f9f9}.tablesorter-bootstrap:not(.table-dark)>tbody>tr.even:hover>td,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.hover>td,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.odd:hover>td,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.tablesorter-hasChildRow.even:hover~.tablesorter-childRow.even>td,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.tablesorter-hasChildRow.odd:hover~.tablesorter-childRow.odd>td{background-color:#f5f5f5}.tablesorter-bootstrap:not(.table-dark)>tbody>tr.even>td,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.tablesorter-hasChildRow.even:hover~tr.tablesorter-hasChildRow.even~.tablesorter-childRow.even>td{background-color:#fff}.tablesorter-bootstrap .tablesorter-processing{background-image:url(data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=);background-position:center center!important;background-repeat:no-repeat!important}.tablesorter-bootstrap:not(.table-dark)>tbody>tr.odd td.primary{background-color:#bfbfbf}.tablesorter-bootstrap:not(.table-dark)>tbody>tr td.primary,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.even td.primary{background-color:#d9d9d9}.tablesorter-bootstrap:not(.table-dark)>tbody>tr.odd td.secondary{background-color:#d9d9d9}.tablesorter-bootstrap:not(.table-dark)>tbody>tr td.secondary,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.even td.secondary{background-color:#e6e6e6}.tablesorter-bootstrap:not(.table-dark)>tbody>tr.odd td.tertiary{background-color:#e6e6e6}.tablesorter-bootstrap:not(.table-dark)>tbody>tr td.tertiary,.tablesorter-bootstrap:not(.table-dark)>tbody>tr.even td.tertiary{background-color:#f2f2f2}.tablesorter-bootstrap:not(.table-dark)>.caption{background-color:#fff}.tablesorter-bootstrap .tablesorter-filter-row input.tablesorter-filter,.tablesorter-bootstrap .tablesorter-filter-row select.tablesorter-filter{width:98%;margin:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:height .1s ease;-moz-transition:height .1s ease;-o-transition:height .1s ease;transition:height .1s ease}.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row{background-color:#efefef}.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row input.tablesorter-filter,.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row select.tablesorter-filter{color:#333}.tablesorter-bootstrap .tablesorter-filter-row .tablesorter-filter.disabled{cursor:not-allowed;box-shadow:0 1px 1px rgba(0,0,0,.075) inset;box-sizing:border-box;transition:height .1s ease}.tablesorter-bootstrap:not(.table-dark) .tablesorter-filter-row td{line-height:normal;text-align:center;padding:4px 6px;vertical-align:middle;-webkit-transition:line-height .1s ease;-moz-transition:line-height .1s ease;-o-transition:line-height .1s ease;transition:line-height .1s ease}.tablesorter-bootstrap .tablesorter-filter-row.hideme td{padding:2px;margin:0;line-height:0}.tablesorter-bootstrap .tablesorter-filter-row.hideme *{height:1px;min-height:0;border:0;padding:0;margin:0;opacity:0}.tablesorter .filtered{display:none}.tablesorter-bootstrap .tablesorter-pager .pagedisplay{border:0}.tablesorter:not(.table-dark) .tablesorter-errorRow td{text-align:center;cursor:pointer;background-color:#e6bf99}
\ No newline at end of file