Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java	(.../ToolContentListController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java	(.../ToolContentListController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -53,6 +53,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -81,7 +82,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 	// check permission
 	if (!(request.isUserInRole(Role.SYSADMIN))) {
@@ -217,7 +218,7 @@
     /**
      * Loads groups and libraries and displays the management dialog.
      */
-    @RequestMapping("/openLearningLibraryGroups")
+    @RequestMapping(path = "/openLearningLibraryGroups", method = RequestMethod.POST)
     public String openLearningLibraryGroups(HttpServletRequest request) throws IOException {
 	// build full list of available learning libraries
 	List<LearningLibraryDTO> learningLibraries = getLearningDesignService()
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java	(.../UserBasicListController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserBasicListController.java	(.../UserBasicListController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -41,6 +41,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -58,7 +59,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/user/basiclist")
+    @RequestMapping(path = "/user/basiclist", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 
 	UserBasicListController.service = AdminServiceProxy.getService(applicationContext.getServletContext());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -46,6 +46,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -71,7 +72,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/usermanage")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String execute(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
@@ -130,7 +131,7 @@
 	List<UserManageBean> userManageBeans = service.getUserManageBeans(orgId);
 	Collections.sort(userManageBeans);
 	userManageForm.setUserManageBeans(userManageBeans);
-	request.setAttribute("UserManageForm", userManageForm);
+	request.setAttribute("userManageForm", userManageForm);
 
 	// heading
 	String[] args = { orgName };
@@ -162,7 +163,7 @@
 	return "userlist";
     }
 
-    @RequestMapping("/forwardError")
+    @RequestMapping(path = "/forwardError", method = RequestMethod.POST)
     private String forwardError(HttpServletRequest request, String key) {
 	request.setAttribute("errorName", "UserManageAction");
 	request.setAttribute("errorMessage", messageService.getMessage(key));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -36,6 +36,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -63,7 +64,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/userorg")
+    @RequestMapping(path = "/userorg", method = RequestMethod.POST)
     public String execute(@ModelAttribute UserOrgForm userOrgForm, HttpServletRequest request) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -43,6 +43,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -71,7 +72,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/userorgrole")
+    @RequestMapping(path = "/userorgrole", method = RequestMethod.POST)
     public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, HttpServletRequest request)
 	    throws Exception {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -92,7 +92,7 @@
 	request.getSession().removeAttribute("UserOrgRoleForm");
 
 	if (request.getAttribute("CANCEL") != null) {
-	    return "forward:/usermanage.do";
+	    return "redirect:/usermanage.do";
 	}
 
 	// save UserOrganisation memberships, and the associated roles;
@@ -108,7 +108,7 @@
 		errorMap.add("roles", adminMessageService.getMessage("error.roles.empty"));
 		request.setAttribute("errorMap", errorMap);
 		request.setAttribute("orgId", orgId);
-		return "forward:/userorg.do";
+		return "redirect:/userorg.do";
 	    }
 	    service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roleIds));
 	    // FMALIKOFF 5/7/7 Commented out the following code that set the roles in the course if the current org is a class, as the logic
@@ -119,7 +119,7 @@
 	    //	}
 	    //}
 	}
-	return "forward:/usermanage.do";
+	return "redirect:/usermanage.do";
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -77,7 +77,7 @@
 	request.setAttribute("org", orgId);
 
 	if (request.getAttribute("CANCEL") != null) {
-	    return "forward:/usermanage.do";
+	    return "redirect:/usermanage.do";
 	}
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
@@ -134,13 +134,13 @@
 	// if no new users, then finish; otherwise forward to where roles can be assigned for new users.
 	if (newUserOrganisations.isEmpty()) {
 	    log.debug("no new users to add to orgId=" + orgId);
-	    return "forward:/usermanage.do";
+	    return "redirect:/usermanage.do";
 	} else {
 	    request.setAttribute("roles", service.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN),
 		    organisation.getOrganisationType()));
 	    request.setAttribute("newUserOrganisations", newUserOrganisations);
 	    request.setAttribute("orgId", orgId);
-	    return "forward:/userorgrole.do";
+	    return "redirect:/userorgrole.do";
 	}
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -43,6 +43,7 @@
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -69,7 +70,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/userrolessave")
+    @RequestMapping(path = "/userrolessave", method = RequestMethod.POST)
     public String execute(@ModelAttribute UserRolesForm userRolesForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -88,7 +89,7 @@
 	request.setAttribute("org", orgId);
 
 	if (request.getAttribute("CANCEL") != null) {
-	    return "forward:/usermanage.do";
+	    return "redirect:/usermanage.do";
 	}
 
 	log.debug("userId: " + userId + ", orgId: " + orgId + " will have " + roles.length + " roles");
@@ -107,7 +108,7 @@
 
 	service.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles));
 
-	return "forward:/usermanage.do";
+	return "redirect:/usermanage.do";
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -114,10 +114,10 @@
 
 	if (request.getAttribute("CANCEL") != null) {
 	    if ((orgId == null) || (orgId == 0)) {
-		return "forward:/usersearch.do";
+		return "redirect:/usersearch.do";
 	    }
 	    request.setAttribute("org", orgId);
-	    return "forward:/usermanage.do";
+	    return "redirect:/usermanage.do";
 	}
 
 	User user = null;
@@ -233,20 +233,20 @@
 
 	if (errorMap.isEmpty()) {
 	    if ((orgId == null) || (orgId == 0)) {
-		return "forward:/usersearch.do";
+		return "redirect:/usersearch.do";
 	    }
 	    if (edit) {
 		request.setAttribute("org", orgId);
-		return "forward:/usermanage.do";
+		return "redirect:/usermanage.do";
 	    } else {
 		request.setAttribute("orgId", orgId);
 		request.setAttribute("userId", user.getUserId());
-		return "forward:/userroles.do";
+		return "redirect:/userroles.do";
 	    }
 	} else {
 	    request.setAttribute("errorMap", errorMap);
 	    request.setAttribute("orgId", orgId);
-	    return "/user/edit.do";
+	    return "redirect:/user/edit.do";
 	}
     }
 
@@ -287,7 +287,7 @@
 	    user.setSalt(salt);
 	    user.setPassword(passwordHash);
 	    UserSaveController.service.saveUser(user);
