Index: lams_admin/web/WEB-INF/tags/Alert.tag
===================================================================
diff -u -r3e64defe6b8c56c0d3fd42203218e112e3745884 -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec
--- lams_admin/web/WEB-INF/tags/Alert.tag	(.../Alert.tag)	(revision 3e64defe6b8c56c0d3fd42203218e112e3745884)
+++ lams_admin/web/WEB-INF/tags/Alert.tag	(.../Alert.tag)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
@@ -31,7 +31,7 @@
 <div class="container">
 	<div class="row justify-content-md-center">
 		<div class="col-md-auto">
-			<div id="${idName}" class="alert alert-${alertType}" role="alert">
+			<div id="${idName}" class="alert alert-${alertType} shadow" role="alert">
 				<c:if test="${not empty title}">
 					<span class="fa fa-${iconType}"></span> <span class="alert-title font-weight-bold">${title}</span>
 					<hr class="alert-separator">
Index: lams_admin/web/WEB-INF/tags/Widget.tag
===================================================================
diff -u -rcd031f542f0bc641e1e5cf48ca7efd0a4a5819e3 -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec
--- lams_admin/web/WEB-INF/tags/Widget.tag	(.../Widget.tag)	(revision cd031f542f0bc641e1e5cf48ca7efd0a4a5819e3)
+++ lams_admin/web/WEB-INF/tags/Widget.tag	(.../Widget.tag)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
@@ -43,6 +43,9 @@
 	<c:set var="shadow">shadow-none</c:set>
 </c:if>
 
+<c:choose>
+	<c:when test="${type eq 'w1' }">
+
 	<div class="card mb-1 ${shadow}">
 	  <div class="row no-gutters">
 	    <div class="col-4 d-flex  bg-${style} border border-${style} align-items-center justify-content-center" style="border-bottom-left-radius: 0.25rem; border-top-left-radius: 0.25rem;">
@@ -58,4 +61,30 @@
 	      </c:if>
 	    </div>
 	  </div>
-	</div>
\ No newline at end of file
+	</div>
+	</c:when>
+	
+	
+	<c:when test="${type eq 'w2' }">
+	
+	<div class="card mb-1 ${shadow}">
+		<div class="card-body">
+			<span class="card-title"></span>
+	  <div class="row no-gutters">
+	    <div class="col-4 d-flex  bg-${style} border border-${style} align-items-center justify-content-center" style="border-bottom-left-radius: 0.25rem; border-top-left-radius: 0.25rem;">
+	      <i class="fa ${icon}" aria-hidden="true"></i>
+	    </div>
+	    <div class="col-8">
+	      <div class="card-body m-0">
+	        <div class="card-text ${titleAlignment}">${title}</div>
+	        <div class="card-text ${bodyTextAlignment}" style="font-size: ${bodyTextFontSize}"><c:out value="${bodyText}" escapeXml="true" /></div>
+	      </div>
+	      <c:if test="{not empty footerText}">
+	      <div class="card-footer">${footerText}</div>
+	      </c:if>
+	    </div>
+	  </div>
+	</div>
+	</c:when>	
+	
+</c:choose>	
\ No newline at end of file
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -re090b2b85b2a9385d2498fd3c140865833c30a9a -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision e090b2b85b2a9385d2498fd3c140865833c30a9a)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
@@ -227,20 +227,20 @@
 				        <div class="col-lg-4">
 
 			                <c:set var="title"><fmt:message key="heading.users"/></c:set>
-							<lams:Widget type="123" style="warning" shadow="shadow" icon="fa-3x fa-users text-white" title="${title}" titleAlignment="text-right" bodyText="${totalUsers}" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+							<lams:Widget type="w1" style="warning" shadow="shadow" icon="fa-3x fa-users text-white" title="${title}" titleAlignment="text-right" bodyText="${totalUsers}" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
 			                
 
 				        </div>
 				        <div class="col-lg-4">
 
 			                <c:set var="title"><fmt:message key='admin.statistics.lessons'/></c:set>
-			                <lams:Widget type="123" style="danger" shadow="shadow" icon="fa-3x fa-book text-white" title="${title}" titleAlignment="text-right" bodyText="#" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+			                <lams:Widget type="w1" style="danger" shadow="shadow" icon="fa-3x fa-book text-white" title="${title}" titleAlignment="text-right" bodyText="#" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
 
 				        </div>
 				        <div class="col-lg-4">
 				        
 				        	<c:set var="title"><fmt:message key="label.subgroups"/></c:set>
