Index: lams_admin/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/WEB-INF/tags/Alert.tag	(.../Alert.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/Alert.tag	(.../Alert.tag)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -3,6 +3,7 @@
 
 <%@ attribute name="close" required="false" rtexprvalue="true"%>
 <%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="type" required="false" rtexprvalue="true"%>
 
 <c:set var="idName" value="alert-${type}" />
@@ -27,20 +28,19 @@
 	</c:when>
 </c:choose>
 
-<div class="row no-gutter">
-	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
-		<div id="${idName}" class="alert alert-${alertType}" style="margin-bottom: 10px; padding: 8px">
-			<div class="media">
-				<div class="media-left">
-					<i class="fa fa-lg fa-${iconType} text-muted"></i>
-				</div>
-				<div class="media-body">
-					<c:if test="${close}">
-							<a href="#" class="close pull-right" data-dismiss="alert" aria-label="close">&times;</a>
-					</c:if>
-					<jsp:doBody />
-				</div>
+<div class="container">
+	<div class="row justify-content-md-center">
+		<div class="col-md-auto">
+			<div id="${idName}" class="alert alert-${alertType}" role="alert">
+				<c:if test="${not empty title}">
+					<span class="fa fa-${iconType}"></span> <span class="alert-title font-weight-bold">${title}</span>
+					<hr class="alert-separator">
+				</c:if>
+
+				<jsp:doBody />
 			</div>
 		</div>
-	</div>
-</div>
+	</div>	
+</div></div>
+
+
Index: lams_admin/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/FileUpload.tag	(.../FileUpload.tag)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -58,15 +58,17 @@
 
 <div class="input-group" id="addfile">
 	<span class="input-group-btn" style="font-size:inherit"> <%-- font-size:inherit needed for Share Resources authoring or the button is too small --%>
-		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-sm btn-default">
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-sm btn-outline-primary">
 			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
 		</button>
 	</span>
 	<input type="file" id="${fileFieldId}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
 	<input type="text" id="${fileInputNameFieldname}" style="display:none" disabled="disabled" placeholder="File not selected" class="form-control input-sm file-input-name">
 </div>
 <c:if test="${uploadInfoMessageKey ne '-'}">
-<p class="help-block"><fmt:message key="${uploadInfoMessageKey}"><fmt:param>${maxFileSize}</fmt:param></fmt:message></p>					
+	<small id="passwordHelpBlock" class="form-text text-muted">
+		<fmt:message key="${uploadInfoMessageKey}"><fmt:param>${maxFileSize}</fmt:param></fmt:message>
+	</small>
 </c:if>
 <div id="${errorMsgDiv}" class="text-danger" style="display:none"></div>			
 
Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r1d57e77980d70c39242b61da2705eebab2f421af -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1d57e77980d70c39242b61da2705eebab2f421af)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -408,34 +408,33 @@
 
 	<c:otherwise>
 	<!-- Standard Screens  --> 
-		<div class="row no-gutter no-margin">
-		<div class="col-xs-12">
-		<div class="container" id="content">
-
+		<div class="container-xl">
+		<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
 		<c:choose>
 		<c:when test="${usePanel}">
-		<div class="panel panel-default panel-${type}-page">
 			<c:if test="${not empty title}">
-				<div class="panel-heading">
-					<div class="panel-title panel-${type}-title">
-						<c:out value="${title}" escapeXml="true" />
-						<c:if test="${not empty titleHelpURL}">
-							<span class="pull-right">${titleHelpURL}</span>
-						</c:if>
-					</div>
-					<c:if test="${not empty headingContent}">
-						<c:out value="${headingContent}" escapeXml="true" />
-					</c:if>
-				</div>
+				<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 class="panel-body panel-${type}-body">
+			<div id="content">
+			<main role="main">
 				<jsp:doBody />
+			</main>
 			</div>
 		</div>
 		</c:when>
 
 		<c:otherwise>
+		
 		<jsp:doBody />
 		</c:otherwise>
 		</c:choose>						
Index: lams_admin/web/cleanupPreviewLessons.jsp
===================================================================
diff -u -r3abaa537dbbe6a541d3bac6cb5341e58b768104a -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 3abaa537dbbe6a541d3bac6cb5341e58b768104a)
+++ lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -74,8 +74,16 @@
 
 	<lams:Page type="admin" title="${title}">
 		
-		<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></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 active" aria-current="page"><fmt:message key="sysadmin.batch.preview.lesson.delete"/></li>
+		  </ol>
+		</nav>		
 
+
 		<fmt:message key="label.cleanup.preview.lesson.count" />&nbsp;<span id="previewCount">${previewCount}</span> / <span id="allLessonCount">${allLessonCount}</span>
 		<div id="deletingBox" style="display: none">
 		<fmt:message key="label.cleanup.preview.lesson.progress" />
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -18,9 +18,16 @@
 <body class="stripes">
 	<c:set var="help"><fmt:message key="LAMS+Configuration"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="configForm">
-		
-		<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="configForm" >
+	
+		<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 active" aria-current="page"><fmt:message key="sysadmin.config.settings.edit"/></li>
+		  </ol>
+		</nav>		
 
 		<c:if test="${not empty error}">
 			<lams:Alert type="danger" id="error-messages" close="false">
@@ -31,17 +38,16 @@
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				
 			<c:forEach items="${config}" var="group">
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title"><fmt:message key="${group.key}"/></div>
-					</div>
+				<div class="col-xl">
+					<h2 class="voffset20"><fmt:message key="${group.key}"/></h2>
+
 									
-					<table class="table table-striped table-condensed" >
+					<table class="table table-striped table-bordered" >
 						<c:forEach items="${group.value}" var="row">
 							<tr>
 								<td>
-									<fmt:message key="${row.descriptionKey}"/>
-									<c:if test="${row.required}">&nbsp;&nbsp;*</c:if>
+									<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}"/>
@@ -57,19 +63,19 @@
 										</select>
 									</c:when>
 									<c:when test="${row.format==BOOLEAN}">
-										<select name="value" class="form-control form-control-sm">
+										<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 name="value" class="form-control form-control-sm">
+										<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 type="text" id="${row.key}" name="value" value="${row.value}" size="50" maxlength="255" class="form-control"/>
+										<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>
@@ -80,10 +86,10 @@
 			</c:forEach>
 				
 			<div class="pull-right">
-				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
+				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
 					<fmt:message key="admin.cancel"/>
 				</a>
-				<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+				<input type="submit" id="saveButton" class="btn btn-primary btn-sm loffset5" value="<fmt:message key="admin.save" />" />
 			</div>
 		</form:form>
 		
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -r002370657c7bc0bf87eef9c223e1778f74483413 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 002370657c7bc0bf87eef9c223e1778f74483413)
+++ lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -17,40 +17,50 @@
 	<c:set var="title">${title}: <fmt:message key="admin.list.disabled.users"/></c:set>
 	<lams:Page type="admin" title="${title}">
 	
-		<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-		<table class="table table-striped table-condensed">
+		<table class="table table-striped table-bordered">
+		<thead class="thead-light">
 		<tr>
-			<th></th>
+			<th>ID</th>
 			<th><fmt:message key="admin.user.login"/></th>
-			<th><fmt:message key="admin.user.title"/></th>
 			<th><fmt:message key="admin.user.first_name"/></th>
 			<th><fmt:message key="admin.user.last_name"/></th>
-			<th></th>
+			<th class="text-center"><fmt:message key="admin.actions"/></th>
 		</tr>
+		</thead>
+		<tbody>
 		<c:forEach var="user" items="${users}">
 			<tr>
 				<td>
-					<c:out value="${user.userId}" />
+					<c:out value="${user.userId}" escapeXml="true"/>
 				</td>
 				<td>
-					<c:out value="${user.login}" />
+					<c:out value="${user.login}" escapeXml="true" />
 				</td>
 				<td>
-					<c:out value="${user.title}" />
+					<c:out value="${user.firstName}" escapeXml="true" />
 				</td>
 				<td>
-					<c:out value="${user.firstName}" />
+					<c:out value="${user.lastName}" escapeXml="true" />
 				</td>
-				<td>
-					<c:out value="${user.lastName}" />
-				</td>
-				<td>
-					<csrf:form style="display: inline-block;" id="enable_${ltiConsumer.sid}" method="post" action="/lams/admin/user/enable.do"><input type="hidden" name="userId" value="${user.userId}"/><button type="submit" class="btn btn-primary btn-xs"><fmt:message key="admin.enable" /></button></csrf:form>
+				<td class="text-center">
+					<csrf:form style="display: inline-block;" id="enable_${ltiConsumer.sid}" method="post" action="/lams/admin/user/enable.do">
+						<input type="hidden" name="userId" value="${user.userId}"/>
+						<button type="submit" class="btn btn-outline-success btn-sm" title="<fmt:message key="admin.enable" />">
+							<i class="fa fa-power-off"></i>
+						</button>
+					</csrf:form>
 				</td>		
 			</tr>
 		</c:forEach>
