Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r37bb2ae017713b44cdfd6a55cfceca28c3efab02 -read5d983137f06698c17843087000cb3545e7b34
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 37bb2ae017713b44cdfd6a55cfceca28c3efab02)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision ead5d983137f06698c17843087000cb3545e7b34)
@@ -31,7 +31,6 @@
 	<script src="${lams}includes/javascript/jquery.tablesorter-pager.js" type="text/javascript"></script>
 	<script>
 		$(document).ready(function() {
-			
 			$(".tablesorter").tablesorter({
 				widthFixed:true,
 				theme: 'bootstrap',
@@ -159,18 +158,18 @@
 						    </small>
 						</td>
 						<td>
-								<c:if test="${userManageForm.canEditRole == true }">
-                                    <a title="<fmt:message key="admin.user.assign.roles"/>" href="<lams:LAMSURL/>admin/userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-users"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.assign.roles"/></span></button></a>
-									&nbsp;
-								</c:if>
-								<c:if test="${userManageForm.courseAdminCanAddNewUsers == true }">
-                                    <a title="<fmt:message key="admin.edit" />" href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-pencil"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit" /></span></button></a>
-									&nbsp;
-								</c:if>
-								<c:if test="${canDeleteUser == true}">
-                                    <a title="<fmt:message key="admin.user.delete"/>" href="<lams:LAMSURL/>admin/user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-danger btn-xs"><i class="fa fa-trash"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.delete"/></span></button></a>
-								</c:if>
-								<br/>
+							<c:if test="${userManageForm.canEditRole}">
+                            	<a title="<fmt:message key="admin.user.assign.roles"/>" href="<lams:LAMSURL/>admin/userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-users"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.assign.roles"/></span></button></a>
+								&nbsp;
+							</c:if>
+							<c:if test="${userManageForm.courseAdminCanAddNewUsers}">
+                            	<a title="<fmt:message key="admin.edit" />" href="<lams:LAMSURL/>admin/user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-primary btn-xs"><i class="fa fa-pencil"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.edit" /></span></button></a>
+								&nbsp;
+							</c:if>
+							<c:if test="${canDeleteUser}">
+                            	<a title="<fmt:message key="admin.user.delete"/>" href="<lams:LAMSURL/>admin/user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><button type="button" class="btn btn-danger btn-xs"><i class="fa fa-trash"></i> <span class="hidden-xs hidden-sm"><fmt:message key="admin.user.delete"/></span></button></a>
+							</c:if>
+							<br/>
 						</td>		
 					</tr>
 				</c:forEach>