-				        	<lams:Widget type="123" shadow="shadow" icon="fa-3x fa-graduation-cap text-white" title="${title}" titleAlignment="text-right text-capitalize" bodyText="#" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+				        	<lams:Widget type="w1" shadow="shadow" icon="fa-3x fa-graduation-cap text-white" title="${title}" titleAlignment="text-right text-capitalize" bodyText="#" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
 				        
 				        </div>
 				    </div>		
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1 -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
@@ -183,25 +183,8 @@
 	<form:form id="userForm" action="../usersave/saveUserDetails.do" modelAttribute="userForm" method="post">
 				<input type="hidden" name="<csrf:tokenname/>" value="<csrf:tokenvalue/>"/>
 				<form:hidden path="orgId" />
-				<form:hidden path="userId" />
-
-				<c:if test="${not empty userForm.orgId}">
-					<c:if test="${not empty pOrgId}">
-						: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default">
-							<c:out value="${parentName}" />
-						  </a>
-						: <a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
-							<c:out value="${orgName}" />
-						  </a>
-					</c:if>
-					<c:if test="${empty pOrgId}">
-						: <a href="<lams:LAMSURL/>admin/orgmanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
-							<c:out value="${orgName}" />
-						  </a>
-					</c:if>
-				</c:if>
+				<form:hidden path="userId" />						
 						
-						
 				<c:if test="${empty userForm.userId}">
 					<lams:Alert type="info" id="passwordConditions" close="false">
 					<fmt:message key='label.password.must.contain' />:
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r9a552b5a8e97791ff08857c0241c7ad46ebf71a1 -r92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 9a552b5a8e97791ff08857c0241c7ad46ebf71a1)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 92aac4e72f24ed4acb100dd5365a6b79b8c9a0ec)
@@ -71,77 +71,91 @@
 
 	<lams:Page type="admin" title="${title}" breadcrumbItems="${breadcrumbItems}" >
 							
-			<div class="panel panel-default mt-2" >
-				<div id="courseHeading" class="panel-heading">
-					<span class="panel-title">
+		<section id="userDetails" class="pl-3 pr-3">	
+			<div class="row bg-light text-dark pt-2 pb-2">
+				<div class="col-12">
+				
+				<div class="pull-right btn-group btn-group-sm">
+					<a id="addRemoveUsers" class="btn btn-outline-secondary btn-sm" type="button" href="<lams:LAMSURL/>admin/userorg.do?orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.add"/></a>
+					<c:if test="${((userManageForm.canResetOrgPassword == true) && (orgType != 1))}">
+						<a id="passwordReset" class="btn  btn-outline-secondary btn-sm" href="<lams:LAMSURL/>admin/orgPasswordChange/start.do?organisationID=${userManageForm.orgId}"><fmt:message key='admin.org.password.change.button'/></a>
+					</c:if>
+					<c:if test="${userManageForm.courseAdminCanAddNewUsers == true}">
+						<a class="btn btn-outline-secondary btn-sm" type="button" href="<lams:LAMSURL/>admin/user/edit.do?orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.create"/></a>
+					</c:if>
+				</div>
+				<h2>
 						<c:if test="${orgType == 1}">
 							<fmt:message key="admin.global.roles.manage" />
 						</c:if>
 						<c:if test="${orgType != 1}">
 							<c:out value="${heading}" />
 						</c:if>