+		</tbody>
 		</table>
+		
+		<div class="pull-right">
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel"/>
+			</a>
+		</div>		
 	</lams:Page>
 
 </body>
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -r37bb2ae017713b44cdfd6a55cfceca28c3efab02 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 37bb2ae017713b44cdfd6a55cfceca28c3efab02)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -57,7 +57,14 @@
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="importForm">
 	
-	<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></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 active" aria-current="page"><fmt:message key="sysadmin.import.groups.title"/></li>
+		  </ol>
+		</nav>		
 
 	<div id="main-page">
 	
@@ -121,8 +128,8 @@
 			<lams:WaitingSpinner id="fileUpload_Busy"/> 
 		
 		<div class="pull-right">
-		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
-		<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import"/>" /> &nbsp; 	
+		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm"><fmt:message key="admin.cancel"/></a>
+		<input type="submit" id="importButton" class="btn btn-primary btn-sm loffset5" value="<fmt:message key="label.import"/>" /> &nbsp; 	
 		</div>
 	
 	</form:form>
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r37bb2ae017713b44cdfd6a55cfceca28c3efab02 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 37bb2ae017713b44cdfd6a55cfceca28c3efab02)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -57,78 +57,81 @@
 	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<c:set var="help"><fmt:message key="Import+Users"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="importExcelForm">
-				<p>
-					<a href="<lams:LAMSURL/>admin/sysadminstart.do"
-						class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
-				</p>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="importExcelForm">
+
+		<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 active" aria-current="page"><fmt:message key="admin.user.management"/></li>
+		  </ol>
+		</nav>		
 				
-				<p>
-					<fmt:message key="msg.import.intro" />
-				</p>
-				<p>
-				<ul>
-					<li><fmt:message key="msg.import.1" /></li>
-					<li><fmt:message key="msg.import.2" />
-						<ul>
-							<li><p>
-									<a href="file/lams_users_template.xls">lams_users_template.xls</a>
-								</p></li>
-						</ul></li>
-					<li><fmt:message key="msg.import.3" />
-						<ul>
-							<li><p>
-									<a href="file/lams_roles_template.xls">lams_roles_template.xls</a>
-								</p></li>
-						</ul></li>
+			<p>
+				<fmt:message key="msg.import.intro" />
+			</p>
+			<p>
+			<ul>
+				<li><fmt:message key="msg.import.1" /></li>
+				<li><fmt:message key="msg.import.2" />
+					<ul>
+						<li><p>
+								<a href="file/lams_users_template.xls">lams_users_template.xls</a>
+							</p></li>
+					</ul></li>
+				<li><fmt:message key="msg.import.3" />
+					<ul>
+						<li><p>
+								<a href="file/lams_roles_template.xls">lams_roles_template.xls</a>
+							</p></li>
+					</ul></li>
+			</ul>
+			</p>
+			<c:set var="alertTitle"><fmt:message key='label.password.must.contain' /></c:set>
+			<lams:Alert type="info" close="false" title="${alertTitle}:">
+				<ul style="line-height: 1.2em; list-style: none;">
+					<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>
+					<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>
-				</p>
-				<div class ="pull-left">
-					<lams:Alert type="info" close="false">
-						<strong><fmt:message key='label.password.must.contain' />:</strong>
-						<ul 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>
-							<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>
+			</lams:Alert>
+			<p>
+				<fmt:message key="msg.import.conclusion" />
+			</p>
+			
+			<form:form action="importexcelsave.do" modelAttribute="importExcelForm" id="importExcelForm" method="post"
+				enctype="multipart/form-data" onsubmit="return goToStatus();">
+				<form:hidden path="orgId" />
+			
+				<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
+				<lams:WaitingSpinner id="fileUpload_Busy"/> 
+			
+				<div class="pull-right">
+					<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary"><fmt:message key="admin.cancel"/></a>
+					<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import" />" />
+					&nbsp;
 				</div>
-				<p>
-					<fmt:message key="msg.import.conclusion" />
-				</p>
-				
-				<form:form action="importexcelsave.do" modelAttribute="importExcelForm" id="importExcelForm" method="post"
-					enctype="multipart/form-data" onsubmit="return goToStatus();">
-					<form:hidden path="orgId" />
-				
-					<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
-					<lams:WaitingSpinner id="fileUpload_Busy"/> 
-				
-					<div class="pull-right">
-						<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
-						<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import" />" />
-						&nbsp;
-					</div>
-				
-				</form:form>
-			</lams:Page>
+			
+			</form:form>
+	</lams:Page>
 </body>
 </lams:html>
 
Index: lams_admin/web/integration/ltiConsumerList.jsp
===================================================================
diff -u -r06ae1e4daee7838ea5ceba04ab67633ebfc78997 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/integration/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 06ae1e4daee7838ea5ceba04ab67633ebfc78997)
+++ lams_admin/web/integration/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -16,70 +16,100 @@
 			return confirm('<fmt:message key="label.manage.tool.consumers.delete" />');
 		}
 	</script>
+
 </lams:head>
     
 <body class="stripes">
 	<lams:Page type="admin" title="${title}">
-				<p>
-					<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
-						<fmt:message key="sysadmin.maintain" />
-					</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 active" aria-current="page"><fmt:message key="label.manage.tool.consumers"/></li>
+		  </ol>
+		</nav>
 				
-				<table class="table table-striped">
-				
-					<tr>
-						<th><fmt:message key="sysadmin.serverid" /></th>
-						<th><fmt:message key="sysadmin.serverkey" /></th>
-						<th><fmt:message key="sysadmin.servername" /></th>
-						<th><fmt:message key="sysadmin.serverdesc" /></th>
-						<th><fmt:message key="sysadmin.prefix" /></th>
-						<th><fmt:message key="sysadmin.disabled" /></th>
-						<th><fmt:message key="admin.actions"/></th>
-					</tr>
-					
-					<c:forEach var="ltiConsumer" items="${ltiConsumers}">
-						<tr>
-							<td><c:out value="${ltiConsumer.serverid}" /></td>
-							<td><c:out value="${ltiConsumer.serverkey}" /></td>
-							<td><c:out value="${ltiConsumer.servername}" /></td>
-							<td><c:out value="${ltiConsumer.serverdesc}" /></td>
-							<td><c:out value="${ltiConsumer.prefix}" /></td>
-							<td>
-								<c:choose>
-									<c:when test="${ltiConsumer.disabled}" >
-										<fmt:message key="label.yes" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="label.no" />
-									</c:otherwise>
-								</c:choose>
-							</td>
-							<td>
-								<a class="btn btn-default btn-xs" id="edit_${ltiConsumer.sid}" href="../ltiConsumerManagement/edit.do?sid=<c:out value='${ltiConsumer.sid}' />">
-									<fmt:message key="admin.edit" />
+		<table class="table table-striped table-bordered">
+			<thead class="thead-light">
+			<tr>
+				<th><fmt:message key="sysadmin.servername" /></th>
+				<th><fmt:message key="sysadmin.serverid" /></th>
+				<th class="d-none d-lg-table-cell"><fmt:message key="sysadmin.serverdesc" /></th>
+				<th><fmt:message key="sysadmin.prefix" /></th>
+				<th><fmt:message key="admin.actions"/></th>
+			</tr>
+			</thead>
+			<tbody>
+			<c:forEach var="ltiConsumer" items="${ltiConsumers}">
+				<tr <c:if test="${ltiConsumer.disabled}">class="table-danger ${signupOrganisation.disabled}"</c:if> >
+					<td>
+						<a href="../ltiConsumerManagement/edit.do?sid=<c:out value='${ltiConsumer.sid}' escapeXml='true'/>" title="<fmt:message key="admin.edit" />" class="font-weight-bold">
+							<c:out value="${ltiConsumer.servername}" escapeXml="true"/>
+						</a>
+						<c:choose>
+							<c:when test="${ltiConsumer.disabled}" >
+								</br><span class="badge badge-warning"><fmt:message key="sysadmin.disabled" /></span>
+							</c:when>
+							<c:otherwise>
+								</br>
+								<a class="btn btn-sm btn-outline-secondary py-0 px-1" style="font-size: 0.8em;" title="<fmt:message key="sysadmin.serverkey" />" href="javascript:alert('<fmt:message key="sysadmin.serverkey" />: <c:out value="${ltiConsumer.serverkey}" escapeXml="true"/>');">
+									<i title="<fmt:message key="sysadmin.serverkey" />" class="fa fa-key font-weight-bolder "></i>
 								</a>