-	    return "forward:/user/edit.do";
+	    return "redirect:/user/edit.do";
 	}
 	request.setAttribute("errorMap", errorMap);
 	return "userChangePass";
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java	(.../UserSearchSingleTermController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchSingleTermController.java	(.../UserSearchSingleTermController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -41,6 +41,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -58,7 +59,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/user/searchsingle")
+    @RequestMapping(path = "/user/searchsingle", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 
 	UserSearchSingleTermController.service = AdminServiceProxy.getService(applicationContext.getServletContext());
Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -32,8 +32,8 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
@@ -123,11 +123,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -284,42 +283,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_admin/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -42,23 +42,21 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}"/>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}"/>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
 					</c:if>
 				</c:if>
 			</c:if>
-			<c:if test="${empty toolSessionId}">
-				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:if test="${empty toolSessionId and not empty formID}">
+				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
@@ -434,4 +435,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
+</c:choose>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_admin/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_admin/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_admin/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_admin/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<html:hidden property="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -104,28 +104,6 @@
 		</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-	
-	<servlet>
-		<servlet-name>action</servlet-name>
-		<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-		<init-param>
-			<param-name>config</param-name>
-			<param-value>/WEB-INF/struts-config.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>debug</param-name>
-			<param-value>999</param-value>
-		</init-param>
-		<init-param>
-			<param-name>detail</param-name>
-			<param-value>2</param-value>
-		</init-param>
-		<init-param>
-			<param-name>validate</param-name>
-			<param-value>true</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
 
 	<servlet>
 		<servlet-name>Connector</servlet-name>
Index: lams_admin/web/remove.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/remove.jsp	(.../remove.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/remove.jsp	(.../remove.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -4,8 +4,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title"><tiles:getAsString name="title"/></c:set>
-	<c:set var="title"><fmt:message key="${title}"/></c:set>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -16,17 +15,9 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><tiles:getAsString name="subtitle" ignore="true"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
-	
-	<c:set var="help"><tiles:getAsString name='help'  ignore="true"/></c:set>
-	<c:choose>
-		<c:when test="${not empty help}">
-			<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
-				<form>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+		<form>
 
 				<c:if test="${empty orgId}">
 					<c:url var="cancel" value="usersearch.do" />
@@ -83,79 +74,11 @@
 						</div>
 					</div>
 				</c:if>
-				</form>
+		</form>
 				
-				<div id="footer"/>
-			</lams:Page>
-		</c:when>
-		<c:otherwise>
-			<lams:Page type="admin" title="${title}" >
-				
-			<form>
-
-			<c:if test="${empty orgId}">
-				<c:url var="cancel" value="usersearch.do" />
-			</c:if>
-			<c:if test="${not empty orgId}">
-				<c:url var="cancel" value="usermanage.do">
-					<c:param name="org" value="${orgId}" />
-				</c:url>
-			</c:if>
-			
-			<c:if test="${method == disable}">
-				<div class="panel panel-default" >
-					<div class="panel-heading">
-						<span class="panel-title">
-							<fmt:message key="admin.user.disable"/>
-						</span>
-					</div>
-					<div class="panel-body">     
-						<p>
-							<fmt:message key="msg.disable.user.1"/>&nbsp;&nbsp;
-							<fmt:message key="msg.disable.user.2"/>&nbsp;&nbsp;
-							<fmt:message key="msg.disable.user.3"/><br />
-							<fmt:message key="msg.disable.user.4"/>
-						</p>
-						<c:url var="disableaction" value="user/disable.do">
-							<c:param name="userId" value="${userId}" />
-							<c:param name="orgId" value="${orgId}" />
-						</c:url>
-						<div class="pull-right">
-							<input class="btn btn-primary" type="button" value="Disable" onClick="javascript:document.location='<c:out value="${disableaction}"/>'" />
-							<input class="btn btn-default" type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
-						</div>
-					</div>
-				</div>	
-			</c:if>
-			
-			<c:if test="${method == delete}">
-				<div class="panel panel-default" >
-					<div class="panel-heading">
-						<span class="panel-title">
-							<fmt:message key="admin.user.delete"/>
-						</span>
-					</div>
-					<div class="panel-body">     
-						<p><fmt:message key="msg.delete.user.1"/>&nbsp;&nbsp;<fmt:message key="msg.delete.user.2"/></p>
-						<c:url var="deleteaction" value="user/delete.do">
-								<c:param name="userId" value="${userId}" />
-								<c:param name="orgId" value="${orgId}" />
-							</c:url>
-						<div class="pull-right">
-							<input class="btn btn-default" type="button" value="Delete" onClick="javascript:document.location='<c:out value="${deleteaction}"/>'" />
-							<input class="btn btn-default" type="button" value="Cancel" onClick="javascript:document.location='<c:out value="${cancel}"/>'" />
-						</div>
-					</div>
-				</div>
-			</c:if>
-			</form>
-			
-			<div id="footer"/>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+	<div id="footer"/>
+	</lams:Page>
+		
 </body>
 </lams:html>
 
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -4,8 +4,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title" value="${sysadmin.tool.management}"/>
-	<c:set var="title"><fmt:message key="${title}"/></c:set>
+	<c:set var="title"><fmt:message key="sysadmin.tool.management"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -50,16 +49,9 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><tiles:getAsString name="subtitle" ignore="true"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
 	
-	<c:set var="help"><tiles:getAsString name='help'  ignore="true"/></c:set>
-	<c:choose>
-		<c:when test="${not empty help}">
-			<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<c:set var="title"><fmt:message key="sysadmin.tool.management"/></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>
 
 				<h1><fmt:message key="sysadmin.tool.management" /></h1>
@@ -139,95 +131,7 @@
 					</c:forEach>
 				</table>
 				</p>
-			</lams:Page>
-		
-		</c:when>
-		<c:otherwise>
-			
-			<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>
+	</lams:Page>
 
-				<h1><fmt:message key="sysadmin.tool.management" /></h1>
-				
-				<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 id="toolGroupsDialog" style="display: none">
-						<a class="customDialogButton" href="javascript:saveToolGroups()" style="right: 50px;">
-							<fmt:message key="admin.save" />
-						</a>
-						<iframe id="toolGroupsFrame" style="border: none; width: 100%; height: 100%"></iframe>
-					</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">
-					<tr>
-						<th><fmt:message key="label.tool" /></th>
-						<th><fmt:message key="sysadmin.library.activity.description" /></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>
-					</tr>
-					<c:forEach items="${toolLibrary}" var="dto">
-						<tr>
-							<td>
-								<c:out value="${dto.activityTitle}" />
-							</td>
-							<td>
-								<c:out value="${dto.description}" />
-							</td>
-							<td>
-								<c:out value="${toolVersions[dto.toolID]}" />
-							</td>
-							<td>
-								<c:out value="${dbVersions[dto.toolSignature]}" />
-							</td>
-							<td>
-								<c:choose>
-									<c:when test="${learningLibraryValidity[dto.learningLibraryID]}">
-										[<a id="disable${dto.activityTitle}" href="<c:url value='toolcontentlist/disable.do?libraryID=${dto.learningLibraryID}' />"><fmt:message key="admin.disable" /></a>] 
-									</c:when>
-									<c:otherwise>
-										[<a id="enable${dto.activityTitle}" href="<c:url value='toolcontentlist/enable.do?libraryID=${dto.learningLibraryID}'/>"><fmt:message key="admin.enable" /></a>]
-									</c:otherwise>
-								</c:choose>
-								<c:if test="${not empty dto.toolContentID}">
-									<c:set var="editDefaultContentUrl">
-										<lams:LAMSURL /><c:out value="${dto.authoringURL}" />?toolContentID=<c:out value="${dto.toolContentID}" />&contentFolderID=-1"
-									</c:set>
-									[<a id="defaultContent${dto.activityTitle}" href="${editDefaultContentUrl}" target="_blank"><fmt:message key="sysadmin.edit.default.tool.content" /></a>]
-									<c:if test="${(displayToolManagement == 'true') and (dto.adminURL != null)}">
-										&nbsp;&nbsp;
-										[<a id="toolManagement${dto.activityTitle}" href="<lams:LAMSURL /><c:out value="${dto.adminURL}" />"><fmt:message key="msg.tool.management" /></a>]
-									</c:if>
-								</c:if>
-							</td>
-						</tr>
-					</c:forEach>
-				</table>
-				</p>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
 </body>
 </lams:html>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -7,8 +7,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title"><tiles:getAsString name="title"/></c:set>
-	<c:set var="title"><fmt:message key="${title}"/></c:set>
+	<c:set var="title"><fmt:message key="admin.user.entry"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -154,16 +153,12 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><tiles:getAsString name="subtitle" ignore="true"/></c:set>	
+	<c:set var="subtitle"><fmt:message key="admin.user.edit"/></c:set>	
 	<c:if test="${not empty subtitle}">
 		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
 	</c:if>
 	
-	<c:set var="help"><tiles:getAsString name='help'  ignore="true"/></c:set>
-	<c:choose>
-		<c:when test="${not empty help}">
-			<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 				<form:form id="userForm" action="saveUserDetails.do" modelAttribute="userForm" method="post">
 				<form:hidden path="userId" />
 				<form:hidden path="orgId" />
@@ -478,7 +473,7 @@
 							</div>
 						</c:if>
 						<div class="pull-right">
-							<input type="submit" name="org.apache.struts.taglib.html.CANCEL" value="<fmt:message key="admin.cancel" />" 
+							<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel" />" 
 									formnovalidate="formnovalidate" onclick="bCancel=true;" id="cancelButton" class="btn btn-default"/>
 							<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 						</div>
@@ -565,417 +560,8 @@
 			
 			</form:form>
 
-			</lams:Page>
-		</c:when>
-		<c:otherwise>
-			<lams:Page type="admin" title="${title}" >
-				
-			<form:form id="userForm" action="saveUserDetails.do" modelAttribute="userForm" method="post">
-				<form:hidden path="userId" />
-				<form:hidden path="orgId" />
-			
-				<c:if test="${not empty userForm.orgId}">
-					<a href="orgmanage.do?org=1" class="btn btn-default">
-						<fmt:message key="admin.course.manage" />
-					</a>
-					<c:if test="${not empty pOrgId}">
-						: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default">
-							<c:out value="${parentName}" />
-						  </a>
-						: <a href="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="orgmanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
-							<c:out value="${orgName}" />
-						  </a>
-					</c:if>
-				</c:if>
-			
-				<c:if test="${empty userForm.orgId}">
-					<a href="orgmanage.do?org=1" class="btn btn-default">
-						<fmt:message key="admin.course.manage" />
-					</a>
-				</c:if>
-			
-				<%-- Error Messages --%>
-				<c:set var="errorKey" value="GLOBAL" />
-			        <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
-			            <lams:Alert id="error" type="danger" close="false">
-			                <c:forEach var="error" items="${errorMap[errorKey]}">
-			                    <c:out value="${error}" />
-			                </c:forEach>
-			            </lams:Alert>
-			        </c:if
-			
-				<div class="panel panel-default voffset5">
-					<div class="panel-heading">
-						<span class="panel-title"> <c:if test="${not empty userForm.userId}>
-								<fmt:message key="admin.user.edit" />
-							</c:if> <c:if test="${empty userForm.userId}">
-								<fmt:message key="admin.user.create" />
-							</c:if>
-						</span>
-					</div>
-			
-					<div class="panel-body">
-					    <div class="row">
-						<div class="col-md-12">
-						
-							<c:if test="${empty userForm.userId}">
-							<lams:Alert type="info" id="passwordConditions" close="false">
-							<fmt:message key='label.password.must.contain' />:
-								<ul class="list-unstyled" 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>
-						</c:if>
-					</div>
-					</div>
-					
-					<!--  Main panel. Do not show portrait area for new user. -->
-					<c:if test="${not empty userForm.userId}">
-				    <div class="row">
-					<div class="col-md-3">
-			    			<div class="text-center"><div id="portraitPicture" ></div></div>
-						<c:if test="${isSysadmin}">
-			    			<div id="portraitButton" class="text-center voffset10" style="display:none; margin-bottom: 5px;">
-			    			<a href="#" onclick="javascript:deletePortrait();" class="btn btn-primary btn-sm"><fmt:message key="label.delete.portrait" /></a></div>
-			    			</c:if>
-			    		</div>
-					<div class="col-md-9">
-					</c:if>
-					<c:if test="${empty userForm.userId}">
-				    <div class="row">
-					<div class="col-md-12">
-					</c:if>
-					
-						<table class="table table-condensed table-no-border">
-							<tr>
-								<td class="align-right"><fmt:message key="admin.user.login" />
-									*:</td>
-								<td><input type="text" id="login" name="login"  maxlength="50"
-										class="form-control" /></td>
-							</tr>
-							<c:if test="${empty userForm.userId}">
-							<tr>
-								<td class="align-right"><fmt:message key="admin.user.password" />
-									*:</td>
-								<td><input type="password" name="password" 
-										maxlength="25" id="password" class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message
-										key="admin.user.password.confirm" /> *:</td>
-								<td><input type="password" name="password2" 
-										maxlength="25" id="password2" class="form-control" /></td>
-							</tr>
-							</c:if>
-							<tr>
-								<td class="align-right"><fmt:message
-										key="admin.user.authentication.method" />:</td>
-								<td><form:select path="authenticationMethodId"
-										cssClass="form-control">
-										<c:forEach items="${authenticationMethods}" var="method">
-											<form:option value="${method.authenticationMethodId}">
-												<c:out value="${method.authenticationMethodName}" />
-											</form:option>
-										</c:forEach>
-									</form:select></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message key="admin.user.title" />:</td>
-								<td><input type="text" name="title" size="32" maxlength="32"
-										id="title" class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message
-										key="admin.user.first_name" /> *:</td>
-								<td><input type="text" name="firstName" 
-										id="firstName" maxlength="128" class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message
-										key="admin.user.last_name" /> *:</td>
-								<td><input type="text" name="lastName" 
-										id="lastName" maxlength="128" class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message key="admin.user.email" />
-									*:</td>
-								<td><input type="text" name="email" maxlength="128"
-										class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message
-										key="admin.user.address_line_1" />:</td>
-								<td><input type="text" name="addressLine1" 
-										maxlength="64" class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message
-										key="admin.user.address_line_2" />:</td>
-								<td><input type="text" name="addressLine2" 
-										maxlength="64" class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message
-										key="admin.user.address_line_3" />:</td>
-								<td><input type="text" name="addressLine3" 
-										maxlength="64" class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right"><fmt:message key="admin.user.city" />:</td>
-								<td><input type="text" name="city"  maxlength="64"
-										class="form-control" /></td>
-							</tr>
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.postcode" />:
-								</td>
-								<td>
-									<input type="text" name="postcode" size="10" maxlength="10" class="form-control" />
-								</td>
-							</tr>
-							<tr>
-								<td class="align-right">	
-									<fmt:message key="admin.user.state" />:
-								</td>
-								<td><input type="text" name="state"  maxlength="64"
-										class="form-control" />
-								</td>
-							</tr>
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.country" />:
-								</td>
-								<td><input type="text" name="country"  maxlength="64"
-										class="form-control" />
-								</td>
-							</tr>
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.day_phone" />:
-								</td>
-								<td>
-									<input type="text" name="dayPhone"  maxlength="64" class="form-control" />
-								</td>
-							</tr>
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.evening_phone" />:
-								</td>
-								<td>
-									<input type="text" name="eveningPhone" maxlength="64" class="form-control" />		
-								</td>
-							</tr>
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.mobile_phone" />:
-								</td>
-								<td>
-									<input type="text" name="mobilePhone" maxlength="64" class="form-control" />
-								</td>
-							</tr>
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.fax" />:</td>
-								<td>
-									<input type="text" name="fax"  maxlength="64" class="form-control" />
-								</td>
-							</tr>
-			
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.organisation.locale" />:
-								</td>
-								<td>
-									<form:select path="localeId" cssClass="form-control">
-										<c:forEach items="${locales}" var="locale">
-											<form:option value="${locale.localeId}">
-												<c:out value="${locale.description}" />
-											</form:option>
-										</c:forEach>
-									</form:select>
-								</td>
-							</tr>
-			
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.time.zone" />:
-								</td>
-								<td>
-									<form:select property="timeZone" cssClass="form-control">
-										<c:forEach items="${timezoneDtos}" var="timezoneDto">
-											<form:option value="${timezoneDto.timeZoneId}">
-												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-											</form:option>
-										</c:forEach>
-									</form:select>
-								</td>
-							</tr>
-			
-							<tr>
-								<td class="align-right">
-									<fmt:message key="label.theme" />:
-								</td>
-								<td>
-									<form:select path="userTheme" styleClass="form-control">
-										<c:forEach items="${themes}" var="theme">
-											<form:option value="${theme.themeId}">${theme.name}</form:option>
-										</c:forEach>
-									</form:select>
-								</td>
-							</tr>
-							
-							<tr>
-								<td class="align-right">
-									<fmt:message key="admin.user.change.password" />:
-								</td>
-								<td>
-									<form:checkbox path="changePassword" value="true" id="changePassword"  />
-								</td>
-							</tr>
-							
-							<c:if test="${isSysadmin}">
-								<tr>
-									<td class="align-right">
-										<fmt:message key="label.2FA.property.enable" />:
-									</td>
-									<td>
-										<form:checkbox path="twoFactorAuthenticationEnabled" value="true"  />
-									</td>
-								</tr>
-							</c:if>
-							
-						</table>
-					</div>
-					</div>
-					
-					<div class="row">
-					<div class="col-md-12">
-						<c:if test="${not empty userForm.userId}>
-							<div class="pull-left">
-							<a href="userChangePass.jsp?userId=<c:out value="${userForm.userId}" />&login=<c:out value="${userForm.login}" />" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
-							</div>
-						</c:if>
-						<div class="pull-right">
-							<input type="submit" name="org.apache.struts.taglib.html.CANCEL" value="<fmt:message key="admin.cancel" />" 
-									formnovalidate="formnovalidate" onclick="bCancel=true;" id="cancelButton" class="btn btn-default"/>
-							<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
-						</div>
-					</div>
-					</div>
-					
-					</div>
-				</div> <!-- End of panel -->
-			
-			
-				<c:if test="${not empty globalRoles || not empty userOrgRoles}">
-			
-					<div class="panel panel-default voffset5">
-						<div class="panel-heading">
-							<span class="panel-title"> <fmt:message
-									key="admin.organisation" />
-							</span>
-						</div>
-			
-						<table class="table table-no-border">
-			
-							<c:if test="${not empty globalRoles}">
-								<tr>
-									<td>
-										<table class="table table-striped table-condensed">
-											<tr>
-												<th><fmt:message key="label.global.roles" />:</th>
-											</tr>
-											<tr>
-												<td>
-													<c:forEach var="role" items="${globalRoles.roles}">
-														<fmt:message>role.<lams:role role="${role}" />
-														</fmt:message>&nbsp;
-													</c:forEach>
-												</td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</c:if>
-			
-							<c:if test="${not empty userOrgRoles}">
-								<tr>
-									<td>
-										<table id="tableRoles" class="table table-striped table-condensed">
-											<tr>
-												<th><fmt:message key="label.member.of" />:</th>
-												<th><fmt:message key="label.with.roles" />:</th>
-											</tr>
-											
-											<c:forEach var="userOrgRole" items="${userOrgRoles}">
-												<tr>
-													<td><c:out value="${userOrgRole.orgName}" /></td>
-													<td><c:forEach var="role" items="${userOrgRole.roles}">
-															<fmt:message>role.<lams:role role="${role}" />
-															</fmt:message>&nbsp;
-														</c:forEach>
-													</td>
-												</tr>
-												
-												<c:if test="${not empty userOrgRole.childDTOs}">
-													<c:forEach var="child" items="${userOrgRole.childDTOs}">
-														<tr>
-															<td><i class="fa fa-square"></i>&nbsp;<c:out
-																	value="${child.orgName}" /></td>
-															<td><c:forEach var="role" items="${child.roles}">
-																	<fmt:message>role.<lams:role role="${role}" />
-																	</fmt:message>&nbsp;
-																</c:forEach>
-															</td>
-														</tr>
-													</c:forEach>
-												</c:if>
-											</c:forEach>
-											
-										</table>
-									</td>
-								</tr>
-							</c:if>
-			
-						</table>
-					</div>
-				</c:if>
-			
-			</form:form>
-
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+	</lams:Page>
+		
 </body>
 </lams:html>
 
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -4,8 +4,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title" value="${admin.user.management}"/>
-	<c:set var="title"><fmt:message key="${title}"/></c:set>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -59,25 +58,17 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><tiles:getAsString name="subtitle" ignore="true"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
-	
-	<c:set var="help"><tiles:getAsString name='help'  ignore="true"/></c:set>
-	<c:choose>
-		<c:when test="${not empty help}">
-			<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 				
 			<p>
 				<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 				<c:if test="${orgType == 2}">
-					: <a href="orgmanage.do?org=<c:out value="${UserManageForm.orgId}" />" class="btn btn-default"><c:out value="${UserManageForm.orgName}" /></a>
+					: <a href="orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}" /></a>
 				</c:if>
 				<c:if test="${orgType == 3}">
 					: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
-					: <a href="orgmanage.do?org=<c:out value="${UserManageForm.orgId}" />" class="btn btn-default"><c:out value="${UserManageForm.orgName}"/></a>
+					: <a href="orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}"/></a>
 				</c:if>
 			</p>
 			
@@ -92,12 +83,12 @@
 						</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='userorg.do?orgId=<c:out value="${UserManageForm.orgId}"/>' />
-						<c:if test="${UserManageForm.canResetOrgPassword == true}">
-							<a class="btn btn-default" href="orgPasswordChange.do?organisationID=<c:out value="${UserManageForm.orgId}"/>"><fmt:message key='admin.org.password.change.button'/></a>
+						<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<c:out value="${userManageForm.orgId}"/>' />
+						<c:if test="${userManageForm.canResetOrgPassword == true}">
+							<a class="btn btn-default" href="orgPasswordChange.do?organisationID=<c:out value="${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='user/edit.do?orgId=<c:out value="${UserManageForm.orgId}"/>' />
+						<c:if test="${userManageForm.courseAdminCanAddNewUsers == true}">
+							<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user/edit.do?orgId=<c:out value="${userManageForm.orgId}"/>' />
 						</c:if>
 					</div>
 				</div>
@@ -162,7 +153,7 @@
 					</tr>
 				</thead>
 				<tbody>
-				<c:forEach var="userManageBean" items="${UserManageForm.userManageBeans}">
+				<c:forEach var="userManageBean" items="${userManageForm.userManageBeans}">
 					<tr>
 						<td>
 							<c:out value="${userManageBean.login}" />
@@ -181,9 +172,9 @@
 						    </small>
 						</td>
 						<td>
-								<a href="userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${UserManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
+								<a href="userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
 								&nbsp;
-								<c:if test="${UserManageForm.courseAdminCanAddNewUsers == true }">
+								<c:if test="${userManageForm.courseAdminCanAddNewUsers == true }">
 									<a href="user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageBean.orgId}"/>"><fmt:message key="admin.edit" /></a>
 									&nbsp;
 								</c:if>
@@ -219,167 +210,7 @@
 				<tbody>
 				</tbody>
 			</table> 
-			</lams:Page>
-	
-		</c:when>
-		<c:otherwise>
-		
-			<lams:Page type="admin" title="${title}" >
-				
-			<p>
-				<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-				<c:if test="${orgType == 2}">
-					: <a href="orgmanage.do?org=<c:out value="${UserManageForm.orgId}" />" class="btn btn-default"><c:out value="${UserManageForm.orgName}" /></a>
-				</c:if>
-				<c:if test="${orgType == 3}">
-					: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
-					: <a href="orgmanage.do?org=<c:out value="${UserManageForm.orgId}" />" class="btn btn-default"><c:out value="${UserManageForm.orgName}"/></a>
-				</c:if>
-			</p>
-			
-			<div class="panel panel-default voffset5" >
-				<div id="courseHeading" class="panel-heading">
-					<span class="panel-title">
-						<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='userorg.do?orgId=<c:out value="${UserManageForm.orgId}"/>' />
-						<c:if test="${UserManageForm.canResetOrgPassword == true}">
-							<a class="btn btn-default" href="orgPasswordChange.do?organisationID=<c:out value="${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='user/edit.do?orgId=<c:out value="${UserManageForm.orgId}"/>' />
-						</c:if>
-					</div>
-				</div>
-			
-				<c:if test="${orgType != 1}">
-				<table class="table table-condensed table-striped">
-					<tr>
-						<td width="30%"><fmt:message key="label.learners"/>:</td>
-						<td><c:out value="${LEARNER}"/></td>
-					</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.group.admins"/>:</td>
-						<td><c:out value="${GROUP_ADMIN}"/></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 width="30%"><fmt:message key="label.group.admins"/>:</td>
-						<td><c:out value="${GROUP_ADMIN}"/></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}">
-					<tr>
-						<td>
-							<c:out value="${userManageBean.login}" />
-						</td>
-						<td>
-							<c:out value="${userManageBean.firstName}" />
-						</td>
-						<td>
-							<c:out value="${userManageBean.lastName}" />
-						</td>
-						<td>
-						    <small>
-						    <c:forEach var="role" items="${userManageBean.roles}">
-						        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message>&nbsp;
-						    </c:forEach>
-						    </small>
-						</td>
-						<td>
-								<a href="userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${UserManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
-								&nbsp;
-								<c:if test="${UserManageForm.courseAdminCanAddNewUsers == true }">
-									<a href="user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageBean.orgId}"/>"><fmt:message key="admin.edit" /></a>
-									&nbsp;
-								</c:if>
-								<c:if test="${canDeleteUser == true}">
-									<a href="user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageBean.orgId"/>"><fmt:message key="admin.user.delete"/></a>
-								</c:if>
-								<br/>
-						</td>		
-					</tr>
-				</c:forEach>
-				</tbody>
-				<tfoot>
-					<tr>
-				    	<th colspan="5" class="ts-pager form-horizontal">
-				    	<form onsubmit="return false;">	    	
-					        <button type="button" class="btn btn-xs first"><i class="fa fa-step-backward"></i></button>
-					        <button type="button" class="btn btn-xs prev"><i class="fa fa-backward"></i></button>
-					        <span class="pagedisplay"></span> <!-- this can be any element, including an input -->
-					        <button type="button" class="btn btn-xs next"><i class="fa fa-forward"></i></button>
-					        <button type="button" class="btn btn-xs last"><i class="fa fa-step-forward"></i></button>
-					        <select class="pagesize" title="Select page size">
-					      		<option selected="selected" value="10">10</option>
-					      		<option value="20">20</option>
-					      		<option value="30">30</option>
-					      		<option value="40">40</option>
-					      		<option value="50">50</option>
-					      		<option value="100">100</option>
-					        </select>
-					    </form>
-				        </th>
-				    </tr>
-				</tfoot>
-				<tbody>
-				</tbody>
-			</table> 
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+	</lams:Page>
 </body>
 </lams:html>
 
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -1,196 +1,231 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<style>
-	.listBoundingBox {
-		border:thin solid #c1c1c1;
-		margin-left:5px;
-	}
-	p {
-		margin-left:5px;
-	}
-	.listScrollable {
-		margin:5px; 
-		height:250px; 
-		overflow-y:auto;
-	}
-	a {
-		cursor: pointer;
-	}
-</style>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<title>${title}</title>
 
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
-<script>
-	var removedUsers = [];
-
-	jQuery(document).ready(function() {
-		jQuery("div#existing").load(
-			"user/basiclist.do", 
-			{orgId: <bean:write name="UserOrgForm" property="orgId"/>},
-			function() {
-				updateExistingTotal();
-				jQuery("li", this).each(function() {
-					var rowHtml = jQuery(this).html();
-					jQuery(this).html("<a class='removeLink'>"+rowHtml+"</a>");
-				});
-				bindRemoveLink();
-			}
-		);
-		loadSearchResults(0);
-	});
+	<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-smoothness-theme.css" type="text/css" media="screen">
+	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	function updateExistingTotal() {
-		var size = jQuery("li", "#existing").size();
-		jQuery("span#totalUsers").text("<fmt:message key="label.number.of.users"><fmt:param>"+size+"</fmt:param></fmt:message>");
-	}
+	<style>
+		.listBoundingBox {
+			border:thin solid #c1c1c1;
+			margin-left:5px;
+		}
+		p {
+			margin-left:5px;
+		}
+		.listScrollable {
+			margin:5px; 
+			height:250px; 
+			overflow-y:auto;
+		}
+		a {
+			cursor: pointer;
+		}
+	</style>
 	
-	function updatePotentialTotal() {
-		var size = jQuery("li", "#potential").size();
-		jQuery("span#potentialUsers").text("<fmt:message key="label.number.of.potential.users"><fmt:param>"+size+"</fmt:param></fmt:message>");
-	}
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
+	<script>
+		var removedUsers = [];
 	
-	function bindRemoveLink() {
-		jQuery("body").click(function(event) {
-			if (jQuery(event.target).is("a.removeLink")) {
-				if (jQuery(event.target).parent().is("li")) {
-					removedUsers[jQuery(event.target).parent().attr("id")] = jQuery(event.target).parent().text();
-					jQuery(event.target).parent().remove();
+		jQuery(document).ready(function() {
+			jQuery("div#existing").load(
+				"user/basiclist.do", 
+				{orgId: <c:out value="${userOrgForm.orgId}"/>},
+				function() {
 					updateExistingTotal();
+					jQuery("li", this).each(function() {
+						var rowHtml = jQuery(this).html();
+						jQuery(this).html("<a class='removeLink'>"+rowHtml+"</a>");
+					});
+					bindRemoveLink();
 				}
-			}
+			);
+			loadSearchResults(0);
 		});
-	}
-	
-	function bindAddLink() {
-		jQuery("a.addLink").click(function() {
-			var rowId = jQuery(this).parent().attr("id");
-			var rowText = jQuery(this).parent().text();
-			jQuery("div#existing").append("<li id='"+rowId+"'><a class='removeLink'>"+rowText+"</a></li>");
-			jQuery(this).parent().remove();
-			updateExistingTotal();
-			updatePotentialTotal();
-		});
-	}
-	
-	function loadSearchResults(potential) {
-		if (potential=='1') {
-			jQuery("div#potential").load(
-				"user/basiclist.do",
-				{orgId: <bean:write name="UserOrgForm" property="orgId"/>,
-				potential: potential}, 
-				function() {
-					loadSearchResultsCallback(potential);
+		
+		function updateExistingTotal() {
+			var size = jQuery("li", "#existing").size();
+			jQuery("span#totalUsers").text("<fmt:message key="label.number.of.users"><fmt:param>"+size+"</fmt:param></fmt:message>");
+		}
+		
+		function updatePotentialTotal() {
+			var size = jQuery("li", "#potential").size();
+			jQuery("span#potentialUsers").text("<fmt:message key="label.number.of.potential.users"><fmt:param>"+size+"</fmt:param></fmt:message>");
+		}
+		
+		function bindRemoveLink() {
+			jQuery("body").click(function(event) {
+				if (jQuery(event.target).is("a.removeLink")) {
+					if (jQuery(event.target).parent().is("li")) {
+						removedUsers[jQuery(event.target).parent().attr("id")] = jQuery(event.target).parent().text();
+						jQuery(event.target).parent().remove();
+						updateExistingTotal();
+					}
 				}
-			);
-		} else {
-			jQuery("div#potential").load(
-				"user/searchsingle.do",
-				{term: jQuery("#term").val(),
-				orgId: <bean:write name="UserOrgForm" property="orgId"/>}, 
-				function() {
-					loadSearchResultsCallback(potential);
-				}
-			);
+			});
 		}
-		return false;
-	}
-	
-	function loadSearchResultsCallback(potential) {
-		updatePotentialTotal();
-		jQuery("li", "div#potential").each(function() {
-			if ($('div#existing li#' + $(this).attr('id')).length > 0) {
-				$(this).remove();
+		
+		function bindAddLink() {
+			jQuery("a.addLink").click(function() {
+				var rowId = jQuery(this).parent().attr("id");
+				var rowText = jQuery(this).parent().text();
+				jQuery("div#existing").append("<li id='"+rowId+"'><a class='removeLink'>"+rowText+"</a></li>");
+				jQuery(this).parent().remove();
+				updateExistingTotal();
+				updatePotentialTotal();
+			});
+		}
+		
+		function loadSearchResults(potential) {
+			if (potential=='1') {
+				jQuery("div#potential").load(
+					"user/basiclist.do",
+					{orgId: <c:out value="${userOrgForm.orgId}"/>,
+					potential: potential}, 
+					function() {
+						loadSearchResultsCallback(potential);
+					}
+				);
 			} else {
-				$(this).html("<a class='addLink'>"+$(this).html()+"</a>");
+				jQuery("div#potential").load(
+					"user/searchsingle.do",
+					{term: jQuery("#term").val(),
+					orgId: <c:out value="${userOrgForm.orgId}"/>}, 
+					function() {
+						loadSearchResultsCallback(potential);
+					}
+				);
 			}
-		});
-
-		if (potential == '1') {
-			for (var userId in removedUsers) {
-				if ($('div#existing li#' + userId + ', div#potential li#' + userId).length == 0) {
-					$("div#potential").append("<li id=\"" + userId + "\"><a class='addLink'>" + removedUsers[userId] + "</a></li>");
+			return false;
+		}
+		
+		function loadSearchResultsCallback(potential) {
+			updatePotentialTotal();
+			jQuery("li", "div#potential").each(function() {
+				if ($('div#existing li#' + $(this).attr('id')).length > 0) {
+					$(this).remove();
+				} else {
+					$(this).html("<a class='addLink'>"+$(this).html()+"</a>");
 				}
-			}
-			removedUsers = []; 
-		} else {
-			for (var userId in removedUsers) {
-				var term = jQuery("#term").val();
-				if (removedUsers[userId].toLowerCase().indexOf(term.toLowerCase()) >= 0 
-					&& $('div#existing li#' + userId + ', div#potential li#' + userId).length == 0) {
-					jQuery("div#potential").append("<li id=\"" + userId + "\"><a class='addLink'>" + removedUsers[userId] + "</a></li>");
-					delete removedUsers[userId];
+			});
+	
+			if (potential == '1') {
+				for (var userId in removedUsers) {
+					if ($('div#existing li#' + userId + ', div#potential li#' + userId).length == 0) {
+						$("div#potential").append("<li id=\"" + userId + "\"><a class='addLink'>" + removedUsers[userId] + "</a></li>");
+					}
 				}
+				removedUsers = []; 
+			} else {
+				for (var userId in removedUsers) {
+					var term = jQuery("#term").val();
+					if (removedUsers[userId].toLowerCase().indexOf(term.toLowerCase()) >= 0 
+						&& $('div#existing li#' + userId + ', div#potential li#' + userId).length == 0) {
+						jQuery("div#potential").append("<li id=\"" + userId + "\"><a class='addLink'>" + removedUsers[userId] + "</a></li>");
+						delete removedUsers[userId];
+					}
+				}
 			}
+	
+			bindAddLink();
+			updatePotentialTotal();
 		}
-
-		bindAddLink();
-		updatePotentialTotal();
-	}
+		
+		function populateForm() {
+			jQuery("li", "div#existing").each(function() {
+				jQuery("form", "div#form").append("<input type='checkbox' name='userIds' value='"+jQuery(this).attr("id")+"' checked='checked' style='display:none;'>");
+			});
+			return true;
+		}
+	</script>
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="subtitle"><fmt:message key="admin.user.add"/></c:set>	
+	<c:if test="${not empty subtitle}">
+		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
+	</c:if>
 	
-	function populateForm() {
-		jQuery("li", "div#existing").each(function() {
-			jQuery("form", "div#form").append("<input type='checkbox' name='userIds' value='"+jQuery(this).attr("id")+"' checked='checked' style='display:none;'>");
-		});
-		return true;
-	}
-</script>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+				<p>
+					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+				    <c:if test="${not empty pOrgId}">
+				        : <a href="orgmanage.do?org=<c:out value="pOrgId" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
+				    </c:if>
+				    <c:if test="${userOrgForm.orgId != 1}">
+						: <a href="<c:if test="${userOrgForm.orgType == 3}">user</c:if><c:if test="${userOrgForm.orgType != 3}"/>org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
+						<c:out value="${userOrgForm.orgName}"/></a>
+					</c:if>
+					<c:if test="${userOrgForm.orgId == 1}">
+						: <a href="usermanage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+					</c:if>
+				</p>
+				
+				<h4><fmt:message key="admin.user.add"/></h4>
+				
+				<div align="center">
+				<%-- Error Messages --%>
+					 <c:set var="errorKey" value="GLOBAL" />
+					   <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
+					      <lams:Alert id="error" type="danger" close="false">
+					        <c:forEach var="error" items="${errorMap[errorKey]}">
+					           <c:out value="${error}" />
+					        </c:forEach>
+					      </lams:Alert>
+					  </c:if>
+				</div>
+				
+				<c:if test="${orgType == 2}">
+					<lams:Alert id="subgroup-warning" type="info" close="false">
+						<fmt:message key="msg.remove.from.subgroups"/>
+					</lams:Alert>
+				</c:if>
+				
+				<h3><fmt:message key="heading.users"/></h3>
+				<div class="pull-right"><span id="totalUsers"><c:out value="${numExistUsers}"/></span></div>
+				<p>
+					 <fmt:message key="msg.click.remove.user"/>
+				</p>
+				<div class="listBoundingBox">
+					<div id="existing" class="listScrollable">
+					</div>
+				</div>
+				
+				<p>&nbsp;</p>
+				
+				<h4><fmt:message key="heading.potential.users"/></h4>
+				<p>
+					<fmt:message key="msg.click.add.user"/>
+				</p>
+				<div class="pull-right"><span id="potentialUsers"><c:out value="${numPotentialUsers}"/></span></div>
+				<form onsubmit="return loadSearchResults(0);">
+					<p>
+						<fmt:message key="admin.search"/>: <input id="term" type="text"/> or <a onclick="loadSearchResults(1);"><fmt:message key="msg.show.all.potential.users"/></a>
+					</p>
+				</form>
+				<div class="listBoundingBox">
+					<div id="potential" class="listScrollable">
+					</div>
+				</div>
+				
+				<p>&nbsp;</p>
+				
+				<div id="form" class="pull-right">
+					<form:form action="userorgsave.do" modelAttribute="userOrgForm" id="userOrgForm" method="post">
+						<form:hidden property="orgId" />
+						<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+						<input type="submit" id="nextButton" class="btn btn-primary loffset5" onclick="return populateForm();" value="<fmt:message key="label.next"/>" />
+					</form:form>
+				</div>
+	</lams:Page>
 
-<p>
-	<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-    <logic:notEmpty name="pOrgId">
-        : <a href="orgmanage.do?org=<bean:write name="pOrgId" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
-    </logic:notEmpty>
-    <logic:notEqual name="UserOrgForm" property="orgId" value="1">
-		: <a href="<logic:equal name="orgType" value="3">user</logic:equal><logic:notEqual name="orgType" value="3">org</logic:notEqual>manage.do?org=<bean:write name="UserOrgForm" property="orgId" />" class="btn btn-default">
-		<bean:write name="UserOrgForm" property="orgName"/></a>
-	</logic:notEqual>
-	<logic:equal name="UserOrgForm" property="orgId" value="1">
-		: <a href="usermanage.do?org=<bean:write name="UserOrgForm" property="orgId" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
-	</logic:equal>
-</p>
-
-<h4><fmt:message key="admin.user.add"/></h4>
-
-<div align="center"><html-el:errors/></div>
-
-<logic:equal name="orgType" value="2">
-	<lams:Alert id="subgroup-warning" type="info" close="false">
-		<fmt:message key="msg.remove.from.subgroups"/>
-	</lams:Alert>
-</logic:equal>
-
-<h3><fmt:message key="heading.users"/></h3>
-<div class="pull-right"><span id="totalUsers"><c:out value="${numExistUsers}"/></span></div>
-<p>
-	 <fmt:message key="msg.click.remove.user"/>
-</p>
-<div class="listBoundingBox">
-	<div id="existing" class="listScrollable">
-	</div>
-</div>
-
-<p>&nbsp;</p>
-
-<h4><fmt:message key="heading.potential.users"/></h4>
-<p>
-	<fmt:message key="msg.click.add.user"/>
-</p>
-<div class="pull-right"><span id="potentialUsers"><c:out value="${numPotentialUsers}"/></span></div>
-<form onsubmit="return loadSearchResults(0);">
-	<p>
-		<fmt:message key="admin.search"/>: <input id="term" type="text"/> or <a onclick="loadSearchResults(1);"><fmt:message key="msg.show.all.potential.users"/></a>
-	</p>
-</form>
-<div class="listBoundingBox">
-	<div id="potential" class="listScrollable">
-	</div>
-</div>
-
-<p>&nbsp;</p>
-
-<div id="form" class="pull-right">
-	<html:form action="userorgsave.do" method="post">
-		<html:hidden property="orgId" />
-		<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>
-		<html:submit styleId="nextButton" styleClass="btn btn-primary loffset5" onclick="return populateForm();"><fmt:message key="label.next"/></html:submit>
-	</html:form>
-</div>
+</body>
+</lams:html>
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -4,8 +4,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title" value="${admin.user.management}"/>
-	<c:set var="title"><fmt:message key="${title}"/></c:set>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -24,34 +23,30 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle" value="${admin.user.assign.roles}">	
+	<c:set var="subtitle" value="<fmt:message key="admin.user.assign.roles"/>">	
 	<c:if test="${not empty subtitle}">
 		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
 	</c:if>
 	
-	<c:set var="help"><tiles:getAsString name='help'  ignore="true"/></c:set>
-	<c:choose>
-		<c:when test="${not empty help}">
-			<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}" formID="userOrgRoleForm">
 				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 			    <c:if test=${not empty pOrgId}>
 			        : <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
 			    </c:if>
 			    <c:if test="${UserOrgRoleForm.orgId != 1}">
-					: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${UserOrgRoleForm.orgId}" />" class="btn btn-default">
+					: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default">
 					<c:out value="${orgName}"/></a>
 				</c:if>
-				<c:if test="${UserOrgRoleForm.orgId == 1}">
-					: <a href="usermanage.do?org=<c:out value="${UserOrgRoleForm.orgId}"/>" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+				<c:if test="${userOrgRoleForm.orgId == 1}">
+					: <a href="usermanage.do?org=<c:out value="${userOrgRoleForm.orgId}"/>" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
 				</c:if>
 			</h4>
 			
 			<h1><fmt:message key="admin.user.assign.roles" /></h1>
 			
 			<p><fmt:message key="msg.roles.mandatory.users"/></p>
 			
-			<form:form action="userorgrolesave.do" method="post" modelAttribute="userOrgRoleForm" id="userOrgRoleForm">
+		<form:form action="userorgrolesave.do" method="post" modelAttribute="userOrgRoleForm" id="userOrgRoleForm">
 			<form:hidden path="orgId" />
 			
 			<table class="table table-condensed table-no-border">
@@ -65,7 +60,7 @@
 						<fmt:message>role.<lams:role role="${role.name}" /></fmt:message></th>
 				</c:forEach>
 			</tr>
-			<c:forEach var="userBean" items="${UserOrgRoleForm.userBeans}" indexId="beanIndex">
+			<c:forEach var="userBean" items="${userOrgRoleForm.userBeans}" indexId="beanIndex">
 				<tr>
 					<td>
 						<c:out value="${userBean.login}" /><c:if test="${!userBean.memberOfParent}"> *<c:set var="parentFlag" value="true" /></c:if>
@@ -83,72 +78,12 @@
 			</c:if>
 			
 			<div class="pull-right">
-				<html-el:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html-el:cancel>
+				<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
 				<input typye="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
 			</div>
-			</form:form>
-			</lams:Page>
-		</c:when>
-		<c:otherwise>
-			<lams:Page type="admin" title="${title}" >
-						<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-			    <c:if test=${not empty pOrgId}>
-			        : <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
-			    </c:if>
-			    <c:if test="${UserOrgRoleForm.orgId != 1}">
-					: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${UserOrgRoleForm.orgId}" />" class="btn btn-default">
-					<c:out value="${orgName}"/></a>
-				</c:if>
-				<c:if test="${UserOrgRoleForm.orgId == 1}">
-					: <a href="usermanage.do?org=<c:out value="${UserOrgRoleForm.orgId}"/>" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
-				</c:if>
-			</h4>
-			
-			<h1><fmt:message key="admin.user.assign.roles" /></h1>
-			
-			<p><fmt:message key="msg.roles.mandatory.users"/></p>
-			
-			<form:form action="userorgrolesave.do" method="post" modelAttribute="userOrgRoleForm" id="userOrgRoleForm">
-			<form:hidden path="orgId" />
-			
-			<table class="table table-condensed table-no-border">
-			<tr>
-				<th><fmt:message key="admin.user.login"/></th>
-				<c:forEach var="role" items="${roles}" indexId="roleIndex">
-					<th><input type="checkbox" 
-								name="<c:out value="${roleIndex}" />" 
-								onclick="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" 
-								onkeyup="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" />&nbsp;
-						<fmt:message>role.<lams:role role="${role.name}" /></fmt:message></th>
-				</c:forEach>
-			</tr>
-			<c:forEach var="userBean" items="${UserOrgRoleForm.userBeans}" indexId="beanIndex">
-				<tr>
-					<td>
-						<c:out value="${userBean.login}" /><c:if test="${!userBean.memberOfParent}"> *<c:set var="parentFlag" value="true" /></c:if>
-					</td>
-					<c:forEach var="role" items="${roles}">
-						<td>
-							<form:checkbox id="${userBean.login}Role${role.roleId}" path="userBeans[${beanIndex}].roleIds" value="${role.roleId}" />&nbsp;
-						</td>
-					</c:forEach>
-				</tr>
-			</c:forEach>
-			</table>
-			<c:if test="${parentFlag}">
-			<p><fmt:message key="msg.user.add.to.parent.group" /></p>
-			</c:if>
-			
-			<div class="pull-right">
-				<html-el:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html-el:cancel>
-				<input typye="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
-			</div>
-			</form:form>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
+		</form:form>
+	</lams:Page>
 
-
 </body>
 </lams:html>
 
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd4dec47dab74477560cfee18e74c7e4494bd1426
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
@@ -1,54 +1,87 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<html-el:form action="/userrolessave.do" method="post">
-<html-el:hidden property="userId" />
-<html-el:hidden property="orgId" />
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.user.entry"/></c:set>
+	<title>${title}</title>
+
+	<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-smoothness-theme.css" type="text/css" media="screen">
+	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="subtitle"><fmt:message key="admin.user.assign.roles"/></c:set>	
+	<c:if test="${not empty subtitle}">
+		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
+	</c:if>
+	
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+
+	</lams:Page>
+
+
+</body>
+</lams:html>
+
+
+
+
+<%@ include file="/taglibs.jsp"%>
+
+<form:form action="./userrolessave.do" modelAttribute="userRolesForm" id="userRolesForm" method="post">
+<form:hidden path="userId" />
+<form:hidden path="orgId" />
 <p>
 	<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-	<logic:notEmpty name="pOrgId">
+	<c:if test="${not empty pOrgId}">
 		: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${parentName}" /></a>
-		: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />" class="btn btn-default"><c:out value="${orgName}" /></a>
-	</logic:notEmpty>
-	<logic:empty name="pOrgId">
-		<logic:notEqual name="UserRolesForm" property="orgId" value="1">
-			: <a href="orgmanage.do?org=<bean:write name="UserRolesForm" property="orgId" />" class="btn btn-default"><c:out value="${orgName}" /></a>
-		</logic:notEqual>
-		<logic:equal name="UserRolesForm" property="orgId" value="1">
-			: <a href="usermanage.do?org=<bean:write name="UserRolesForm" property="orgId" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
-		</logic:equal>
-	</logic:empty>
+		: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
+	</c:if>
+	<c:if test="${empty pOrgId}">
+		<c:if test=${userRolesForm.orgId != 1}">
+			: <a href="orgmanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
+		</c:if>
+		<c:if test=${userRolesForm.orgId == 1}">
+			: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+		</c:if>
+	</c:if>
 </p>
 
 <p><fmt:message key="msg.roles.mandatory"/></p>
 
-<div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><bean:write name="roles" /></html-el:messages></div>
+<div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><c:out value="${roles}" /></html-el:messages></div>
 
 <div class="container-fluid">
 <div class="row">
   <div class="col-xs-2"><fmt:message key="admin.user.login"/>:</div>
-  <div class="col-xs-10"><bean:write name="login" /></div>
+  <div class="col-xs-10"><c:out value="${login}" /></div>
 </div>
 
 <div class="row">
   <div class="col-xs-2"><fmt:message key="admin.user.name"/>:</div>
-  <div class="col-xs-10"><bean:write name="fullName" /></div>
+  <div class="col-xs-10"><c:out value="${fullName}" /></div>
 </div>
 
 <div class="row">
   <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
   <div class="col-xs-10">            
   	<c:forEach items="${rolelist}" var="role">
-    	<html-el:multibox name="UserRolesForm" property="roles" value="${role.roleId}"/>
+    	<form:multibox path="${userRolesForm.roles}" value="${role.roleId}"/>
         <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
     </c:forEach>
   </div>
 </div>
 </div>
 
 <div class="pull-right">
-	<html-el:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html-el:cancel>
-	<html-el:reset styleClass="btn btn-default loffset5"><fmt:message key="admin.reset"/></html-el:reset>
-	<html-el:submit styleClass="btn btn-primary loffset5"><fmt:message key="admin.save"/></html-el:submit>
+	<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+	<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
+	<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 </div>
 
-</html-el:form>
+</form:form>