-					</span>
-					<div class="pull-right btn-group btn-group-sm">
-						<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick="javascript:document.location='<lams:LAMSURL/>admin/userorg.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
-						<c:if test="${userManageForm.canResetOrgPassword == true}">
-							<a class="btn btn-default" href="<lams:LAMSURL/>admin/orgPasswordChange/start.do?organisationID=${userManageForm.orgId}"><fmt:message key='admin.org.password.change.button'/></a>
-						</c:if>
-						<c:if test="${userManageForm.courseAdminCanAddNewUsers == true}">
-							<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='<lams:LAMSURL/>admin/user/edit.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
-						</c:if>
-					</div>
+				</h2>
+				
+				<c:choose>
+					<c:when test="${orgType != 1 }">
+
+				    <div class="row mt-5">
+				        <div class="col-md-6 col-lg-3">
+
+			                <c:set var="title"><fmt:message key='label.learners'/></c:set>
+			                <lams:Widget type="w1" style="info" shadow="shadow" icon="fa-3x fa-graduation-cap text-white" title="${title}" titleAlignment="text-right" bodyText="${LEARNER}" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+
+				        </div>
+				        <div class="col-md-6 col-lg-3">
+
+			                <c:set var="title"><fmt:message key='label.authors'/></c:set>
+			                <lams:Widget type="w1" style="success" shadow="shadow" icon="fa-3x fa-pencil text-white" title="${title}" titleAlignment="text-right" bodyText="${AUTHOR}" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+
+				        </div>
+				        <div class="col-md-6 col-lg-3">
+
+			                <c:set var="title"><fmt:message key='label.monitors'/></c:set>
+			                <lams:Widget type="w1" style="warning" shadow="shadow" icon="fa-3x fa-thermometer-full text-white" title="${title}" titleAlignment="text-right" bodyText="${MONITOR}" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+
+				        </div>
+				        <div class="col-md-6 col-lg-3">
+
+			                <c:set var="title"><fmt:message key='label.group.managers'/></c:set>
+			                <lams:Widget type="w1" style="danger" shadow="shadow" icon="fa-3x fa-user-secret text-white" title="${title}" titleAlignment="text-right" bodyText="${GROUP_MANAGER}" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+
+				        </div>
+				    </div>	
+				    <div class="row m-3 font-weight-bold">
+				    	<c:out value="${numUsers}"/>
+				    </div>
+					</c:when>
+					<c:otherwise>
+					  <div class="row mt-5 mb-5 justify-content-center">
+					    <div class="col-4 text-center">
+					      	<c:set var="title"><fmt:message key="label.sysadmins"/></c:set>
+			                <lams:Widget type="w1" style="primary" shadow="shadow" icon="fa-3x fa-user-secret text-white" title="${title}" titleAlignment="text-right" bodyText="${SYSADMIN}" bodyTextFontSize="x-large" bodyTextAlignment="text-right"/>
+					      
+					    </div>
+					  </div>					
+					</c:otherwise>
+				</c:choose>				    	
+				
 				</div>
+			</div>		
+
 			
-				<c:if test="${orgType != 1}">
-				<table class="table table-condensed table-striped">
+			<div class="row">
+				<div class="col mt-5">
+				
+				<h3><fmt:message key="heading.users"/></h3>
+				
+				
+			<table class="tablesorter ">
+				<thead class="thead-light">
 					<tr>
-						<td width="30%"><fmt:message key="label.learners"/>:</td>
-						<td><c:out value="${LEARNER}"/></td>
+						<th scope="col"><fmt:message key="admin.user.login"/></th>
+						<th scope="col"><fmt:message key="admin.user.first_name"/></th>
+						<th scope="col"><fmt:message key="admin.user.last_name"/></th>
+						<th scope="col"><fmt:message key="admin.user.roles"/></th>
+						<th scope="col"><fmt:message key="admin.user.actions"/></th>
 					</tr>
-					<tr>
-						<td><fmt:message key="label.group.managers"/>:</td>
-						<td><c:out value="${GROUP_MANAGER}"/></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="label.monitors"/>:</td>
-						<td><c:out value="${MONITOR}"/></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="label.authors"/>:</td>
-						<td><c:out value="${AUTHOR}"/></td>
-					</tr>
-					<tr>
-						<td colspan="2">
-							<c:out value="${numUsers}"/>
-						</td>
-					</tr>
-				</table>
-				</c:if>
-					
-				<c:if test="${orgType == 1}">
-				<table class="table table-condensed table-striped">
-					<tr>
-						<td width="30%"><fmt:message key="label.sysadmins"/>:</td>
-						<td><c:out value="${SYSADMIN}"/></td>
-					</tr>
-					<tr>
-						<td colspan="2">
-							<c:out value="${numUsers}"/>
-						</td>
-					</tr>
-				</table>
-				</c:if>
-			</div>
-			
-			<table class="tablesorter">
-				<thead>
-					<tr>
-						<th><fmt:message key="admin.user.login"/></th>
-						<th><fmt:message key="admin.user.first_name"/></th>
-						<th><fmt:message key="admin.user.last_name"/></th>
-						<th><fmt:message key="admin.user.roles"/></th>
-						<th><fmt:message key="admin.user.actions"/></th>
-					</tr>
 				</thead>
 				<tbody>
 				<c:forEach var="userManageBean" items="${userManageForm.userManageBeans}">
@@ -209,13 +223,17 @@
 				</tfoot>
 				<tbody>
 				</tbody>
-			</table> 
+			</table>
+				</div>
+			</div>
+			 
 		<hr>
 		<div class="pull-right">
-			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-outline-secondary btn-sm">
+			<a href="javascript:history.go(-1)" class="btn btn-outline-secondary btn-sm">
 				<fmt:message key="admin.cancel"/>
 			</a>
-		</div>		
+		</div>
+		</section>				
 	</lams:Page>
 </body>
 </lams:html>