Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -r430f979ac0574e45242bd6e3df353d8592276121 -r1f1bb1b83fb895d3a1ca169a9053cc5a00e99003
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 430f979ac0574e45242bd6e3df353d8592276121)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 1f1bb1b83fb895d3a1ca169a9053cc5a00e99003)
@@ -142,9 +142,8 @@
 	</logic:notEmpty>
 	<tr>
 		<td colspan=2 class="align-right">
-			<html-el:submit styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
-			<html-el:reset styleClass="button"><fmt:message key="admin.reset"/></html-el:reset>
-			<html-el:cancel styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
+			<html-el:submit styleId="saveButton" styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
+			<html-el:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
 		</td>
 	</tr>
 </table>
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r1f1bb1b83fb895d3a1ca169a9053cc5a00e99003
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 1f1bb1b83fb895d3a1ca169a9053cc5a00e99003)
@@ -112,13 +112,13 @@
 	</p>
 	
 	<div class="floatRight">
-		<input class="button" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+		<input id="manageUsers" class="button" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
 	</div>
 	<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 	
 	<% if (request.isUserInRole(Role.SYSADMIN)) { %>
 	<div class="floatRight">
-		<input class="button" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
+		<input id="closeLessons" class="button" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
 	</div>
 	<p style="padding-top:10px;">&nbsp;</p>
 	<% } %>
@@ -129,7 +129,7 @@
 			<c:param name="typeId" value="3" />
 			<c:param name="parentId" value="${OrgManageForm.parentId}" />
 		</c:url>
-		<input class="button" type="button" value="<fmt:message key="admin.class.add"/>" onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
+		<input id="createNewSubcourse" class="button" type="button" value="<fmt:message key="admin.class.add"/>" onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
 	</div>
 	</form>
 	<html:form styleClass="indentPad" action="orgmanage.do" method="post">
@@ -205,7 +205,7 @@
 <table class=tablesorter-admin width=100%>
 	<thead>
 	<tr>
-		<th>Id</th>
+		<th id="idsorter">Id</th>
 		<th><fmt:message key="admin.organisation.name"/></th>
 		<th><fmt:message key="admin.organisation.code"/></th>
 		<th><fmt:message key="admin.organisation.description"/></th>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc -r1f1bb1b83fb895d3a1ca169a9053cc5a00e99003
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 5e39743e8bd500d0e121cf4c95b9c9fc77eb80fc)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 1f1bb1b83fb895d3a1ca169a9053cc5a00e99003)
@@ -87,7 +87,7 @@
 <form>
 	
 <p>
-	<input class="button" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
+	<input id="addRemoveUsers" class="button" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<bean:write name="UserManageForm" property="orgId"/>' />
 </p>
 
 <div class="floatRight">
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -rf9d27ac99a632bb295818fa2576ae95622b76142 -r1f1bb1b83fb895d3a1ca169a9053cc5a00e99003
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision f9d27ac99a632bb295818fa2576ae95622b76142)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 1f1bb1b83fb895d3a1ca169a9053cc5a00e99003)
@@ -185,8 +185,8 @@
 <div id="form" class="floatRight">
 	<html:form action="userorgsave.do" method="post">
 		<html:hidden property="orgId" />
-		<html:submit styleClass="button" onclick="return populateForm();"><fmt:message key="label.next"/></html:submit>
-		<html:cancel styleClass="button"><fmt:message key="admin.cancel"/></html:cancel>
+		<html:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html:cancel>
+		<html:submit styleId="nextButton" styleClass="button" onclick="return populateForm();"><fmt:message key="label.next"/></html:submit>
 	</html:form>
 </div>
 
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a -r1f1bb1b83fb895d3a1ca169a9053cc5a00e99003
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 1f1bb1b83fb895d3a1ca169a9053cc5a00e99003)
@@ -47,17 +47,16 @@
 		</td>
 		<logic:iterate id="role" name="roles">
 			<td>
-				<html-el:multibox property="userBeans[${beanIndex}].roleIds" value="${role.roleId}" />&nbsp;
+				<html-el:multibox styleId="${userBean.login}Role${role.roleId}" property="userBeans[${beanIndex}].roleIds" value="${role.roleId}" />&nbsp;
 			</td>
 		</logic:iterate>
 	</tr>
 </logic:iterate>
 <tr>
 	<td></td>
 	<td colspan=<c:out value="${numroles}" /> class="align-right">
-		<html-el:submit styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
-		<html-el:reset styleClass="button"><fmt:message key="admin.reset"/></html-el:reset>
-		<html-el:cancel styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
+		<html-el:cancel styleId="cancelButton" styleClass="button"><fmt:message key="admin.cancel"/></html-el:cancel>
+		<html-el:submit styleId="saveButton"   styleClass="button"><fmt:message key="admin.save"/></html-el:submit>
 	</td>
 </tr>
 </table>