-								&nbsp;
-								<c:choose>
-									<c:when test="${ltiConsumer.disabled}">
-                                        <csrf:form style="display: inline-block;" id="enable_${ltiConsumer.sid}" method="post" action="/lams/admin/ltiConsumerManagement/disable.do"><input type="hidden" name="sid" value="${ltiConsumer.sid}"/><input type="hidden" name="disable" value="false"/><input type="submit" class="btn btn-primary btn-xs" value="<fmt:message key="admin.enable" />"/></csrf:form>
-									</c:when>
-									<c:otherwise>
-                                        <csrf:form style="display: inline-block;" id="disable_${ltiConsumer.sid}" method="post" action="/lams/admin/ltiConsumerManagement/disable.do"><input type="hidden" name="sid" value="${ltiConsumer.sid}"/><input type="hidden" name="disable" value="true"/><input type="submit" class="btn btn-primary btn-xs" value="<fmt:message key="admin.disable" />"/></csrf:form>
-									</c:otherwise>
-								</c:choose>
-								&nbsp;
-                                <csrf:form style="display: inline-block;" id="delete_${ltiConsumer.sid}" method="post" action="/lams/admin/ltiConsumerManagement/delete.do" onSubmit="javascript:return deleteConsumer()"><input type="hidden" name="sid" value="${ltiConsumer.sid}"/><input type="submit" class="btn btn-danger btn-xs" value="<fmt:message key="admin.delete" />"/></csrf:form>
-							</td>
-						</tr>
-					</c:forEach>
-				</table>
+							</c:otherwise>
+						</c:choose>						
+					</td>
+					<td><c:out value="${ltiConsumer.serverid}" escapeXml="true"/></td>
+					<td class="d-none d-lg-table-cell"style="word-wrap: break-word;min-width: 410px;max-width: 410px;"><span class="d-inline-block text-truncate" style="max-width: 410px;"><c:out value="${ltiConsumer.serverdesc}" escapeXml="true"/></span></td>
+					<td><c:out value="${ltiConsumer.prefix}" /></td>
+					<td class="text-center">
+						<a style="display: inline-block;" title="<fmt:message key="admin.edit" />" class="btn btn-outline-primary btn-sm" id="edit_<c:out value='${ltiConsumer.sid}' escapeXml="true"/>" href="../ltiConsumerManagement/edit.do?sid=<c:out value='${ltiConsumer.sid}' escapeXml='true'/>">
+							<i class="fa fa-pencil"></i>
+						</a>
+						&nbsp;
+						<c:choose>
+							<c:when test="${ltiConsumer.disabled}">
+								<csrf:form style="display: inline-block;" id="enable_${ltiConsumer.sid}" method="post" action="/lams/admin/ltiConsumerManagement/disable.do">
+									<input type="hidden" name="sid" value="${ltiConsumer.sid}"/>
+									<input type="hidden" name="disable" value="false"/>
+									<button type="submit" class="btn btn-outline-primary btn-sm" title="<fmt:message key="admin.enable" />"/>
+                                		<i class="fa fa-power-off"></i>
+                                	</button>
+								</csrf:form>
+							</c:when>
+							<c:otherwise>
+								<csrf:form style="display: inline-block;" id="disable_${ltiConsumer.sid}" method="post" action="/lams/admin/ltiConsumerManagement/disable.do">
+									<input type="hidden" name="sid" value="${ltiConsumer.sid}"/>
+									<input type="hidden" name="disable" value="true"/>
+									<button type="submit" class="btn btn-outline-secondary btn-sm" title="<fmt:message key="admin.disable" />"/>
+										<i class="fa fa-pause"></i>
+									</button>
+								</csrf:form>
+							</c:otherwise>
+						</c:choose>
+						&nbsp;
+                        <csrf:form style="display: inline-block;" id="delete_${ltiConsumer.sid}" method="post" action="/lams/admin/ltiConsumerManagement/delete.do" onSubmit="javascript:return deleteConsumer()">
+                        	<input type="hidden" name="sid" value="${ltiConsumer.sid}"/>
+                        	<button type="submit" class="btn btn-outline-danger btn-sm" title="<fmt:message key="admin.delete" />"/>
+                        		<i class="fa fa-trash"></i>
+                        	</button>
+                       	</csrf:form>
+					</td>
+				</tr>
+			</c:forEach>
+			</tbody>
+		</table>
 				
-				<p>${fn:length(ltiConsumers)}&nbsp;<fmt:message key="label.tool.consumers.count" /></p>
-				
-				<input class="btn btn-default pull-right" name="addNewLtiConsumer" type="button" value="<fmt:message key='label.add.tool.consumer' />" 
-						onClick="javascript:document.location='../ltiConsumerManagement/edit.do'" />
-				
+		<p>${fn:length(ltiConsumers)}&nbsp;<fmt:message key="label.tool.consumers.count" /></p>
+
+		<div class="pull-right">
+				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+					<fmt:message key="admin.cancel"/>
+				</a>
+			<input class="btn btn-primary btn-sm loffset5" name="addNewLtiConsumer" type="button" value="<fmt:message key='label.add.tool.consumer' />" 
+					onClick="javascript:document.location='../ltiConsumerManagement/edit.do'" />
+		</div>
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/integration/serverlist.jsp
===================================================================
diff -u -r06ae1e4daee7838ea5ceba04ab67633ebfc78997 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/integration/serverlist.jsp	(.../serverlist.jsp)	(revision 06ae1e4daee7838ea5ceba04ab67633ebfc78997)
+++ lams_admin/web/integration/serverlist.jsp	(.../serverlist.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -20,58 +20,93 @@
     
 <body class="stripes">
 	<lams:Page type="admin" title="${title}">
-		<p>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
-		</p>
 
-			<table class="table table-striped">
+		<nav aria-label="breadcrumb">
+		  <ol class="breadcrumb">
+		    <li class="breadcrumb-item" aria-current="page">
+		    	<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="sysadmin.maintain.external.servers"/></li>
+		  </ol>
+		</nav>
+
+
+			<table class="table table-striped table-bordered">
+				<thead class="thead-light">
 				<tr>
-					<th><fmt:message key="sysadmin.serverid" /></th>
-					<th><fmt:message key="sysadmin.serverkey" /></th>
 					<th><fmt:message key="sysadmin.servername" /></th>
-					<th><fmt:message key="sysadmin.serverdesc" /></th>
+					<th><fmt:message key="sysadmin.serverid" /></th>
+					<th class="d-none d-lg-table-cell"><fmt:message key="sysadmin.serverdesc" /></th>
 					<th><fmt:message key="sysadmin.prefix" /></th>
-					<th><fmt:message key="sysadmin.disabled" /></th>
 					<th><fmt:message key="admin.actions"/></th>
 				</tr>
+				</thead>
+				<tbody>
 				<c:forEach items="${servers}" var="server">
-				<tr>
-					<td><c:out value="${server.serverid}" /></td>
-					<td><c:out value="${server.serverkey}" /></td>
-					<td><c:out value="${server.servername}" /></td>
-					<td><c:out value="${server.serverdesc}" /></td>
-					<td><c:out value="${server.prefix}" /></td>
+				<tr <c:if test="${server.disabled}">class="table-danger ${signupOrganisation.disabled}"</c:if> >
 					<td>
+						<a href="<lams:LAMSURL/>admin/extserver/edit.do?sid=${server.sid}" title="<fmt:message key="admin.edit" />" class="font-weight-bold">
+							<c:out value="${server.servername}" escapeXml="true"/>
+						</a>
 						<c:choose>
-						<c:when test="${server.disabled}" >
-							<fmt:message key="label.yes" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="label.no" />
-						</c:otherwise>
-						</c:choose>
+							<c:when test="${server.disabled}" >
+								</br><span class="badge badge-warning"><fmt:message key="sysadmin.disabled" /></span>
+							</c:when>
+							<c:otherwise>
+								</br>
+								<a class="btn btn-sm btn-outline-secondary py-0 px-1" style="font-size: 0.8em;" title="<fmt:message key="sysadmin.serverkey" />" href="javascript:alert('<fmt:message key="sysadmin.serverkey" />: <c:out value="${server.serverkey}" escapeXml="true"/>');">
+									<i title="<fmt:message key="sysadmin.serverkey" />" class="fa fa-key font-weight-bolder "></i>
+								</a>
+							</c:otherwise>
+						</c:choose>						
+						
 					</td>
-					<td>
-						<a style="display: inline-block;" class="btn btn-primary btn-xs" id="edit_<c:out value='${server.serverid}'/>" href="<lams:LAMSURL/>admin/extserver/edit.do?sid=${server.sid}"><fmt:message key="admin.edit" /></a>
+					<td><c:out value="${server.serverid}"  escapeXml="true"/></td>
+					<td class="d-none d-lg-table-cell" style="word-wrap: break-word;min-width: 410px;max-width: 410px;"><span class="d-inline-block text-truncate" style="max-width: 410px;"><c:out value="${server.serverdesc}" escapeXml="true"/></span></td>
+					<td><c:out value="${server.prefix}" /></td>
+					<td class="text-center">
+						<a style="display: inline-block;" class="btn btn-outline-primary btn-sm" id="edit_<c:out value='${server.serverid}' escapeXml="true"/>" href="<lams:LAMSURL/>admin/extserver/edit.do?sid=${server.sid}" title="<fmt:message key="admin.edit" />">
+							<i class="fa fa-pencil"></i>
+						</a>
 						&nbsp;
 						<c:choose>
 							<c:when test="${server.disabled}">
-                                <csrf:form style="display: inline-block;" id="enable_${server.serverid}" method="post" action="/lams/admin/extserver/enable.do"><input type="hidden" name="sid" value="${server.sid}"/><input type="submit" class="btn btn-success btn-xs" value="<fmt:message key="admin.enable" />"/></csrf:form>
+                                <csrf:form style="display: inline-block;" id="enable_${server.serverid}" method="post" action="/lams/admin/extserver/enable.do">
+                                	<input type="hidden" name="sid" value="${server.sid}"/>
+                                		<button type="submit" class="btn btn-outline-success btn-sm" title="<fmt:message key="admin.enable" />">
+                                		<i class="fa fa-power-off"></i>
+                                		</button>
+                                </csrf:form>
 							</c:when>
 							<c:otherwise>
-                                <csrf:form style="display: inline-block;" id="disable_${server.serverid}" method="post" action="/lams/admin/extserver/disable.do"><input type="hidden" name="sid" value="${server.sid}"/><input type="submit" class="btn btn-primary btn-xs" value="<fmt:message key="admin.disable" />"/></csrf:form>
+                                <csrf:form style="display: inline-block;" id="disable_${server.serverid}" method="post" action="/lams/admin/extserver/disable.do">
+                                	<input type="hidden" name="sid" value="${server.sid}"/>
+                                	<button type="submit" class="btn btn-outline-secondary btn-sm" title="<fmt:message key="admin.disable" />">
+                                		<i class="fa fa-pause"></i>
+                                	</button></csrf:form>
 							</c:otherwise>
 						</c:choose>
 						&nbsp;
-                        <csrf:form id="delete_${server.serverid}" style="display: inline-block;" method="post" action="/lams/admin/extserver/delete.do" onSubmit="javascript:return deleteIntegratedServer()"><input type="hidden" name="sid" value="${server.sid}"/><input type="submit" class="btn btn-danger btn-xs" value="<fmt:message key="admin.delete" />"/></csrf:form>
+                        <csrf:form id="delete_${server.serverid}" style="display: inline-block;" method="post" action="/lams/admin/extserver/delete.do" onSubmit="javascript:return deleteIntegratedServer()">
+                        	<input type="hidden" name="sid" value="${server.sid}"/>
+                        	<button type="submit" class="btn btn-outline-danger btn-sm" title="<fmt:message key="admin.delete" />"/>
+                        		<i class="fa fa-trash"></i>
+                        	</button>
+                        </csrf:form>
 					</td>
 				</tr>
 				</c:forEach>
+				</tbody>
 			</table>
 			<p>${fn:length(servers)}&nbsp;<fmt:message key="sysadmin.integrated.servers" /></p>
 			
-			<input class="btn btn-default pull-right" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='edit.do'" />
-
+			<div class="pull-right">
+				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+					<fmt:message key="admin.cancel"/>
+				</a>
+				
+				<input class="btn btn-primary btn-sm loffset5" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='edit.do'" />
+			</div>
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/logevent.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -233,16 +233,21 @@
 <body class="stripes">
 	<lams:Page type="admin" title="${title}">
 	
-		<p>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></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 active" aria-current="page"><fmt:message key="label.event.log"/></li>
+		  </ol>
+		</nav>		
 
 		<div class="form form-inline">
-				<span><select id="areaMenu" class="form-control" onchange="javascript:configureTypeDropdown(this.value)"></select>&nbsp;
-				<select id="typeMenu" class="form-control"></select></span>
-				<span class="pull-right"><fmt:message key="label.between.dates"/>&nbsp;<input type="text" class="form-control" name="startDatePicker" id="startDatePicker" value=""/>
+				<span><select id="areaMenu" class="form-control-sm" onchange="javascript:configureTypeDropdown(this.value)"></select>&nbsp;
+				<select id="typeMenu" class="form-control-sm"></select></span>
+				<span class="pull-right px-4"><fmt:message key="label.between.dates"/>&nbsp;<input type="text" class="form-control" name="startDatePicker" id="startDatePicker" value=""/>
 				&nbsp;<input type="text" class="form-control" name="endDatePicker" id="endDatePicker" value=""/>
-				<a href="#" class="btn btn-default" onclick="javascript:getEvents()"><fmt:message key="admin.search"/></a>
+				<a href="#" class="btn btn-primary btn-sm" onclick="javascript:getEvents()"><fmt:message key="admin.search"/></a>
 				</span>
 		</div>
 		
@@ -255,7 +260,13 @@
 					<th class="no-spinner"><fmt:message key="audit.remarks"/></th>
 			</lams:TSTable>
 		</div>
-			
+		<hr>
+		<div class="pull-right">
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel"/>
+			</a>
+		</div>		
+
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/loginmaintain.jsp
===================================================================
diff -u -re739ff3cdb84a0f87795156409657e96eb8f21b6 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision e739ff3cdb84a0f87795156409657e96eb8f21b6)
+++ lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -16,25 +16,30 @@
 <body class="stripes">
 	<lams:Page type="admin" title="${title}" formID="loginMaintainForm">
 		
-		<p>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
-				<fmt:message key="sysadmin.maintain" />
-			</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 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>
-			<p class="help-block"><fmt:message key="sysadmin.login.text"/></p>
+			<p><fmt:message key="sysadmin.login.text"/></p>
 			
 			<lams:CKEditor id="news" value="${loginMaintainForm.news}" contentFolderID="../public" height="600px"></lams:CKEditor>
 			
 			<div class="pull-right voffset5">
-				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
+				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
 					<fmt:message key="admin.cancel"/>
 				</a>
-				<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+				<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/organisation/list.jsp
===================================================================
diff -u -r1ef1213820fe7ff7c6f4a9238b3f489a25012c63 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 1ef1213820fe7ff7c6f4a9238b3f489a25012c63)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -166,7 +166,7 @@
 			
 							<div class="btn-group btn-group-sm  pull-right">
 								<c:if test="${editGroup == true}">
-									<a href="organisation/edit.do?orgId=<c:out value="${orgManageForm.parentId}"/>" id="editCourse" class="btn btn-default"><i class="fa fa-edit"></i><span class="hidden-xs"> <fmt:message key="admin.edit" /></span></a> 
+									<a href="organisation/edit.do?orgId=<c:out value="${orgManageForm.parentId}"/>" id="editCourse" class="btn btn-default"><i class="fa fa-pencil"></i><span class="hidden-xs"> <fmt:message key="admin.edit" /></span></a> 
 								</c:if>
 								<a href="usermanage.do?org=<c:out value="${orgManageForm.parentId}"/>" id="manageUsers" class="btn btn-default"><i class="fa fa-users"></i> <span class="hidden-xs"><fmt:message key="admin.user.manage" /></span></a>
 								
Index: lams_admin/web/policies/policies.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/policies/policies.jsp	(.../policies.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -23,7 +23,14 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.timeago.js"></script>
 	<script type="text/javascript">
+	    $(document).ready(function(){
+	        $("time.timeago").timeago();
+	    });
+    </script>
+	
+	<script type="text/javascript">
 		$(window).on('load', function(){
 			//dialog displaying user consents given for the specified policy
 			$(".policy-consents-link").click(function() {
@@ -34,12 +41,11 @@
 				exists = dialog.length > 0
 				url = '<c:url value="/policyManagement/displayUserConsents.do"/>?policyUid=' + policyUid;
 				showDialog(id, {
-					//'resizable' : false,
 					'data' : {
 						'orgID'  : "orgID"
 					},
-					'height' : 500,
-					'width'  : 600,
+					'height' : 600,
+					'width'  : 1200,
 					'title'  : "<fmt:message key='label.user.consents'/>",
 					'open'   : function() {
 						$('iframe', this).attr('src', url);
@@ -70,25 +76,36 @@
 <body class="stripes">
 	<c:set var="help"><lams:help style="small" page="LAMS+Policies" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
-		<p>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
-				<fmt:message key="sysadmin.maintain" />
-			</a>
+
+		<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 active" aria-current="page"><fmt:message key="admin.policies.title"/></li>
+		  </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>
-		</p>
 		
 		<div id="policy-table">
 			<%@ include file="policyTable.jsp"%>
 		</div>
 		
 		<c:if test="${!viewPreviousVersions}">
-			<a class="btn btn-default pull-right" href="<lams:WebAppURL />policyManagement/edit.do">
-				<fmt:message key="label.add.new.policy"/>
-			</a>
+			<div class="pull-right">
+				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+					<fmt:message key="admin.cancel"/>
+				</a>
+				
+				<a class="btn btn-primary btn-sm" href="<lams:WebAppURL />policyManagement/edit.do">
+					<fmt:message key="label.add.new.policy"/>
+				</a>
+			</div>
 		</c:if>
 	</lams:Page>
 </body>
Index: lams_admin/web/policies/policyTable.jsp
===================================================================
diff -u -r95b456e2d455b045b20b696f2a749c0e3cc35917 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/policies/policyTable.jsp	(.../policyTable.jsp)	(revision 95b456e2d455b045b20b696f2a749c0e3cc35917)
+++ lams_admin/web/policies/policyTable.jsp	(.../policyTable.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -1,6 +1,7 @@
 <%@ include file="/taglibs.jsp"%>
 
-<table class="table table-striped table-condensed" >
+<table class="table table-striped table-bordered" >
+	<thead class="thead-light">
 	<tr>
 		<th><fmt:message key="label.name" /></th>
 		<th><fmt:message key="label.policy.status" /></th>
@@ -10,21 +11,25 @@
 		<th><fmt:message key="label.consents"/></th>
 		<th colspan="3"><fmt:message key="admin.actions"/></th>
 	</tr>
+	</thead>
+	<tbody>
 	<c:forEach items="${policies}" var="policy">
 		<tr>
-			<td>
-				<c:out value="${policy.policyName}" />
+			<td class="text-left">
+				<a href="<lams:WebAppURL />policyManagement/edit.do?policyUid=${policy.uid}">
+					<c:out value="${policy.policyName}" escapeXml="true" />
+				</a>
 			</td>
 			<td>
 				<c:choose>
 					<c:when test="${policy.policyStateId == 1}">
 						<span class="label label-success">
-							<fmt:message key="label.policy.status.active"/>
+							<span class="badge badge-success"><fmt:message key="label.policy.status.active"/></span>
 						</span>
 					</c:when>
 					<c:otherwise>
 						<span class="label label-warning">
-							<fmt:message key="label.policy.status.inactive"/>
+							<span class="badge badge-warning"><fmt:message key="label.policy.status.inactive"/>
 						</span>
 					</c:otherwise>
 				</c:choose>
@@ -46,10 +51,10 @@
 				</c:choose>
 			</td>
 			<td>
-				<c:out value="${policy.version}" />
+				<c:out value="${policy.version}" escapeXml="true" />
 			</td>
 			<td>
-				<lams:Date value="${policy.lastModified}"/>
+				<lams:Date value="${policy.lastModified}" timeago="true"/>
 			</td>
 			<td>
 				<a href="#nogo" class="policy-consents-link" data-policy-uid="${policy.uid}">
@@ -60,14 +65,18 @@
 			<!-- Actions columns -->
 			<td>
 				<a href="<lams:WebAppURL />policyManagement/edit.do?policyUid=${policy.uid}">
-					<fmt:message key="admin.edit"/>
+					<button class="btn btn-outline-primary btn-sm" title="<fmt:message key="admin.edit"/>">
+						<i class="fa fa-pencil"></i>
+					</button>
 				</a>
 			</td>
 						
 			<td>
 				<c:if test="${!viewPreviousVersions && policy.hasPreviousVersions()}">
 					<a href="<lams:WebAppURL />policyManagement/viewPreviousVersions.do?policyId=${policy.policyId}">
-						<fmt:message key="label.view.previous.versions"/>
+						<button  title="<fmt:message key="label.view.previous.versions"/>" class="btn btn-outline-primary btn-sm" >
+							<i class="fa fa-code-fork fa-fw"></i>
+						</button>
 					</a>
 				</c:if>	
 			</td>
@@ -76,10 +85,13 @@
 				<a href="#nogo" class="change-status-link" data-policy-uid="${policy.uid}" data-policy-id="${policy.policyId}">
 					<c:choose>
 						<c:when test="${policy.policyStateId == 1}">
-							<fmt:message key="label.deactivate"/>
+							<button class="btn btn-outline-warning btn-sm" title="<fmt:message key="label.deactivate"/>"><i class="fa fa-pause"></i></button>
 						</c:when>
 						<c:otherwise>
-							<fmt:message key="label.activate"/>				
+							<button class="btn btn-outline-success btn-sm" title="<fmt:message key="label.activate"/>">
+								<i class="fa fa-power-off"></i>
+							</button>
+											
 						</c:otherwise>
 					</c:choose>
 				</a>
@@ -88,4 +100,5 @@
 				
 		</tr>
 	</c:forEach>
-</table>
\ No newline at end of file
+	</tbody>
+</table>
Index: lams_admin/web/policies/userConsents.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/policies/userConsents.jsp	(.../userConsents.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/policies/userConsents.jsp	(.../userConsents.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -34,7 +34,7 @@
 			    sortorder: "asc", 
 			    sortname: "fullName", 
 			    pager: 'consents-grid-pager',
-			    rowList:[10,20,30,40,50,100],
+			    rowList:[10,50,100,500],
 			    rowNum:10,
 			    colNames:[
 			    	'',
@@ -90,25 +90,20 @@
 </lams:head>
 
 <body>
-<div class="row no-gutter no-margin">
-<div class="col-12">
-<div class="container" id="content">
+<c:set var="title"><c:out value='${policy.policyName}' escapeXml='true'/></c:set>
+<lams:Page type="admin" title="${title}" >
+	<h1>
+		
+	</h1>
 
-	<h5>
-		<c:out value="${policy.policyName}" />
-	</h5>
-
-	<fmt:message key="label.version" />: <c:out value="${policy.version}" />
-	<br/><br/>
+	<p><fmt:message key="label.version" />: <c:out value="${policy.version}" /></p>
 	
 	 <div class="grid-holder">
  		<table id="consents-grid" class="scroll"></table>
 		<div id="consents-grid-pager" class="scroll"></div>
  		<div class="tooltip-lg" id="tooltip"></div>
 	</div>
 
-</div>
-</div>
-</div>
+</lams:Page>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_admin/web/sessionmaintain.jsp
===================================================================
diff -u -r12b36e96a4ccc6494fe3297f845cb9124d01a4aa -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 12b36e96a4ccc6494fe3297f845cb9124d01a4aa)
+++ lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -11,32 +11,50 @@
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>/css/jquery.tablesorter.theme.bootstrap4.css">
 	
+	
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.timeago.js"></script>	
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.js"></script>
 	<script type="text/javascript">
 	    jQuery(document).ready(function() {
 	    	jQuery("time.timeago").timeago();
+	    	
+			// initial sort set using data-sortlist attribute 
+			$(".sessionTable").tablesorter({
+				theme : 'bootstrap'
+			});
 	    });
 	</script>
 </lams:head>
     
 <body class="stripes">
 	<lams:Page type="admin" title="${title}">
-		<p>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></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 active" aria-current="page"><fmt:message key="sysadmin.maintain.session"/></li>
+		  </ol>
+		</nav>		
+
 		
 		<div class="alert alert-info">${fn:length(sessions)}&nbsp;<fmt:message key="sysadmin.maintain.session.count" /></div>
 
-		<table class="table table-striped table-hover">
+		<table class="table table-striped table-hover sessionTable" id="sessionTable" data-sortlist="[[1]]">
+			<thead class="thead-light">
 			<tr>
 				<th><fmt:message key="sysadmin.maintain.session.login" /></th>
 				<th><fmt:message key="sysadmin.maintain.session.name" /></th>
 				<th><fmt:message key="sysadmin.maintain.session.access" /></th>
 				<th><fmt:message key="sysadmin.maintain.session.id" /></th>
-				<th></th>
+				<th data-sorter="false"  class="text-center"><fmt:message key="admin.actions" /></th>
 			</tr>
+			</thead>
+			<tbody>
 			<c:forEach items="${sessions}" var="ses">
 			<tr>
 				<td><c:out value="${ses.key}" /></td>
@@ -45,12 +63,24 @@
 				<td title="<fmt:message key="sysadmin.maintain.session.created" />&nbsp;<c:out value="${ses.value[3]}" />">
 					<c:out value="${ses.value[4]}" />
 				</td>
-				<td>
-					<csrf:form style="display: inline-block;" id="delete_${ses.key}" method="post" action="/lams/admin/sessionmaintain/delete.do"><input type="hidden" name="login" value="${ses.key}"/><button type="submit" class="btn btn-danger btn-xs"><i class="fa fa-trash"></i> <fmt:message key="sysadmin.maintain.session.delete" /></button></csrf:form>
+				<td class="text-center">
+					<csrf:form style="display: inline-block;" id="delete_${ses.key}" method="post" action="/lams/admin/sessionmaintain/delete.do">
+					<input type="hidden" name="login" value="${ses.key}"/>
+					<button title="<fmt:message key="sysadmin.maintain.session.delete" />" type="submit" class="btn btn-outline-danger btn-sm">
+						<i class="fa fa-trash"></i></button>
+					</csrf:form>
 				</td>
 			</tr>
 			</c:forEach>
+			</tbody>
 		</table>
+		<hr>
+		<div class="pull-right">
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel"/>
+			</a>
+		</div>		
+		
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -r1840d1ada2e0a7dc494e83ed0c183f6c98b6da92 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 1840d1ada2e0a7dc494e83ed0c183f6c98b6da92)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -11,72 +11,104 @@
 
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.timeago.js"></script>
+	<script type="text/javascript">
+	    $(document).ready(function(){
+	        $("time.timeago").timeago();
+	        
+	    });
+    </script>
 </lams:head>
     
 <body class="stripes">
 	<c:set var="help"><fmt:message key="LAMS+Signup"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 	
-		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></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 active" aria-current="page"><fmt:message key="admin.signup.title"/></li>
+		  </ol>
+		</nav>
 
+		<div class="col-xl">
 		<c:if test="${not empty error}">
 			<lams:Alert type="warn" id="errorMessage" close="false">	
 				<c:out value="${error}" />
 			</lams:Alert>
 		</c:if>
 		
-		<table class="table table-striped table-condensed" >
+		<table class="table table-striped table-bordered" >
+			<thead class="thead-light">
 			<tr>
 				<th><fmt:message key="admin.group" /></th>
 				<th><fmt:message key="admin.group.code" /></th>
 				<th><fmt:message key="admin.lessons" /></th>
 				<th><fmt:message key="admin.staff" /></th>
-				<th><fmt:message key="admin.email.verify" /></th>
 				<th><fmt:message key="admin.added.on"/></th>
-				<th><fmt:message key="admin.disable.option"/></th>
-				<th><fmt:message key="admin.context.path"/></th>
 				<th><fmt:message key="admin.actions"/></th>
 			</tr>
+			</thead>
+			<tbody>
 			<c:forEach items="${signupOrganisations}" var="signupOrganisation">
-				<tr>
+				<tr <c:if test="${signupOrganisation.disabled == 'true'}">class="table-danger ${signupOrganisation.disabled}"</c:if> >
 					<td>
-						<c:out value="${signupOrganisation.organisation.name}" />
+						<a href="<lams:LAMSURL/>admin/signupManagement/edit.do?soid=${signupOrganisation.signupOrganisationId}"><strong><c:out value="${signupOrganisation.organisation.name}" /></strong></a>
+						<c:if test="${signupOrganisation.disabled == 'true'}"><span class="badge badge-warning">Disabled</span></c:if>
 					</td>
 					<td>
 						<c:out value="${signupOrganisation.organisation.code}" />
 					</td>
 					<td>
-						<c:out value="${signupOrganisation.addToLessons}" />
+						<c:choose>
+						<c:when test="${signupOrganisation.addToLessons}" >
+							<fmt:message key="label.yes" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.no" />
+						</c:otherwise>
+						</c:choose>
 					</td>
 					<td>
-						<c:out value="${signupOrganisation.addAsStaff}" />
+						<c:choose>
+						<c:when test="${signupOrganisation.addAsStaff}" >
+							<fmt:message key="label.yes" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.no" />
+						</c:otherwise>
+						</c:choose>
 					</td>
 					<td>
-						<c:out value="${signupOrganisation.emailVerify}" />
+						<lams:Date value="${signupOrganisation.createDate}" timeago="true"/>
 					</td>
-					<td>
-						<c:out value="${signupOrganisation.createDate}" />
+					<td class="text-center">
+											
+                        <csrf:form style="display: inline-block;" id="delete_${signupOrganisation.signupOrganisationId}" method="post" action="/lams/admin/signupManagement/delete.do">
+                        <input type="hidden" name="soid" value="${signupOrganisation.signupOrganisationId}"/>
+                        
+                        <button title="<fmt:message key="admin.delete" />" class="btn btn-outline-danger btn-sm" type="submit"><i class="fa fa-trash"></i></button>
+                        </csrf:form>
 					</td>
-					<td>
-						<c:out value="${signupOrganisation.disabled}" />
-					</td>
-					<td>
-						<c:out value="${signupOrganisation.context}" />
-					</td>
-					<td>
-						<a id="edit" class="btn btn-default btn-xs" href="<lams:LAMSURL/>admin/signupManagement/edit.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.edit"/></a>
-						&nbsp;
-						<a href="<lams:LAMSURL/>admin/signupManagement/delete.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.delete"/></a>
-                        <csrf:form style="display: inline-block;" id="delete_${signupOrganisation.signupOrganisationId}" method="post" action="/lams/admin/signupManagement/delete.do"><input type="hidden" name="soid" value="${signupOrganisation.signupOrganisationId}"/><input type="submit" class="btn btn-danger btn-xs" value="<fmt:message key="admin.delete" />"/></csrf:form>
-					</td>
 				</tr>
 			</c:forEach>
+			</tbody>
 		</table>
 		
-		<a href="<lams:LAMSURL/>admin/signupManagement/add.do" class="btn btn-primary pull-right"><fmt:message key="admin.add.new.signup.page"/></a>
+		<div class="pull-right">
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel"/>
+			</a>
+			
+			<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/sysadmin.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -20,17 +20,15 @@
 		<div class="row"> 
 			<div class="col-12"> 
 				<div class="alert alert-info text-center"> 
-					<img src="/lams/images/svg/lams_logo_black.svg" width="100px"><br> 
+					<img src="/lams/images/svg/lams_logo_black.svg" width="100px" alt="LAMS logo"><br> 
 					<fmt:message key="config.version" />&nbsp;${serverVersion}
 				</div> 
    			</div> 
   		</div>
 	
 		<c:forEach items="${groupedLinks}" var="links">
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<div class="panel-title"><fmt:message key="${links[0]}"/></div>
-				</div>
+			<div class="container-fluid">
+				<h2 class="voffset20"><fmt:message key="${links[0]}"/></h2>
 				<div class="list-group">
 					<c:set var="linkBeans" value="${links[1]}"/>
 		 			<c:forEach items="${linkBeans}" var="linkBean">
@@ -43,6 +41,7 @@
 			 	</div>
 			</div>		
 		</c:forEach>
+		
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -80,11 +80,19 @@
     
 <body class="stripes">
 	<lams:Page type="admin" title="${title}" formID="themeForm">
-		<p>
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></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 active" aria-current="page"><fmt:message key="admin.themes.title"/></li>
+		  </ol>
+		</nav>
+	
 			
-			<table class="table table-striped table-condensed" >
+			<table class="table table-striped table-bordered" >
+				<thead class="thead-light">
 				<tr>
 					<th>
 						<fmt:message key="admin.themes.theme" />
@@ -98,28 +106,29 @@
 					<th>
 						<fmt:message key="admin.themes.defaultTheme" />
 					</th>
-					<th>
+					<th class="text-center">
+						<fmt:message key="admin.actions" />
 					</th>
-					<th>
-					</th>
 				</tr>
+				</thead>
+				<tbody>
 				<c:forEach var="theme" items="${themes}" >
 					<tr>
 						<td>
-							${theme.name}
+							<c:out value="${theme.name}" escapeXml="true"/>
 						</td>
 						<td>
-							${theme.description}
+							<c:out value="${theme.description}" escapeXml="true"/>
 						</td>
 						<td>
-							${theme.imageDirectory}
+							<c:out value="${theme.imageDirectory}" escapeXml="true"/>
 						</td>
-						<td align="center">
+						<td class="text-center">
 							<c:if test="${theme.currentDefaultTheme}">
-								<i class="fa fa-check"></i>
+								<i class="fa fa-check text-success"></i>
 							</c:if>
 						</td>
-						<td align="center">
+						<td class="text-center">
 			
 							<c:choose>
 								<c:when test="${not theme.notEditable}">
@@ -141,62 +150,42 @@
 						</td>	
 					</tr>
 				</c:forEach>
+				</tbody>
 			</table>
-			
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<div class="panel-title"><fmt:message key="admin.themes.addNew" /></div>
-				</div>
-				
-				<div class="panel-body">
+			<hr>
+			<div class="voffset20">
+				<h2><fmt:message key="admin.themes.addNew" /></h2>
 				<form:form action="addOrEditTheme.do" method="post" modelAttribute="themeForm" id="themeForm">	
 				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				<form:hidden path="id" id="id" />
-				
-				<table class="table table-no-border" >
-					<tr>
-						<td>
-							* <fmt:message key="admin.themes.name" />:
-						</td>
-						<td>
-							<form:input path="name" id="name" size="40" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<fmt:message key="admin.themes.description" />:
-						</td>
-						<td>
-							<form:input path="description" id="description" size="40" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<fmt:message key="admin.themes.imageDir" />:
-						</td>
-						<td>
-							<form:input path="imageDirectory" id="imageDirectory" size="40" />
-						</td>
-					</tr>
-					<tr>
-						<td>
-							<fmt:message key="admin.themes.makeThemeDefault" />:
-						</td>
-						<td>
-							<form:checkbox path="currentDefaultTheme" id="currentDefaultTheme" />
-						</td>
-					</tr>
-				</table>
-				
-				<div class="pull-right">
-				<div id="normalSave">
-					<a href="javascript:checkAndSubmit()" class="btn btn-default"><fmt:message key="admin.save" /></a>
+				<div class="form-group">
+					<label for="name"><fmt:message key="admin.themes.name" /></label> <span class="text-danger">*</span>
+					<input class="form-control" id="name" name="name" type="text" value="" maxlength="40" required>
 				</div>
-				<div id="cancelEdit" style="display:none;">
-					<a href="javascript:cancelEdit()" class="btn btn-default"><fmt:message key="admin.cancel" /></a>
-					<a href="javascript:submitForm()" class="btn btn-default loffset5"><fmt:message key="admin.save" /></a>
+				<div class="form-group">
+					<label for="description"><fmt:message key="admin.themes.description" /></label>:
+					<form:input class="form-control" path="description" id="description" />
 				</div>
+				<div class="form-group">
+					<label class="form-check-label" for="imageDirectory"><fmt:message key="admin.themes.imageDir" /></label>:
+					<form:input class="form-control" path="imageDirectory" id="imageDirectory" size="40" />
 				</div>
+				<div class="form-check">
+					<form:checkbox class="form-check-input"  path="currentDefaultTheme" id="currentDefaultTheme" />
+					<label class="form-check-label" for="currentDefaultTheme"><fmt:message key="admin.themes.makeThemeDefault" /></label>
+				</div>
+				
+					
+					<div id="normalSave" class="pull-right">
+					<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+						<fmt:message key="admin.cancel"/>
+					</a>
+					<a href="javascript:checkAndSubmit()" class="btn btn-primary btn-sm loffset5"><fmt:message key="admin.save" /></a>
+					</div>
+				<div id="cancelEdit" style="display:none;" class="pull-right">
+					<a href="javascript:cancelEdit()" class="btn btn-outline-secondary btn-sm"><fmt:message key="admin.cancel" /></a>
+					<a href="javascript:submitForm()" class="btn btn-primary btn-sm loffset5"><fmt:message key="admin.save" /></a>
+				</div>
 				</form:form>
 				
 			</div>
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r5f9e583fc8e476f6a5f9e1826332ba3788d7c68c -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 5f9e583fc8e476f6a5f9e1826332ba3788d7c68c)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -13,9 +13,11 @@
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
 	<link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>/css/jquery.tablesorter.theme.bootstrap4.css">
 
 	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.tablesorter.js"></script>
 	<script type="text/javascript">	
 		//this script lets user select all available timezones just by enabling the checkbox in header label
 		$(document).ready(function(){
@@ -30,6 +32,12 @@
 				    $('input:checkbox').not(this).prop('checked', false);	
 				}
 			});
+
+			// initial sort set using data-sortlist attribute 
+			$(".timeZoneTable").tablesorter({
+				theme : 'bootstrap'
+			});
+			
 		});
 	</script>
 </lams:head>
@@ -38,45 +46,59 @@
 	<c:set var="help"><fmt:message key="LAMS+Configuration"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="timezoneForm">
+
+		<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 active" aria-current="page"><fmt:message key="admin.timezone.title"/></li>
+		  </ol>
+		</nav>		
 		
-			<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+		<p>
 			<fmt:message key="admin.timezone.select.timezones.you.want.users.choose" >
-			<fmt:param>
-				<a class="thickbox" href="<lams:LAMSURL/>admin/timezonemanagement/serverTimezoneManagement.do?KeepThis=true&TB_iframe=true&height=188&width=820" title="<fmt:message key='admin.servertimezone.server.timezone.management'/>">
-					${serverTimezone}
-				</a>
-			</fmt:param>
+				<fmt:param>
+					<a class="thickbox" href="<lams:LAMSURL/>admin/timezonemanagement/serverTimezoneManagement.do?KeepThis=true&TB_iframe=true&height=188&width=820" title="<fmt:message key='admin.servertimezone.server.timezone.management'/>">
+						${serverTimezone}
+					</a>
+				</fmt:param>
 			</fmt:message>
+		</p>
+
+		<div class="col-xl">			
+		<lams:errors/>
 			
-			<lams:errors/>
         <form:form action="save.do" id="timezoneForm" modelAttribute="timezoneForm" method="post">
 			<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				
-				<table class="table table-striped table-condensed">
+				<table class="table table-striped table-bordered table-responsive timeZoneTable" id="timeZoneTable" data-sortlist="[[2,0]]">
+					<thead class="thead-light">
 					<tr>
-						<th width="10%" align="center"><fmt:message key="admin.timezone.select" />
+						<th data-sorter="false" class="text-center"><fmt:message key="admin.timezone.select" />
 						<!-- added this check box for the user to enable all available time zones -->
 						  <form:checkbox path="selected" value="currentSelectAllTZ" id="currentSelectAllTZ"/>
 						</th>
-						<th width="22%"><fmt:message key="admin.timezone.time.zone.id" /></th>
-						<th width="24%" align="center"><fmt:message key="admin.timezone.raw.offset" /></th>
-						<th width="12%" align="center"><fmt:message key="admin.timezone.dst.offset" /></th>
-						<th width="32%"><fmt:message key="admin.timezone.display.name" /></th>
-					</tr>	
-				
+						<th><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>
+					</tr>
+					</thead>
+					<tbody>
 					<c:forEach items="${timezoneDtos}" var="timezoneDto">
 						<tr>
-							<td align="center">
-								<input type="checkbox" class="timezoneCheckBox" name="selected" ${timezoneDto.selected ? 'checked="checked"' : ''} value="${timezoneDto.timeZoneId}"/>
+							<td class="text-center">
+								<input type="checkbox" class="timezoneCheckBox" name="selected" ${timezoneDto.selected ? 'checked="checked"' : ''} value="${timezoneDto.timeZoneId}" id="${timezoneDto.timeZoneId}"/>
 							</td>
 							<td>
-								${timezoneDto.timeZoneId}
+								<label style="margin-bottom: 0em" for="${timezoneDto.timeZoneId}">${timezoneDto.timeZoneId}</label>
 							</td>
-							<td align="center">
+							<td class="text-center">
 								<c:if test="${timezoneDto.rawOffsetNegative}">-</c:if>
 								<fmt:formatDate value="${timezoneDto.rawOffset}" pattern="H : mm" timeZone="GMT" /> 
 							</td>
-							<td align="center">
+							<td class="text-center">
 								<c:if test="${timezoneDto.dstOffset != 0}">
 									${timezoneDto.dstOffset}
 								</c:if>
@@ -86,17 +108,19 @@
 							</td>				
 						</tr>
 					</c:forEach>
+					</tbody>
 					
 				</table>
 				
 				<div class="pull-right">
-					<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
+					<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
 						<fmt:message key="admin.cancel"/>
 					</a>
-					<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+					<input type="submit" class="btn btn-primary loffset5 btn-sm" value="<fmt:message key="admin.save" />" />
 				</p>
 				
 			</form:form>
+		</div>	
 		</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -36,61 +36,84 @@
 <body class="stripes">
 	
 	<lams:Page type="admin" title="${title}">
-				<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
-
-				<h1><fmt:message key="sysadmin.tool.management" /></h1>
+		<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 active" aria-current="page"><fmt:message key="sysadmin.tool.management" /></li>
+		  </ol>
+		</nav>
 				
-				<div class="panel">
-					<p>
-						<fmt:message key="msg.edit.tool.content.1" />
-						&nbsp;
-						<fmt:message key="msg.edit.tool.content.2" />
-					</p>
-					<p>
-						<fmt:message key="msg.edit.tool.content.3" />
-					</p>
-					
-					<a href="javascript:openToolGroups()" class="btn btn-default pull-right" 
-					   title="<fmt:message key='tool.groups.open.button.tooltip' />" ><fmt:message key="tool.groups.open.button" /></a>
-					<div class="clearfix"></div>
-					
-					<p>${fn:length(toolLibrary)}&nbsp;<fmt:message key="sysadmin.library.totals" /></p>
-				</div>	
+			<div class="panel">
+				<p>
+					<fmt:message key="msg.edit.tool.content.1" />
+					&nbsp;
+					<fmt:message key="msg.edit.tool.content.2" />
+				</p>
+				<p>
+					<fmt:message key="msg.edit.tool.content.3" />
+				</p>
 				
+				<a href="javascript:openToolGroups()" class="btn btn-outline-secondary btn-sm pull-right" 
+				   title="<fmt:message key='tool.groups.open.button.tooltip' />" ><fmt:message key="tool.groups.open.button" /></a>
+				<div class="clearfix"></div>
+				
+				<p>${fn:length(toolLibrary)}&nbsp;<fmt:message key="sysadmin.library.totals" /></p>
+			</div>	
+				
 				<c:set var="displayToolManagement" value="false" />
 				<c:forEach var="dto" items="${toolLibrary}">
 					<c:if test="${dto.adminURL != null}">
 						<c:set var="displayToolManagement" value="true" />
 					</c:if>
 				</c:forEach>
 				
-				<table class="table table-striped table-condensed voffset10">
+				<table class="table table-striped table-bordered voffset10">
+					<thead class="thead-light">
 					<tr>
 						<th><fmt:message key="label.tool" /></th>
 						<th><fmt:message key="label.tool.version" /></th>
 						<th><fmt:message key="label.database.version" /></th>
-						<th style="padding-right: 15px"><fmt:message key="admin.user.actions" /></th>
+						<th class="text-center"><fmt:message key="admin.user.actions" /></th>
 					</tr>
+					</thead>
+					<tbody>
 					<c:forEach items="${toolLibrary}" var="dto">
 						<tr>
-							<td>
-								<strong><c:out value="${dto.activityTitle}" /></strong>
+							<td <c:if test="${learningLibraryValidity[dto.learningLibraryID] == 'false'}">class="table-danger"</c:if> >
+								<strong><c:out value="${dto.activityTitle}" escapeXml="true"/></strong>
+								<c:if test="${learningLibraryValidity[dto.learningLibraryID] == 'false'}">
+									<span class="badge badge-warning">Disabled</span> 
+								</c:if>
 								<br/>
-								<c:out value="${dto.description}" />
+								<c:out value="${dto.description}" escapeXml="true"/>
 							</td>
 							<td>
 								<c:out value="${toolVersions[dto.toolID]}" />
 							</td>
 							<td>
 								<c:out value="${dbVersions[dto.toolSignature]}" />
 							</td>
-							<td>
+							<td class="text-center d-flex">
 								<c:choose>
 									<c:when test="${learningLibraryValidity[dto.learningLibraryID]}">
-										<csrf:form style="display: inline-block;" id="disable${dto.activityTitle}" method="post" action="disable.do"><input type="hidden" name="libraryID" value="${dto.learningLibraryID}"/><input type="hidden" name="disable" value="false"/><input type="submit" class="btn btn-xs btn-primary" value="<fmt:message key="admin.disable" />"/></csrf:form>
+										<csrf:form style="display: inline-block;" id="disable${dto.activityTitle}" method="post" action="disable.do">
+											<input type="hidden" name="libraryID" value="${dto.learningLibraryID}"/>
+											<input type="hidden" name="disable" value="false"/>
+											<button type="submit" class="btn btn-sm btn-outline-secondary" title="<fmt:message key="admin.disable" />"/>
+												<i class="fa fa-eye-slash"></i>
+											</button>
+										</csrf:form>
 									</c:when>
 									<c:otherwise>
-										<csrf:form style="display: inline-block;" id="enable${dto.activityTitle}" method="post" action="enable.do"><input type="hidden" name="libraryID" value="${dto.learningLibraryID}"/><input type="hidden" name="enable" value="false"/><input type="submit" class="btn btn-success btn-xs" value="<fmt:message key="admin.enable" />"/></csrf:form>
+										<csrf:form style="display: inline-block;" id="enable${dto.activityTitle}" method="post" action="enable.do">
+											<input type="hidden" name="libraryID" value="${dto.learningLibraryID}"/>
+											<input type="hidden" name="enable" value="false"/>
+											<button type="submit" class="btn btn-sm btn-outline-success" title="<fmt:message key="admin.enable" />"/>
+												<i class="fa fa-eye"></i>
+											</button>
+										</csrf:form>
 										
 									</c:otherwise>
 								</c:choose>
@@ -99,15 +122,20 @@
 										<lams:LAMSURL /><c:out value="${dto.authoringURL}" />?toolContentID=${dto.toolContentID}&contentFolderID=-1"
 									</c:set>
 									&nbsp;
-									<a class="btn btn-xs btn-default" id="defaultContent${dto.activityTitle}" href="${editDefaultContentUrl}" target="_blank"><fmt:message key="sysadmin.edit.default.tool.content" /></a>
+									<a class="btn btn-sm btn-outline-primary" id="defaultContent${dto.activityTitle}" href="${editDefaultContentUrl}" target="_blank" title="<fmt:message key="sysadmin.edit.default.tool.content" />">
+										<i class="fa fa-pencil fa-wa"></i>
+									</a>
 									<c:if test="${(displayToolManagement == 'true') and (dto.adminURL != null)}">
 										&nbsp;
-										<a class="btn btn-xs btn-default" id="toolManagement${dto.activityTitle}" href="<lams:LAMSURL /><c:out value="${dto.adminURL}" />" ><fmt:message key="msg.tool.management" /></a>
+										<a title="<fmt:message key="msg.tool.management" />" class="btn btn-sm btn-outline-primary" id="toolManagement${dto.activityTitle}" href="<lams:LAMSURL /><c:out value="${dto.adminURL}" />" >
+											<i class="fa fa-cog fa-wa"></i>
+										</a>
 									</c:if>
 								</c:if>
 							</td>
 						</tr>
 					</c:forEach>
+					</tbody>
 				</table>
 				</p>
 	</lams:Page>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -read5d983137f06698c17843087000cb3545e7b34 -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision ead5d983137f06698c17843087000cb3545e7b34)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -54,6 +54,16 @@
     
 <body class="stripes">
 	<lams:Page type="admin" title="${title}">
+
+		<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 active" aria-current="page">${title}</li>
+		  </ol>
+		</nav>		
+
 				
 			<p>
 				<a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
@@ -198,6 +208,12 @@
 				<tbody>
 				</tbody>
 			</table> 
+		<hr>
+		<div class="pull-right">
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel"/>
+			</a>
+		</div>		
 	</lams:Page>
 </body>
 </lams:html>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -re2956cb8a072cc5ac9ceabaa9dac30c5750bf10b -r3e64defe6b8c56c0d3fd42203218e112e3745884
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision e2956cb8a072cc5ac9ceabaa9dac30c5750bf10b)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
@@ -13,9 +13,9 @@
 
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/admin.css" type="text/css" media="screen">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>/css/jquery.tablesorter.theme.bootstrap4.css">	
 	
-	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
+
 	<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
 	<style>
 		#tablesorter thead .disabled {
@@ -86,23 +86,23 @@
 								rows += 	orgData["lastName"];
 								rows += '</td>';
 	
-								rows += '<td>';
+								rows += '<td class="d-none d-lg-table-cell">';
 								rows += 	orgData["email"];
 								rows += '</td>';
 								
-								rows += '<td>';
-								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-xs" type="submit"><i class="fa fa-trash"/> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.delete"/></span></button></form>';
+								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 += 	'&nbsp;';
-								rows +=     '<form style="display: inline-block;" id="delete_' + 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-xs" type="submit"><i class="fa fa-pencil"/> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit"/></span></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-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-xs"><i class="fa fa-sign-in"/><span class="hidden-xs hidden-sm"> <fmt:message key="label.login.as"/></span></button>';
+								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 += 	'</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-xs"><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-primary btn-sm"><i class="fa fa-envelope"/> <span class="hidden-xs hidden-sm"><fmt:message key="label.email"/></span></button>';
 								rows += 	'</a>';
 								}
 								
@@ -141,36 +141,54 @@
 <body class="stripes">
 
 	<lams:Page type="admin" title="${title}">
-		<p><a href="<lams:LAMSURL/>admin/orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="sysadmin.maintain" /></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/orgmanage.do?org=1"><fmt:message key="admin.course.manage" /></a>
+		    </li>
+		    <li class="breadcrumb-item active" aria-current="page">${title}</li>
+		  </ol>
+		</nav>		
+	
+			
+		<p><input class="btn btn-primary btn-sm" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do'" />
 		
-		<p><input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do'" />
-		
 		<span class="pull-right">
-			<fmt:message key="admin.search" />:&nbsp;<input class="search form-control form-control-inline" type="search" name="term" data-column="1">
+			<label for="search"><fmt:message key="admin.search" /></label>:&nbsp;<input class="search form-control form-control-sm form-control-inline" type="search" id="search" name="term" data-column="1">
 		</span>
 		</p>
 		
-		<lams:TSTable numColumns="6"> 
+		<lams:TSTable numColumns="6"> 		
 			<th width="3%">
 				<fmt:message key="admin.user.userid"/>
 			</th>
-			<th width="15%" align="center">
+			<th>
 				<fmt:message key="admin.user.login"/>
 			</th>
-			<th width="15%" align="center">
+			<th>
 				<fmt:message key="admin.user.first_name"/>
 			</th>
-			<th width="15%" align="center">
+			<th>
 				<fmt:message key="admin.user.last_name"/>
 			</th>
-			<th width="15%" align="center">
+			<th class="d-none d-lg-table-cell">
 				<fmt:message key="admin.user.email"/>
 			</th>
-			<th width="20%" align="center">
+			<th class="text-center">
 				<fmt:message key="admin.user.actions"/>
 			</th>
 		</lams:TSTable>			
+		<hr>
+		<div class="pull-right">
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+				<fmt:message key="admin.cancel"/>
+			</a>
+		</div>		
 				
 	</lams:Page>