Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java	(.../CleanupPreviewLessonsController.java)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java	(.../CleanupPreviewLessonsController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -69,7 +69,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String unspecified(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	if (!getSecurityService().isSysadmin(getUserID(), "display cleanup preview lessons", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin");
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java	(.../CleanupTempFilesController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java	(.../CleanupTempFilesController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -66,8 +66,7 @@
     private MessageService adminMessageService;
 
     @RequestMapping(path = "/start", method = RequestMethod.POST)
-    public String execute(@ModelAttribute CleanupForm cleanupForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public String execute(@ModelAttribute CleanupForm cleanupForm, HttpServletRequest request) throws Exception {
 
 	// check user is sysadmin
 	if (!(request.isUserInRole(Role.SYSADMIN))) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java	(.../CloneLessonsController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java	(.../CloneLessonsController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -47,6 +47,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.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -73,7 +74,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String execute(HttpServletRequest request, HttpServletResponse response) throws UserAccessDeniedException {
 
 	if (!(request.isUserInRole(Role.SYSADMIN))) {
@@ -160,7 +161,7 @@
     }
 
     // ajax
-    @RequestMapping("/availableLessons")
+    @RequestMapping(path = "/availableLessons", method = RequestMethod.POST)
     public String availableLessons(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	Integer sourceGroupId = WebUtil.readIntParam(request, "sourceGroupId", true);
@@ -192,7 +193,7 @@
     }
 
     // ajax
-    @RequestMapping("/selectLearners")
+    @RequestMapping(path = "/selectLearners", method = RequestMethod.POST)
     public String selectLearners(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	Integer groupId = WebUtil.readIntParam(request, "groupId", false);
@@ -205,7 +206,7 @@
 	return "organisation/parts/selectLearners";
     }
 
-    @RequestMapping("/clone")
+    @RequestMapping(path = "/clone", method = RequestMethod.POST)
     public String clone(HttpServletRequest request) throws Exception {
 
 	Integer groupId = WebUtil.readIntParam(request, "groupId", false);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java	(.../ConfigController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java	(.../ConfigController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -35,6 +35,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;
 
 /**
@@ -69,15 +70,15 @@
 	return configurationService;
     }
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String unspecified(HttpServletRequest request) throws Exception {
 
 	request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
 
 	return "config/editconfig";
     }
 
-    @RequestMapping("/save")
+    @RequestMapping(path = "/save", method = RequestMethod.POST)
     public String save(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception {
 
 	if (request.getAttribute("CANCEL") != null) {
@@ -87,7 +88,7 @@
 	String[] keys = configForm.getKey();
 	String[] values = configForm.getValue();
 
-	String errorForward = "config";
+	String errorForward = "config/editconfig";
 
 	for (int i = 0; i < keys.length; i++) {
 	    ConfigurationItem item = getConfiguration().getConfigItemByKey(keys[i]);
@@ -102,7 +103,7 @@
 		    if (!(values[i] != null && values[i].length() > 0)) {
 			request.setAttribute("error", getRequiredError(item.getDescriptionKey()));
 			request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
-			return mapping.findForward(errorForward);
+			return errorForward;
 		    }
 		}
 		String format = item.getFormat();
@@ -112,7 +113,7 @@
 		    } catch (NumberFormatException e) {
 			request.setAttribute("error", getNumericError(item.getDescriptionKey()));
 			request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
-			return mapping.findForward(errorForward);
+			return errorForward;
 		    }
 		}
 		Configuration.updateItem(keys[i], values[i]);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelController.java	(.../ImportExcelController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelController.java	(.../ImportExcelController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.admin.web.controller;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.lamsfoundation.lams.admin.web.form.ImportExcelForm;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -45,8 +44,8 @@
 public class ImportExcelController {
 
     @RequestMapping("/importexcel")
-    public String execute(@ModelAttribute ImportExcelForm importExcelForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public String execute(@ModelAttribute ImportExcelForm importExcelForm, HttpServletRequest request)
+	    throws Exception {
 
 	Integer orgId = WebUtil.readIntParam(request, "orgId", true);
 	//if (orgId==null) orgId = (Integer)request.getAttribute("orgId");
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java	(.../ImportExcelSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java	(.../ImportExcelSaveController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -25,7 +25,6 @@
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.admin.service.IImportService;
@@ -35,6 +34,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;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -59,9 +59,9 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/importexcelsave")
-    public String execute(@ModelAttribute ImportExcelForm importExcelForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    @RequestMapping(path = "/importexcelsave", method = RequestMethod.POST)
+    public String execute(@ModelAttribute ImportExcelForm importExcelForm, HttpServletRequest request)
+	    throws Exception {
 
 	if (request.getAttribute("CANCEL") != null) {
 	    return "redirect:/sysadminstart.do";
@@ -72,7 +72,7 @@
 
 	// validation
 	if (file == null || file.getSize() <= 0) {
-	    return "forward:/importexcel.do";
+	    return "redirect:/importexcel.do";
 	}
 
 	String sessionId = SessionManager.getSession().getId();
@@ -81,7 +81,7 @@
 	if (importService.getNumRows(file) < IImportService.THRESHOLD) {
 	    List results = importService.parseSpreadsheet(file, sessionId);
 	    SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results);
-	    return "forward:/importuserresult.do";
+	    return "redirect:/importuserresult.do";
 	} else {
 	    Thread t = new Thread(new ImportExcelThread(sessionId));
 	    t.start();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java	(.../ImportGroupsController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java	(.../ImportGroupsController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -25,7 +25,6 @@
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.admin.service.IImportService;
@@ -35,6 +34,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;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -55,11 +55,10 @@
 
     @Autowired
     private WebApplicationContext applicationContext;
-    
-    @RequestMapping("/importgroups")
-    public String execute(@ModelAttribute ImportExcelForm importForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
 
+    @RequestMapping(path = "/importgroups", method = RequestMethod.POST)
+    public String execute(@ModelAttribute ImportExcelForm importForm, HttpServletRequest request) throws Exception {
+
 	if (request.getAttribute("CANCEL") != null) {
 	    return "redirect:/sysadminstart.do";
 	}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java	(.../ImportUserResultController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportUserResultController.java	(.../ImportUserResultController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -36,6 +36,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.multipart.MultipartFile;
 
@@ -53,7 +54,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/importuserresult")
+    @RequestMapping(path = "/importuserresult", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 
 	MessageService messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java	(.../LdapConfigController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java	(.../LdapConfigController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -42,6 +42,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;
 
 /**
@@ -93,7 +94,7 @@
 	return configurationService;
     }
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 
 	String action = WebUtil.readStrParam(request, "action", true);
@@ -117,7 +118,7 @@
 	return "ldap";
     }
 
-    @RequestMapping("/sync")
+    @RequestMapping(path = "/sync", method = RequestMethod.POST)
     public String sync(HttpServletRequest request) throws Exception {
 
 	String sessionId = SessionManager.getSession().getId();
@@ -129,15 +130,15 @@
 	return "ldap";
     }
 
-    @RequestMapping("/waiting")
+    @RequestMapping(path = "/waiting", method = RequestMethod.POST)
     public String waiting(HttpServletRequest request) throws Exception {
 
 	request.setAttribute("wait", getMessageService().getMessage("msg.ldap.synchronise.wait"));
 
 	return "ldap";
     }
 
-    @RequestMapping("/results")
+    @RequestMapping(path = "/results", method = RequestMethod.POST)
     public String results(HttpServletRequest request) throws Exception {
 
 	HttpSession ss = SessionManager.getSession();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java	(.../LogEventController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java	(.../LogEventController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -45,6 +45,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.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -67,7 +68,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String unspecified(HttpServletRequest request) throws Exception {
 
 	// check permission
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java	(.../LoginMaintainController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java	(.../LoginMaintainController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -37,6 +37,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;
 
 /**
  * <p>
@@ -60,7 +61,7 @@
     private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + "lams-www.war" + File.separatorChar
 	    + "news.html";
 
-    @RequestMapping("/loginmaintain")
+    @RequestMapping(path = "/loginmaintain", method = RequestMethod.POST)
     public String execute(@ModelAttribute LoginMaintainForm loginMaintainForm, HttpServletRequest request)
 	    throws Exception {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -57,7 +57,7 @@
     /**
      * Shows all available LTI tool consumers
      */
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String unspecified(HttpServletRequest request) {
 	initServices();
 
@@ -71,7 +71,7 @@
     /**
      * Edits specified LTI tool consumer
      */
-    @RequestMapping("/edit")
+    @RequestMapping(path = "/edit", method = RequestMethod.POST)
     public String edit(@ModelAttribute LtiConsumerForm ltiConsumerForm, HttpServletRequest request) throws Exception {
 
 	initServices();
@@ -96,7 +96,7 @@
     /**
      * Disables or enables (depending on "disable" parameter) specified LTI tool consumer
      */
-    @RequestMapping("/disable")
+    @RequestMapping(path = "/disable", method = RequestMethod.POST)
     public String disable(HttpServletRequest request) throws Exception {
 
 	initServices();
@@ -139,30 +139,29 @@
 	}
 
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
-	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" };
+	String[] requiredFields = extServerForm.getRequiredFields();
 	for (String requiredField : requiredFields) {
-	    if (StringUtils.trimToNull(extServerForm.getString(requiredField)) == null) {
-		errorMap.add(requiredField,
-			new ActionMessage("error.required", messageService.getMessage("sysadmin." + requiredField)));
+	    if (StringUtils.trimToNull(requiredField) == null) {
+		errorMap.add("error.required", messageService.getMessage("sysadmin." + requiredField));
 	    }
 	}
 
 	Integer sid = extServerForm.getSid();
 	//check duplication
 	if (errorMap.isEmpty()) {
-	    String[] uniqueFields = { "serverid", "prefix" };
+	    String[] uniqueFields = extServerForm.getUniqueFields();
 	    for (String uniqueField : uniqueFields) {
-		List<ExtServer> list = userManagementService.findByProperty(ExtServer.class, uniqueField,
-			extServerForm.get(uniqueField));
+		List<ExtServer> list = userManagementService.findByProperty(ExtServer.class, "uniqueField",
+			uniqueField);
 		if (list != null && list.size() > 0) {
 		    if (sid.equals(0)) {//new map
-			errorMap.add(uniqueField, new ActionMessage("error.not.unique",
-				messageService.getMessage("sysadmin." + uniqueField)));
+			errorMap.add("error.not.unique",
+				messageService.getMessage("sysadmin." + uniqueField));
 		    } else {
 			ExtServer ltiConsumer = list.get(0);
 			if (!ltiConsumer.getSid().equals(sid)) {
-			    errorMap.add(uniqueField, new ActionMessage("error.not.unique",
-				    messageService.getMessage("sysadmin." + uniqueField)));
+			    errorMap.add("error.not.unique",
+				    messageService.getMessage("sysadmin." + uniqueField));
 			}
 		    }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -48,6 +48,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.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -73,7 +74,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String unspecified(@ModelAttribute OrgManageForm orgManageForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	initServices();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java	(.../OrgPasswordChangeController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java	(.../OrgPasswordChangeController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -59,6 +59,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.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -166,7 +167,7 @@
 	return resultJSON.toString();
     }
 
-    @RequestMapping("/changePassword")
+    @RequestMapping(path = "/changePassword", method = RequestMethod.POST)
     public String changePassword(@ModelAttribute OrgPasswordChangeForm orgPasswordChangeForm,
 	    HttpServletRequest request, HttpServletResponse response) throws IOException {
 	UserDTO userDTO = getUserDTO();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -51,6 +51,7 @@
 import org.springframework.util.MultiValueMap;
 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;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -89,7 +90,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/orgsave")
+    @RequestMapping(path = "/orgsave", method = RequestMethod.POST)
     public String execute(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -108,12 +109,12 @@
 		request.setAttribute("org", orgId);
 		org = (Organisation) service.findById(Organisation.class, orgId);
 		if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) {
-		    return "forward:/usermanage.do";
+		    return "redirect:/usermanage.do";
 		}
 	    } else {
 		request.setAttribute("org", organisationForm.getParentId());
 	    }
-	    return "forward:/orgmanage.do";
+	    return "redirect:/orgmanage.do";
 	}
 
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
@@ -166,10 +167,10 @@
 	    org = service.saveOrganisation(org, user.getUserID());
 
 	    request.setAttribute("org", organisationForm.getParentId());
-	    return "forward:/orgmanage.do";
+	    return "redirect:/orgmanage.do";
 	} else {
 	    request.setAttribute("errorMap", errorMap);
-	    return "forward:/organisation/edit.do";
+	    return "redirect:/organisation/edit.do";
 	}
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -172,7 +172,7 @@
 	return null;
     }
 
-    @RequestMapping("/deleteAllLessonsInit")
+    @RequestMapping(path = "/deleteAllLessonsInit", method = RequestMethod.POST)
     public String deleteAllLessonsInit(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	if (!AdminServiceProxy.getSecurityService(applicationContext.getServletContext()).isSysadmin(getUserID(),
 		"display cleanup preview lessons", false)) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ScheduledJobListController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ScheduledJobListController.java	(.../ScheduledJobListController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ScheduledJobListController.java	(.../ScheduledJobListController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -40,6 +40,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;
 
@@ -64,8 +65,7 @@
      * Get all waitting queue jobs scheduled in Quartz table and display job name, job start time and description. The
      * description will be in format "Lesson Name":"the lesson creator", or "The gate name":"The relatived lesson name".
      */
-    @SuppressWarnings("unchecked")
-    @RequestMapping("/joblist")
+    @RequestMapping(path = "/joblist", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 
 	WebApplicationContext ctx = WebApplicationContextUtils
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java	(.../ServerListController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java	(.../ServerListController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -32,6 +32,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;
 
 /**
@@ -44,7 +45,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/serverlist")
+    @RequestMapping(path = "/serverlist", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 	List<ExtServer> extServers = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext())
 		.getAllExtServers();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java	(.../ServerMaintainController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java	(.../ServerMaintainController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -34,6 +34,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;
 
 /**
@@ -50,7 +51,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/edit")
+    @RequestMapping(path = "/edit", method = RequestMethod.POST)
     public String edit(@ModelAttribute ExtServerForm extServerForm, HttpServletRequest request) throws Exception {
 	Integer sid = WebUtil.readIntParam(request, "sid", true);
 	if (sid != null) {
@@ -61,31 +62,31 @@
 	return "servermaintain";
     }
 
-    @RequestMapping("/edit")
+    @RequestMapping(path = "/disable", method = RequestMethod.POST)
     public String disable(HttpServletRequest request) throws Exception {
 	IIntegrationService service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext());
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
 	ExtServer map = service.getExtServer(sid);
 	map.setDisabled(true);
 	service.saveExtServer(map);
-	return "forward:/serverlist.do";
+	return "redirect:/serverlist.do";
     }
 
-    @RequestMapping("/edit")
+    @RequestMapping(path = "/enable", method = RequestMethod.POST)
     public String enable(HttpServletRequest request) throws Exception {
 	IIntegrationService service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext());
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
 	ExtServer map = service.getExtServer(sid);
 	map.setDisabled(false);
 	service.saveExtServer(map);
-	return "forward:/serverlist.do";
+	return "redirect:/serverlist.do";
     }
 
-    @RequestMapping("/edit")
+    @RequestMapping(path = "/delete", method = RequestMethod.POST)
     public String delete(HttpServletRequest request) throws Exception {
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
 	AdminServiceProxy.getService(applicationContext.getServletContext()).deleteById(ExtServer.class, sid);
-	return "forward:/serverlist.do";
+	return "redirect:/serverlist.do";
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -75,25 +75,23 @@
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl" };
 	for (String requiredField : requiredFields) {
-	    if (StringUtils.trimToNull(extServerForm.getString(requiredField)) == null) {
-		errorMap.add(requiredField, "error.required", messageService.getMessage("sysadmin." + requiredField));
+	    if (StringUtils.trimToNull(requiredField) == null) {
+		errorMap.add("error.required", messageService.getMessage("sysadmin." + requiredField));
 	    }
 	}
 
 	Integer sid = extServerForm.getSid();
 	if (errorMap.isEmpty()) {//check duplication
-	    String[] uniqueFields = { "serverid", "prefix" };
+	    String[] uniqueFields = extServerForm.getUniqueFields();
 	    for (String uniqueField : uniqueFields) {
-		List list = userService.findByProperty(ExtServer.class, uniqueField, extServerForm.get(uniqueField));
+		List list = userService.findByProperty(ExtServer.class, "uniqueField", uniqueField);
 		if (list != null && list.size() > 0) {
 		    if (sid.equals(-1)) {//new map
-			errorMap.add(uniqueField, "error.not.unique",
-				messageService.getMessage("sysadmin." + uniqueField));
+			errorMap.add("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
 		    } else {
 			ExtServer map = (ExtServer) list.get(0);
 			if (!map.getSid().equals(sid)) {
-			    errorMap.add(uniqueField, "error.not.unique",
-				    messageService.getMessage("sysadmin." + uniqueField));
+			    errorMap.add("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
 			}
 		    }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java	(.../SessionMaintainController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java	(.../SessionMaintainController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
  * @author Marcin Cieslak
@@ -36,13 +37,13 @@
 @RequestMapping("/sessionmaintain")
 public class SessionMaintainController {
 
-    @RequestMapping("/list")
+    @RequestMapping(path = "/list", method = RequestMethod.POST)
     public String list(HttpServletRequest request) {
 	request.setAttribute("sessions", SessionManager.getLoginToSessionIDMappings());
 	return "sessionmaintain";
     }
 
-    @RequestMapping("/delete")
+    @RequestMapping(path = "/delete", method = RequestMethod.POST)
     public String delete(HttpServletRequest request) {
 	String login = request.getParameter("login");
 	if (StringUtils.isNotBlank(login)) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(.../SignupManagementController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(.../SignupManagementController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -179,6 +179,6 @@
 	    userManagementService.deleteById(SignupOrganisation.class, soid);
 	}
 
-	return "forward:signupManagement/list.do";
+	return "redirect:signupManagement/list.do";
     }
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java	(.../StatisticsController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java	(.../StatisticsController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -35,6 +35,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;
 
 /**
@@ -51,7 +52,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/start")
+    @RequestMapping(path = "/start", method = RequestMethod.POST)
     public String unspecified(HttpServletRequest request) throws Exception {
 
 	// check permission
@@ -75,7 +76,7 @@
 	return "statistics";
     }
 
-    @RequestMapping("/groupStats")
+    @RequestMapping(path = "/groupStats", method = RequestMethod.POST)
     public String groupStats(HttpServletRequest request) throws Exception {
 
 	Integer orgId = WebUtil.readIntParam(request, "orgId");
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java	(.../SysAdminStartController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java	(.../SysAdminStartController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -34,6 +34,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;
 
 /**
@@ -48,7 +49,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/sysadminstart")
+    @RequestMapping(path = "/sysadminstart", method = RequestMethod.POST)
     public String execute(HttpServletRequest request) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java	(.../ExtServerForm.java)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java	(.../ExtServerForm.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -48,6 +48,10 @@
 
     private Integer timeToLiveLoginRequest = 80;
 
+    private String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" };
+
+    private String[] uniqueFields = { "serverid", "prefix" };
+
     public Integer getSid() {
 	return sid;
     }
@@ -144,4 +148,20 @@
 	this.timeToLiveLoginRequest = timeToLiveLoginRequest;
     }
 
+    public String[] getRequiredFields() {
+	return requiredFields;
+    }
+
+    public void setRequiredFields(String[] requiredFields) {
+	this.requiredFields = requiredFields;
+    }
+
+    public String[] getUniqueFields() {
+	return uniqueFields;
+    }
+
+    public void setUniqueFields(String[] uniqueFields) {
+	this.uniqueFields = uniqueFields;
+    }
+
 }
Index: lams_admin/web/cleanup.jsp
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,50 +1,77 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.FileUtil" %>
 <%@ page import="org.lamsfoundation.lams.util.TempDirectoryFilter" %>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.batch.temp.file.delete"/></c:set>
+	<title>${title}</title>
 
-<%-- 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>
+	<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="title"><fmt:message key="sysadmin.batch.temp.file.delete"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="cleanupForm">
+	
+	<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<lams:Alert type="warn" id="cleanup-warning" close="false">
-	<fmt:message key="msg.cleanup.warning" /><br />
-</lams:Alert>
-
-<c:set var="filesDeleted" value="${filesDeleted}"/>
-<c:if test="${not empty filesDeleted}">
-	<p><c:out value="${filesDeleted}" /></p>
-</c:if>
-
-	<input class="btn btn-default" type="submit" value="Calculate" onClick="javascript:document.location='cleanup/refresh.do'" />
-	<span class="loffset10"><c:out value="<%= FileUtil.getTempDir() %>" /></span>
+	<%-- 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>
 	
-	<ul class="list-group voffset5">
-		<li class="list-group-item"><%= TempDirectoryFilter.zip_prefix %>* : <c:out value="${zipTotal}" /><logic:empty name="zipTotal"><i><fmt:message key="label.unknown"/></i></logic:empty> KB
-		<li class="list-group-item"><%= TempDirectoryFilter.tmp_prefix %>* : <c:out value="${tmpTotal}" /><logic:empty name="tmpTotal"><i><fmt:message key="label.unknown"/></i></logic:empty> KB
-	</ul>
-	<fmt:message key="msg.cleanup.actual.space" />
-</p>
+	<lams:Alert type="warn" id="cleanup-warning" close="false">
+		<fmt:message key="msg.cleanup.warning" /><br />
+	</lams:Alert>
+	
+	<c:set var="filesDeleted" value="${filesDeleted}"/>
+	<c:if test="${not empty filesDeleted}">
+		<p><c:out value="${filesDeleted}" /></p>
+	</c:if>
+	
+		<input class="btn btn-default" type="submit" value="Calculate" onClick="javascript:document.location='cleanup/refresh.do'" />
+		<span class="loffset10"><c:out value="<%= FileUtil.getTempDir() %>" /></span>
+		
+		<ul class="list-group voffset5">
+			<li class="list-group-item"><%= TempDirectoryFilter.zip_prefix %>* : <c:out value="${zipTotal}" /><c:if test="${empty zipTotal}"><i><fmt:message key="label.unknown"/></i></c:if> KB
+			<li class="list-group-item"><%= TempDirectoryFilter.tmp_prefix %>* : <c:out value="${tmpTotal}" /><c:if test="${empty tmpTotal}"><i><fmt:message key="label.unknown"/></i></c:if> KB
+		</ul>
+		<fmt:message key="msg.cleanup.actual.space" />
+	</p>
+	
+	<p>
+	<fmt:message key="msg.cleanup.recommended" />
+	</p>
+	
+	<form:form action="start.do" modelAttribute="cleanupForm" id="cleanupForm" method="post">
+	
+		<p><fmt:message key="label.cleanup.delete" />:
+		<form:input type="text" path="numDays" maxlength="4" size="4" cssClass="form-control form-control-inline" /></p>
+		
+		<div class="pull-right">
+			<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+			<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.delete"/>" />
+		</div>
+		
+	</form:form>
+	
+	</lams:Page>
 
-<p>
-<fmt:message key="msg.cleanup.recommended" />
-</p>
+</body>
+</lams:html>
 
-<form:form action="start.do" modelAttribute="dynaForm" id="dynaForm" method="post">
 
-	<p><fmt:message key="label.cleanup.delete" />:
-	<input type="text" name="numDays" maxlength="4" size="4" class="form-control form-control-inline" /></p>
-	
-	<div class="pull-right">
-		<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>	
-		<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.delete"/>" />
-	</div>
-	
-</form:form>
+
Index: lams_admin/web/cleanupPreviewLessons.jsp
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,71 +1,102 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-<script type="text/javascript">
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.batch.preview.lesson.delete"/></c:set>
+	<title>${title}</title>
 
-$(document).ready(function(){
-	var previewCount = ${previewCount},
-		deleteButton = $('#deleteButton');
+	<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" />
 	
-	if (previewCount == 0) {
-		deleteButton.prop('disabled', true);
-		return;
-	}
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript">
 	
-	deleteButton.click(function(){
-		if (!confirm('<fmt:message key="msg.cleanup.preview.lesson.confirm" />')) {
+	$(document).ready(function(){
+		var previewCount = ${previewCount},
+			deleteButton = $('#deleteButton');
+		
+		if (previewCount == 0) {
+			deleteButton.prop('disabled', true);
 			return;
 		}
 		
-		deleteButton.prop('disabled', true);
-		$('#deletingBox').show();
-		
-		// delete lesson in batches of 5 until done
-		deletePreviewLessons(previewCount, $('#previewCount'), $('#allLessonCount'));
+		deleteButton.click(function(){
+			if (!confirm('<fmt:message key="msg.cleanup.preview.lesson.confirm" />')) {
+				return;
+			}
+			
+			deleteButton.prop('disabled', true);
+			$('#deletingBox').show();
+			
+			// delete lesson in batches of 5 until done
+			deletePreviewLessons(previewCount, $('#previewCount'), $('#allLessonCount'));
+		});
 	});
-});
-
-function deletePreviewLessons(previewCount, previewCountSpan, allLessonCountSpan){
-	if (previewCount <= 0) {
-		$('#deletingBox').hide();
-		return;
-	}
-	$.ajax({
-		'cache'   : false,
-		'url'     : '<lams:WebAppURL />cleanupPreviewLessons/delete.do',
-		'data'    : {
-			'limit'  : 5
-		},
-		'success' : function(response){
-			try {
-				previewCount = response[0];
-				previewCountSpan.text(previewCount);
-				allLessonCountSpan.text(response[1]);
-				setTimeout(function(){
-					deletePreviewLessons(previewCount, previewCountSpan, allLessonCountSpan);
-				}, 500);
-			} catch(err) {
+	
+	function deletePreviewLessons(previewCount, previewCountSpan, allLessonCountSpan){
+		if (previewCount <= 0) {
+			$('#deletingBox').hide();
+			return;
+		}
+		$.ajax({
+			'cache'   : false,
+			'url'     : '<lams:WebAppURL />cleanupPreviewLessons/delete.do',
+			'data'    : {
+				'limit'  : 5
+			},
+			'success' : function(response){
+				try {
+					previewCount = response[0];
+					previewCountSpan.text(previewCount);
+					allLessonCountSpan.text(response[1]);
+					setTimeout(function(){
+						deletePreviewLessons(previewCount, previewCountSpan, allLessonCountSpan);
+					}, 500);
+				} catch(err) {
+					alert('<fmt:message key="msg.cleanup.preview.lesson.error" />');
+					previewCountSpan.text('ERROR');
+					allLessonCountSpan.text('ERROR');
+				}
+			},
+			'error'	  : function(){
 				alert('<fmt:message key="msg.cleanup.preview.lesson.error" />');
-				previewCountSpan.text('ERROR');
-				allLessonCountSpan.text('ERROR');
 			}
-		},
-		'error'	  : function(){
-			alert('<fmt:message key="msg.cleanup.preview.lesson.error" />');
-		}
-	});
-}
-</script>
+		});
+	}
+	</script>
+</lams:head>
+    
+<body class="stripes">
 
-<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+	<c:set var="title"><fmt:message key="sysadmin.batch.preview.lesson.delete" /></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>
 
-<html:errors />
+		<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>
+		
+		<fmt:message key="label.cleanup.preview.lesson.count" />&nbsp;<span id="previewCount">${previewCount}</span> / <span id="allLessonCount">${allLessonCount}</span>
+		<div id="deletingBox" style="display: none">
+		<fmt:message key="label.cleanup.preview.lesson.progress" />
+		</div>
+				
+		<div class="pull-right">
+			<button id="deleteButton" class="btn btn-primary loffset5"><fmt:message key="admin.delete"/></button>
+		</div>
+	</lams:Page>
 
-<fmt:message key="label.cleanup.preview.lesson.count" />&nbsp;<span id="previewCount">${previewCount}</span> / <span id="allLessonCount">${allLessonCount}</span>
-<div id="deletingBox" style="display: none">
-	<fmt:message key="label.cleanup.preview.lesson.progress" />
-</div>
+</body>
+</lams:html>
 
-<div class="pull-right">
-	<button id="deleteButton" class="btn btn-primary loffset5"><fmt:message key="admin.delete"/></button>
-</div>
\ No newline at end of file
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -6,8 +6,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title" value="${sysadmin.config.settings.edit}"/>
-	<c:set var="title"><fmt:message key="${title}"/></c:set>
+	<c:set var="title"><fmt:message key="sysadmin.config.settings.edit"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -18,63 +17,64 @@
 </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}">
-				<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-				<c:if test="${not empty error}">
-					<lams:Alert type="danger" id="error-messages" close="false">
-							<c:out value="${error}" />
-					</lams:Alert>
-				</c:if>
-				
-				<form:form action="save.do" method="post">
-				
-					<%@ include file="/config/items.jsp"%>
-				
-					<div class="pull-right">
-						<html:cancel cssClass="btn btn-default">
-							<fmt:message key="admin.cancel" />
-						</html:cancel>
-						<input type="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="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+	<c:set var="title"><fmt:message key="sysadmin.config.settings.edit"/></c:set>
+	<c:set var="help"><fmt:message key="LAMS+Configuration"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="configForm">
+		
+		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-				<c:if test="${not empty error}">
-					<lams:Alert type="danger" id="error-messages" close="false">
-							<c:out value="${error}" />
-					</lams:Alert>
-				</c:if>
+		<c:if test="${not empty error}">
+			<lams:Alert type="danger" id="error-messages" close="false">
+				<c:out value="${error}" />
+			</lams:Alert>
+		</c:if>
 				
-				<form:form action="save.do" method="post">
+		<form:form action="save.do" modelAttribute="configForm" id="configForm" method="post">
 				
-					<%@ include file="/config/items.jsp"%>
-				
-					<div class="pull-right">
-						<html:cancel cssClass="btn btn-default">
-							<fmt:message key="admin.cancel" />
-						</html:cancel>
-						<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+			<c:forEach items="${config}" var="group">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						<div class="panel-title"><fmt:message key="${group.key}"/></div>
 					</div>
-				</form:form>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+									
+					<table class="table table-striped table-condensed" >
+						<c:forEach items="${group}" path="value" var="row">
+							<tr>
+								<td>
+									<fmt:message key="${row.descriptionKey}"/>
+									<c:if test="${row.required}">&nbsp;&nbsp;*</c:if>
+								</td>
+								<td>
+									<form:hidden path="key" name="key" value="${row.key}"/>
+									<c:set var="BOOLEAN"><%= ConfigurationItem.BOOLEAN_FORMAT %></c:set>
+									<c:choose>
+									<c:when test="${row.format==BOOLEAN}">
+										<form:select id="${row.key}" name="row" path="value" cssClass="form-control form-control-sm">
+										<form:option value="true">true</form:option>
+										<form:option value="false">false&nbsp;&nbsp;</form:option>
+										</form:select>
+									</c:when>
+									<c:otherwise>
+										<form:input id="${row.key}" path="value" name="row" value="${row.value}" size="50" maxlength="255" cssClass="form-control"/>
+									</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+						</c:forEach>
+					</table>
+				</div>
+			</c:forEach>
+				
+			<div class="pull-right">
+				<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+				<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+			</div>
+		</form:form>
+		
+	</lams:Page>
+	
 </body>
 </lams:html>
 
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,36 +1,64 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<title>${title}</title>
 
-<table class="table table-striped table-condensed">
-<tr>
-	<th></th>
-	<th><fmt:message key="admin.user.login"/></th>
-	<th><fmt:message key="admin.user.title"/></th>
-	<th><fmt:message key="admin.user.first_name"/></th>
-	<th><fmt:message key="admin.user.last_name"/></th>
-	<th></th>
-</tr>
-<logic:iterate id="user" name="users">
-	<tr>
-		<td>
-			<bean:write name="user" property="userId" />
-		</td>
-		<td>
-			<bean:write name="user" property="login" />
-		</td>
-		<td>
-			<bean:write name="user" property="title" />
-		</td>
-		<td>
-			<bean:write name="user" property="firstName" />
-		</td>
-		<td>
-			<bean:write name="user" property="lastName" />
-		</td>
-		<td>
-			<a href="user.do?method=enable&userId=<bean:write name='user' property='userId' />" class="btn btn-default btn-sm"><fmt:message key="admin.enable"/></a>
-		</td>		
-	</tr>
-</logic:iterate>
-</table>
+	<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.list.disabled.users"/></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}">
+		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+
+		<table class="table table-striped table-condensed">
+		<tr>
+			<th></th>
+			<th><fmt:message key="admin.user.login"/></th>
+			<th><fmt:message key="admin.user.title"/></th>
+			<th><fmt:message key="admin.user.first_name"/></th>
+			<th><fmt:message key="admin.user.last_name"/></th>
+			<th></th>
+		</tr>
+		<c:forEach var="user" items="${users}">
+			<tr>
+				<td>
+					<c:out value="${user.userId}" />
+				</td>
+				<td>
+					<c:out value="${user.login}" />
+				</td>
+				<td>
+					<c:out value="${user.title}" />
+				</td>
+				<td>
+					<c:out value="${user.firstName}" />
+				</td>
+				<td>
+					<c:out value="${user.lastName}" />
+				</td>
+				<td>
+					<a href="user/enable.do?userId=<c:out value="${user.userId}"/>" class="btn btn-default btn-sm"><fmt:message key="admin.enable"/></a>
+				</td>		
+			</tr>
+		</c:forEach>
+		</table>
+	</lams:Page>
+
+</body>
+</lams:html>
+
+
+
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,105 +1,133 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.admin.service.IImportService" %>
 <%@ page import="java.util.List" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.OrganisationType" %>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> 
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> 
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.import.groups.title"/></c:set>
+	<title>${title}</title>
 
-<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set> 
-<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set> 
-<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set> 
+	<c:set var="lams"><lams:LAMSURL/></c:set>
 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
- 
-<script language="javascript" type="text/JavaScript">
+	<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 verifyAndSubmit() {
-		if ( "undefined" === typeof bCancel || ! bCancel ) {
-			var fileSelect = document.getElementById('file');
-			var files = fileSelect.files;
-				if (files.length == 0) {
-				clearFileError();
-				showFileError('<fmt:message key="button.select.importfile"/>');
-				return false;
-			} else {
-				var file = files[0];
-				if ( ! validateShowErrorSpreadsheetType(file, '<fmt:message key="error.attachment.not.xls"/>', false)
-						 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+	<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set> 
+	<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set> 
+	<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set> 
+	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
+	 
+	<script language="javascript" type="text/JavaScript">
+		
+		function verifyAndSubmit() {
+			if ( "undefined" === typeof bCancel || ! bCancel ) {
+				var fileSelect = document.getElementById('file');
+				var files = fileSelect.files;
+					if (files.length == 0) {
+					clearFileError();
+					showFileError('<fmt:message key="button.select.importfile"/>');
 					return false;
+				} else {
+					var file = files[0];
+					if ( ! validateShowErrorSpreadsheetType(file, '<fmt:message key="error.attachment.not.xls"/>', false)
+							 || ! validateShowErrorFileSize(file, '${UPLOAD_FILE_MAX_SIZE}', '<fmt:message key="errors.maxfilesize"/>') ) {
+						return false;
+					}
 				}
+			document.getElementById('fileUpload_Busy').style.display = '';
 			}
-		document.getElementById('fileUpload_Busy').style.display = '';
 		}
-	}
- </script>
+	 </script>
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="title"><fmt:message key="sysadmin.import.groups.title"/></c:set>
+	<c:set var="help"><fmt:message key="Import+Groups"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	
+	<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
-
-<div id="main-page">
-
-<logic:notEmpty name="results">
-	<h4><fmt:message key="heading.import.results"/></h4>
-	<table cellspacing="5" cellpadding="5">
-		<tr><th width="115" align="right"><fmt:message key="table.heading.organisation.id"/></th><th><fmt:message key="admin.organisation.name"/></th></tr>
-		<%
-			List results = (List)request.getAttribute("results");
-			for (int i=0; i<results.size(); i++) {
-				out.print("<tr>");
-				List rowResult = (List)results.get(i);
-				if (rowResult != null && rowResult.size() >= 4) {
-					if (rowResult.get(3).equals(OrganisationType.COURSE_TYPE.toString())) {
-						out.print("<th>"+rowResult.get(0)+"</th>");
-						out.print("<th>"+rowResult.get(1)+"</th>");
-					} else if (rowResult.get(3).equals(OrganisationType.CLASS_TYPE.toString())) {
-						out.print("<td>"+rowResult.get(0)+"</td>");
-						out.print("<td>"+rowResult.get(1)+"</td>");
+	<div id="main-page">
+	
+	<c:if test="${not empty results}">
+		<h4><fmt:message key="heading.import.results"/></h4>
+		<table cellspacing="5" cellpadding="5">
+			<tr><th width="115" align="right"><fmt:message key="table.heading.organisation.id"/></th><th><fmt:message key="admin.organisation.name"/></th></tr>
+			<%
+				List results = (List)request.getAttribute("results");
+				for (int i=0; i<results.size(); i++) {
+					out.print("<tr>");
+					List rowResult = (List)results.get(i);
+					if (rowResult != null && rowResult.size() >= 4) {
+						if (rowResult.get(3).equals(OrganisationType.COURSE_TYPE.toString())) {
+							out.print("<th>"+rowResult.get(0)+"</th>");
+							out.print("<th>"+rowResult.get(1)+"</th>");
+						} else if (rowResult.get(3).equals(OrganisationType.CLASS_TYPE.toString())) {
+							out.print("<td>"+rowResult.get(0)+"</td>");
+							out.print("<td>"+rowResult.get(1)+"</td>");
+						}
+					} else { // it's an error message
+						out.print("<td colspan=\"2\">");
+						for (int j=0; j<rowResult.size(); j++) {
+							out.println(rowResult.get(j)+"<br/>");
+						}
+						out.print("</td>");
 					}
-				} else { // it's an error message
-					out.print("<td colspan=\"2\">");
-					for (int j=0; j<rowResult.size(); j++) {
-						out.println(rowResult.get(j)+"<br/>");
-					}
-					out.print("</td>");
+					out.println("</tr>");
 				}
-				out.println("</tr>");
-			}
-		%>
-	</table>
-	<hr />
-</logic:notEmpty>
+			%>
+		</table>
+		<hr />
+	</c:if>
+	
+	<p><fmt:message key="import.groups.intro"/></p>
+	<p>
+	<ul>
+		<li>
+			<fmt:message key="msg.import.1"/>
+		</li>
+		<li>
+			<fmt:message key="import.groups.instructions"/>
+		</li>
+		<li>
+			<fmt:message key="import.groups.download"/>
+			<ul><li><p><a href="file/lams_groups_template.xls">lams_groups_template.xls</a></p></li></ul>
+		</li>
+	</ul>
+	</p>
+	<p><fmt:message key="msg.import.conclusion"/></p>
+	
+	<form:form action="importgroups.do" modelAttribute="importForm" id="importForm" method="post" enctype="multipart/form-data" onsubmit="return verifyAndSubmit();">
+	<form:hidden path="orgId" />
+	
+	<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
+		<lams:WaitingSpinner id="fileUpload_Busy"/> 
+	
+	<div class="pull-right">
+	<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+	<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import"/>" /> &nbsp; 	
+	</div>
+	
+	</form:form>
+	
+	</div>
+	</lams:Page>
+		
+</body>
+</lams:html>
 
-<p><fmt:message key="import.groups.intro"/></p>
-<p>
-<ul>
-	<li>
-		<fmt:message key="msg.import.1"/>
-	</li>
-	<li>
-		<fmt:message key="import.groups.instructions"/>
-	</li>
-	<li>
-		<fmt:message key="import.groups.download"/>
-		<ul><li><p><a href="file/lams_groups_template.xls">lams_groups_template.xls</a></p></li></ul>
-	</li>
-</ul>
-</p>
-<p><fmt:message key="msg.import.conclusion"/></p>
 
-<html:form action="/importgroups.do" method="post" enctype="multipart/form-data" onsubmit="return verifyAndSubmit();">
-<html:hidden property="orgId" />
 
-<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
-	<lams:WaitingSpinner id="fileUpload_Busy"/> 
 
-<div class="pull-right">
-<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html:cancel>
-<html:submit styleId="importButton" styleClass="btn btn-primary loffset5"><fmt:message key="label.import"/></html:submit> &nbsp; 	
-</div>
-
-</html:form>
-
-</div>
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -9,8 +9,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/>
@@ -59,15 +58,10 @@
 </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>
+
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<c:set var="help"><fmt:message key="Import+Users"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 				<p>
 					<a href="<lams:LAMSURL/>/admin/sysadminstart.do"
@@ -125,100 +119,22 @@
 					<fmt:message key="msg.import.conclusion" />
 				</p>
 				
-				<form:form action="importexcelsave.do" modelAttribute="ImportExcelForm" method="post"
+				<form:form action="importexcelsave.do" modelAttribute="importExcelForm" id="importExcelForm" method="post"
 					enctype="multipart/form-data" onsubmit="return goToStatus();">
 					<form:hidden path="orgId" />
 				
 					<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
 					<lams:WaitingSpinner id="fileUpload_Busy"/> 
 				
 					<div class="pull-right">
-						<html:cancel styleId="cancelButton" styleClass="btn btn-default">
-							<fmt:message key="admin.cancel" />
-						</html:cancel>
-						<input type="submit" id="importButton" class="btn btn-primary loffset5"> value="<fmt:message key="label.import" />" />
+						<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" id="cancelButton" class="btn btn-default">
+						<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import" />" />
 						&nbsp;
 					</div>
 				
 				</form:form>
 			</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>
-				
-				<p>
-					<fmt:message key="msg.import.intro" />
-				</p>
-				<p>
-				<ul>
-					<li><fmt:message key="msg.import.1" /></li>
-					<li><fmt:message key="msg.import.2" />
-						<ul>
-							<li><p>
-									<a href="file/lams_users_template.xls">lams_users_template.xls</a>
-								</p></li>
-						</ul></li>
-					<li><fmt:message key="msg.import.3" />
-						<ul>
-							<li><p>
-									<a href="file/lams_roles_template.xls">lams_roles_template.xls</a>
-								</p></li>
-						</ul></li>
-				</ul>
-				</p>
-				<div class ="pull-left">
-					<lams:Alert type="info" close="false">
-						<strong><fmt:message key='label.password.must.contain' />:</strong>
-						<ul style="line-height: 1.2">
-							<li><span class="fa fa-check"></span> <fmt:message
-									key='label.password.min.length'>
-									<fmt:param value='${minNumChars}' />
-								</fmt:message></li>
-							<c:if test="${mustHaveUppercase}">
-								<li><span class="fa fa-check"></span> <fmt:message
-										key='label.password.must.ucase' /></li>
-							</c:if>
-							<c:if test="${mustHaveLowercase}">
-								<li><span class="fa fa-check"></span> <fmt:message
-										key='label.password.must.lcase' /></li>
-							</c:if>
-							<c:if test="${mustHaveNumerics}">
-								<li><span class="fa fa-check"></span> <fmt:message
-										key='label.password.must.number' /></li>
-							</c:if>
-							<c:if test="${mustHaveSymbols}">
-								<li><span class="fa fa-check"></span> <fmt:message
-										key='label.password.must.symbol' /></li>
-							</c:if>
-						</ul>
-					</lams:Alert>
-				</div>
-				<p>
-					<fmt:message key="msg.import.conclusion" />
-				</p>
-				
-				<form:form action="importexcelsave.do" modelAttribute="ImportExcelForm" method="post"
-					enctype="multipart/form-data" onsubmit="return goToStatus();">
-					<form:hidden path="orgId" />
-				
-					<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
-					<lams:WaitingSpinner id="fileUpload_Busy"/> 
-				
-					<div class="pull-right">
-						<html:cancel styleId="cancelButton" styleClass="btn btn-default">
-							<fmt:message key="admin.cancel" />
-						</html:cancel>
-						<input type="submit" id="importButton" class="btn btn-primary loffset5"> value="<fmt:message key="label.import" />" />
-						&nbsp;
-					</div>
-				
-				</form:form>
-			</lams:Page>
-		</c:otherwise>
+
 	</c:choose>
 
 
Index: lams_admin/web/import/importresult.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,15 +1,39 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<title>${title}</title>
 
-<p><c:out value="${successful}" /></p>
-<p>
-<logic:iterate name="results" id="messages" indexId="index">
-	<logic:notEmpty name="messages">
-		Row <c:out value="${index+2}" />:
-		<logic:iterate name="messages" id="message">
-			<bean:write name="message" /><br />
-		</logic:iterate>
-	</logic:notEmpty>
-</logic:iterate>
-</p>
+	<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="title"><fmt:message key="admin.user.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>
+
+		<p><c:out value="${successful}" /></p>
+		<p>
+		<c:forEach items="${results}" var="messages" indexId="index">
+			<c:if test="${not empty messages}">
+				Row <c:out value="${index+2}" />:
+				<c:forEach items="${messages}" var="message">
+					<c:out value="${message}" /><br />
+				</c:forEach>
+			</c:if>
+		</c:forEach>
+		</p>
+
+	</lams:Page>
+</body>
+</lams:html>
+
+
+
Index: lams_admin/web/import/status.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,55 +1,56 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.web.session.SessionManager" %>
 <%@ page import="org.lamsfoundation.lams.admin.service.IImportService" %>
 
-<!DOCTYPE html>
 <lams:html>
-<lams:head>
-	<lams:css/>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-</lams:head>
-
-<script language="javascript" type="text/JavaScript">
-	<% if (SessionManager.getSession().getAttribute("results") != null) { %>
-			document.location = '<lams:LAMSURL/>admin/importuserresult.do';
-	<% } %>
-
-	$(document).ready(function(){
-		document.getElementById('fileUpload_Busy').style.display = '';
-	});
+	<lams:head>
+		<lams:css/>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	</lams:head>
 	
-	function refresh() {
-		document.location = '<lams:LAMSURL/>admin/import/status.jsp';
-	}
-	window.setInterval("refresh()",5000);
-</script>
+	<script language="javascript" type="text/JavaScript">
+		<% if (SessionManager.getSession().getAttribute("results") != null) { %>
+				document.location = '<lams:LAMSURL/>admin/importuserresult.do';
+		<% } %>
+	
+		$(document).ready(function(){
+			document.getElementById('fileUpload_Busy').style.display = '';
+		});
+		
+		function refresh() {
+			document.location = '<lams:LAMSURL/>admin/import/status.jsp';
+		}
+		window.setInterval("refresh()",5000);
+	</script>
 
-<c:set var="progressMessage">
-<%
-	Integer importTotal = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORT_TOTAL);
-	Integer imported = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORTED);
-	String progress = "";
-	try {
-		float percent = imported.floatValue()/importTotal.floatValue() * 100;
-		progress = (new Float(percent)).toString();
-		progress = (progress.length() >= 5 ? progress.substring(0,5) : progress);
-	} catch (Exception e) {}
-	out.println((progress.length()>0?progress:"0")+"% completed...");
-%>
-</c:set>	
+	<c:set var="progressMessage">
+	<%
+		Integer importTotal = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORT_TOTAL);
+		Integer imported = (Integer)SessionManager.getSession().getAttribute(IImportService.STATUS_IMPORTED);
+		String progress = "";
+		try {
+			float percent = imported.floatValue()/importTotal.floatValue() * 100;
+			progress = (new Float(percent)).toString();
+			progress = (progress.length() >= 5 ? progress.substring(0,5) : progress);
+		} catch (Exception e) {}
+		out.println((progress.length()>0?progress:"0")+"% completed...");
+	%>
+	</c:set>	
 
 <body class="stripes">
-<c:set var="title"><fmt:message key="admin.user.import" /></c:set>
-<lams:Page type="admin" title="${title}">
-
-	<div align="center">	
-		<h3><fmt:message key="msg.please.wait"/></h3>
-		<p>${progressMessage}</p>
-	</div>
-		
-	<lams:WaitingSpinner id="fileUpload_Busy"/> 
+	<c:set var="title"><fmt:message key="admin.user.import" /></c:set>
+	<lams:Page type="admin" title="${title}">
 	
-</lams:Page>
+		<div align="center">	
+			<h3><fmt:message key="msg.please.wait"/></h3>
+			<p>${progressMessage}</p>
+		</div>
+			
+		<lams:WaitingSpinner id="fileUpload_Busy"/> 
+		
+	</lams:Page>
 </body>
 
 </lams:html>
\ No newline at end of file
Index: lams_admin/web/joblist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/joblist.jsp	(.../joblist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/joblist.jsp	(.../joblist.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,33 +1,56 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<div align="center" id="jobList">
-	<div id="datatablecontainer">
-	<table width="100%" align="CENTER" 	class="form">
-		<tr>
-			<td valign="MIDDLE"><b><fmt:message key="title.job.list"/></b></td>
-			<td colspan="2" />
-		</tr>
-		<tr>
-			<th scope="col" width="25%"><fmt:message key="lable.job.name"/></th>
-			<th scope="col" width="25%"><fmt:message key="lable.job.start.date"/></th>
-			<th scope="col" width="50%"><fmt:message key="lable.job.description"/></th>
-		</tr>
-		<c:forEach items="${jobList}" var="job" varStatus="status">
-			<tr>
-				<td>
-					<c:out value="${job.name}"/>
-				</td>
-				<td>
-					<lams:Date value="${job.startDate}"/>
-				</td>
-				<td>
-					<c:out value="${job.description}"/>
-				</td>
-			</tr>
-		</c:forEach>
-		<tr>
-			<td colspan="3" >Total jobs: ${fn:length(jobList)}</td>
-		</tr>
-	</table>
-	</div>
-</div>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.list.job"/></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">
+	<lams:Page type="admin" title="${title}">
+		<div align="center" id="jobList">
+			<div id="datatablecontainer">
+			<table width="100%" align="CENTER" 	class="form">
+				<tr>
+					<td valign="MIDDLE"><b><fmt:message key="title.job.list"/></b></td>
+					<td colspan="2" />
+				</tr>
+				<tr>
+					<th scope="col" width="25%"><fmt:message key="lable.job.name"/></th>
+					<th scope="col" width="25%"><fmt:message key="lable.job.start.date"/></th>
+					<th scope="col" width="50%"><fmt:message key="lable.job.description"/></th>
+				</tr>
+				<c:forEach items="${jobList}" var="job" varStatus="status">
+					<tr>
+						<td>
+							<c:out value="${job.name}"/>
+						</td>
+						<td>
+							<lams:Date value="${job.startDate}"/>
+						</td>
+						<td>
+							<c:out value="${job.description}"/>
+						</td>
+					</tr>
+				</c:forEach>
+				<tr>
+					<td colspan="3" >Total jobs: ${fn:length(jobList)}</td>
+				</tr>
+			</table>
+			</div>
+		</div>
+
+	</lams:Page>
+</body>
+</lams:html>
+
+
+
Index: lams_admin/web/ldap.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 
 <%@ include file="/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.config.ConfigurationItem" %>
 <%@ page import="org.lamsfoundation.lams.web.session.SessionManager" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.service.ILdapService" %>
 
 <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="sysadmin.ldap.configuration"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -28,42 +28,71 @@
 </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}">
-				<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+	<c:set var="title"><fmt:message key="sysadmin.ldap.configuration"/></c:set>
+	<c:set var="help"><fmt:message key="LDAP+Configuration"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="">
+		
+		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title"><fmt:message key="sysadmin.ldap.configuration"/></div>
-					</div>
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<div class="panel-title"><fmt:message key="sysadmin.ldap.configuration"/></div>
+			</div>
 				
-					<div class="panel-body panel-default">
-						<c:if test="${not empty config}">
-						<form:form action="save.do" modelAttribute="configForm" id="configForm" method="post">
-							<%@ include file="/config/items.jsp"%>
-							<div class="pull-right">
-								<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
-								<html:cancel styleClass="btn btn-default loffset5"><fmt:message key="admin.cancel" /></html:cancel>
-								<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+			<div class="panel-body panel-default">
+				<c:if test="${not empty config}">
+					<form:form action="save.do" modelAttribute="configForm" id="configForm" method="post">
+						<c:forEach items="${config}" var="group">
+							<div class="panel panel-default">
+								<div class="panel-heading">
+									<div class="panel-title"><fmt:message key="${group.key}"/></div>
+								</div>
+												
+								<table class="table table-striped table-condensed" >
+									<c:forEach items="${group}" path="value" var="row">
+										<tr>
+											<td>
+												<fmt:message key="${row.descriptionKey}"/>
+												<c:if test="${row.required}">&nbsp;&nbsp;*</c:if>
+											</td>
+											<td>
+												<form:hidden path="key" name="key" value="${row.key}"/>
+												<c:set var="BOOLEAN"><%= ConfigurationItem.BOOLEAN_FORMAT %></c:set>
+												<c:choose>
+												<c:when test="${row.format==BOOLEAN}">
+													<form:select id="${row.key}" name="row" path="value" cssClass="form-control form-control-sm">
+													<form:option value="true">true</form:option>
+													<form:option value="false">false&nbsp;&nbsp;</form:option>
+													</form:select>
+												</c:when>
+												<c:otherwise>
+													<form:input id="${row.key}" path="value" name="row" value="${row.value}" size="50" maxlength="255" cssClass="form-control"/>
+												</c:otherwise>
+												</c:choose>
+											</td>
+										</tr>
+									</c:forEach>
+								</table>
 							</div>
-						</form:form>
-						</c:if>
-					</div>
-				</div>
+						</c:forEach>
+					
+						<div class="pull-right">
+							<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
+							<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default loffset5">
+							<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+						</div>
+					</form:form>
+				</c:if>
+			</div>
+		</div>
+		
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<div class="panel-title"><fmt:message key="heading.ldap.synchronise"/></div>
+			</div>
 				
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title"><fmt:message key="heading.ldap.synchronise"/></div>
-					</div>
-				
 					<div class="panel-body panel-default">
 						<p><fmt:message key="msg.ldap.synchronise.intro"/></p>
 						<p><fmt:message key="msg.ldap.synchronise.warning"/></p>
@@ -82,123 +111,40 @@
 							</script>
 						</c:if>
 						
-						<c:if test="${not empty done}">
-							<h4><c:out value="${done}"/></h4>
-							<ul>
-								<c:if test="${not empty messages}">
-								<li>
-									<fmt:message key="msg.ldap.synchronise.errors"/>
+			<c:if test="${not empty done}">
+				<h4><c:out value="${done}"/></h4>
+					<ul>
+						<c:if test="${not empty messages}">
+							<li>
+								<fmt:message key="msg.ldap.synchronise.errors"/>
 									<ul>
 										<c:forEach items="${messages}" var="message">
 											<li><c:out value="${message}"/></li>
 										</c:forEach>
 									</ul>
-								</li>
-								</c:if>
-								<c:if test="${not empty numSearchResults}">
-								<li><c:out value="${numSearchResults}"/></li>
-								</c:if>
-								<c:if test="${not empty numLdapUsersCreated}">
-								<li><c:out value="${numLdapUsersCreated}"/></li>
-								</c:if>
-								<c:if test="${not empty numLdapUsersUpdated}">
-								<li><c:out value="${numLdapUsersUpdated}"/></li>
-								</c:if>
-								<c:if test="${not empty numLdapUsersDisabled}">
-								<li><c:out value="${numLdapUsersDisabled}"/></li>
-								</c:if>
-							</ul>
+							</li>
 						</c:if>
-						
-						<input class="btn btn-primary pull-right" value="<fmt:message key="label.synchronise" />" onclick='startSync();'/>
-						
-					</div>
-				</div>
-			</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>
-
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title"><fmt:message key="sysadmin.ldap.configuration"/></div>
-					</div>
-				
-					<div class="panel-body panel-default">
-						<c:if test="${not empty config}">
-						<form:form action="save.do" modelAttribute="configForm" id="configForm" method="post">
-							<%@ include file="/config/items.jsp"%>
-							<div class="pull-right">
-								<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
-								<html:cancel styleClass="btn btn-default loffset5"><fmt:message key="admin.cancel" /></html:cancel>
-								<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
-							</div>
-						</form:form>
+						<c:if test="${not empty numSearchResults}">
+							<li><c:out value="${numSearchResults}"/></li>
 						</c:if>
-					</div>
-				</div>
-				
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title"><fmt:message key="heading.ldap.synchronise"/></div>
-					</div>
-				
-					<div class="panel-body panel-default">
-						<p><fmt:message key="msg.ldap.synchronise.intro"/></p>
-						<p><fmt:message key="msg.ldap.synchronise.warning"/></p>
-						
-						<c:if test="${not empty numLdapUsersMsg}">
-							<p><c:out value="${numLdapUsersMsg}"/></p>
+						<c:if test="${not empty numLdapUsersCreated}">
+							<li><c:out value="${numLdapUsersCreated}"/></li>
 						</c:if>
-						
-						<c:if test="${not empty wait}">
-							<p><c:out value="${wait}"/></p>
-							<script language="javascript" type="text/javascript">
-								function refresh() {
-									document.location = 'ldap/waiting.do';
-								}
-								window.setInterval("refresh()",5000);
-							</script>
+						<c:if test="${not empty numLdapUsersUpdated}">
+							<li><c:out value="${numLdapUsersUpdated}"/></li>
 						</c:if>
-						
-						<c:if test="${not empty done}">
-							<h4><c:out value="${done}"/></h4>
-							<ul>
-								<c:if test="${not empty messages}">
-								<li>
-									<fmt:message key="msg.ldap.synchronise.errors"/>
-									<ul>
-										<c:forEach items="${messages}" var="message">
-											<li><c:out value="${message}"/></li>
-										</c:forEach>
-									</ul>
-								</li>
-								</c:if>
-								<c:if test="${not empty numSearchResults}">
-								<li><c:out value="${numSearchResults}"/></li>
-								</c:if>
-								<c:if test="${not empty numLdapUsersCreated}">
-								<li><c:out value="${numLdapUsersCreated}"/></li>
-								</c:if>
-								<c:if test="${not empty numLdapUsersUpdated}">
-								<li><c:out value="${numLdapUsersUpdated}"/></li>
-								</c:if>
-								<c:if test="${not empty numLdapUsersDisabled}">
-								<li><c:out value="${numLdapUsersDisabled}"/></li>
-								</c:if>
-							</ul>
+						<c:if test="${not empty numLdapUsersDisabled}">
+							<li><c:out value="${numLdapUsersDisabled}"/></li>
 						</c:if>
+					</ul>
+			</c:if>
 						
-						<input class="btn btn-primary pull-right" value="<fmt:message key="label.synchronise" />" onclick='startSync();'/>
+			<input class="btn btn-primary pull-right" value="<fmt:message key="label.synchronise" />" onclick='startSync();'/>
 						
-					</div>
-				</div>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
+			</div>
+		</div>				
+	</lams:Page>
 
-
 </body>
 </lams:html>
 
Index: lams_admin/web/logevent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,243 +1,266 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="label.event.log"/></c:set>
+	<title>${title}</title>
 
-<link rel="stylesheet" href="${lams}css/jquery-ui.timepicker.css" />
-<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css"/>
-<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css" />
+	<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" />
+	
+	<c:set var="lams"><lams:LAMSURL/></c:set>
 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/portrait.js" ></script>
-
-<script type="text/javascript">
-
-	<fmt:message key="label.lesson.with.name" var="LESSON_LABEL_VAR"><fmt:param value="{0}"/></fmt:message>
-	const LESSON_LABEL = '<c:out value="${LESSON_LABEL_VAR}" />';
-	<fmt:message key="label.activity.with.name" var="ACTIVITY_LABEL_VAR"><fmt:param value="{0}"/></fmt:message>
-	const ACTIVITY_LABEL = '<c:out value="${ACTIVITY_LABEL_VAR}" />';
-
-	var areaMenu, 
-		typeMenu,
-		areaTypeMenus = {},
-		areaOptions = [],
-		typeDescriptions = {};
+	<link rel="stylesheet" href="${lams}css/jquery-ui.timepicker.css" />
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css"/>
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css" />
 	
-	$(document).ready(function(){
-		<c:forEach var="eventType" items="${eventLogTypes}">
-			addEventType("${eventType.id}","${eventType.description}","${eventType.areaCode}","${eventType.areaDescription}");
-		</c:forEach>		
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script> 
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/portrait.js" ></script>
+	
+	<script type="text/javascript">
+	
+		<fmt:message key="label.lesson.with.name" var="LESSON_LABEL_VAR"><fmt:param value="{0}"/></fmt:message>
+		const LESSON_LABEL = '<c:out value="${LESSON_LABEL_VAR}" />';
+		<fmt:message key="label.activity.with.name" var="ACTIVITY_LABEL_VAR"><fmt:param value="{0}"/></fmt:message>
+		const ACTIVITY_LABEL = '<c:out value="${ACTIVITY_LABEL_VAR}" />';
+	
+		var areaMenu, 
+			typeMenu,
+			areaTypeMenus = {},
+			areaOptions = [],
+			typeDescriptions = {};
 		
-		areaMenu = document.getElementById("areaMenu");
-		areaMenu.options[0] = new Option('<fmt:message key="label.select.topic"/>','');
-		for ( i=1; i <= areaOptions.length; i++) {
-			areaMenu.options[i] = areaOptions[i-1];
+		$(document).ready(function(){
+			<c:forEach var="eventType" items="${eventLogTypes}">
+				addEventType("${eventType.id}","${eventType.description}","${eventType.areaCode}","${eventType.areaDescription}");
+			</c:forEach>		
+			
+			areaMenu = document.getElementById("areaMenu");
+			areaMenu.options[0] = new Option('<fmt:message key="label.select.topic"/>','');
+			for ( i=1; i <= areaOptions.length; i++) {
+				areaMenu.options[i] = areaOptions[i-1];
+			}
+			typeMenu = document.getElementById("typeMenu");
+			
+			$("#endDatePicker").datepicker();
+			var now = new Date();
+			$("#endDatePicker").datepicker( "setDate", now );
+			$("#startDatePicker").datepicker();
+			var startDateParts = "${startDate}".split("-"); 	// YYYY-MM-DD
+			if ( startDateParts.length == 3 ) {
+				var startDate = new Date(startDateParts[0], startDateParts[1]-1, startDateParts[2]);
+				$("#startDatePicker").datepicker( "setDate", startDate );
+			} else {
+				$("#startDatePicker").datepicker( "setDate",  now);
+			}
+			
+			$(".tablesorter").tablesorter({
+				theme: 'bootstrap',
+				headerTemplate : '{content} {icon}',
+			    sortInitialOrder: 'desc',
+			    sortList: [[0]],
+			    widgets: [ "uitheme", "resizable", "filter" ],
+			    headers: { 0: { filter: false}, 1: { filter: false, sorter: false}, 2: { filter: false, sorter: false}, 3: { filter: false, sorter: false}, 4: { filter: false, sorter: false},  }, 
+			    sortList : [[0,1]],
+			    showProcessing: true,
+			    widgetOptions: {
+			    	resizable: true,
+			    	// include column filters 
+			        filter_columnFilters: true, 
+			        filter_placeholder: { search : '<fmt:message key="label.search"/>' }, 
+			        filter_searchDelay: 700 
+			    }
+			});
+	
+			$(".tablesorter").each(function() {
+				$(this).tablesorterPager({
+					processAjaxOnInit: false, 
+					initialRows: {
+				        total: 10,
+				        filtered: 10
+				      },
+					savePages: false,
+			        container: $(this).find(".ts-pager"),
+			        output: '{startRow} to {endRow} ({totalRows})',
+			        cssPageDisplay: '.pagedisplay',
+			        cssPageSize: '.pagesize',
+			        cssDisabled: 'disabled',
+					ajaxUrl : "<c:url value='logevent/getEventLog.do?sessionMapID=${sessionMapID}&page={page}&size={size}&{sortList:column}&{filterList:fcol}&s",
+					ajaxProcessing: function (data, table) {
+				    	if (data && data.hasOwnProperty('rows')) {
+				    		var rows = [],
+				            json = {};
+				    		
+							for (i = 0; i < data.rows.length; i++){
+								var logData = data.rows[i];
+								
+								rows += '<tr>';
+	
+								rows += '<td style="width:20%">';
+								rows += 	logData['dateOccurred'];
+								rows += '</td>';
+	
+								rows += '<td>';
+								var typeId = logData['typeId'];
+								var typeDescription;
+								if ( typeId )
+									typeDescription = typeDescriptions[typeId];
+								if ( ! typeDescription ) {
+									// this should never occur but just in case
+									typeDescription = '[<fmt:message key="label.unknown"/>'+typeId+']';
+								}
+								rows += typeDescription;
+								rows += '</td>';
+	
+								rows += '<td>';
+								if ( logData['userId'] ) {
+									rows += 	definePortraitPopover(logData['userPortraitId'], logData['userId'], logData['userName'], logData['userName']);
+								} else {
+									rows += '-';
+								}
+								rows += '</td>';
+	
+								rows += '<td>';
+								if ( logData['targetUserId'] ) {
+									rows += 	definePortraitPopover(logData['targetUserPortraitId'], logData['targetUserId'], logData['targetUserName'], logData['targetUserName']);
+								} else {
+									rows += '-';
+								}
+								rows += '</td>';
+	
+								rows += '<td>';
+								var lesson = null, activity = null, description = null, lineCount = 0;
+								if ( logData['lessonId'] ) {
+									lesson = LESSON_LABEL.replace('{0}',logData['lessonName']).replace('{1}',logData['lessonId']);
+									lineCount++;
+								}
+								if ( logData['activityId'] ) {
+									activity = ACTIVITY_LABEL.replace('{0}',logData['activityName']).replace('{1}',logData['activityId']);
+									lineCount++;
+								}
+								if ( logData['description'] ) {
+									description = logData['description'];
+									lineCount++;
+								}
+								if ( lesson != null ) {
+									rows+=lesson; 
+									if ( lineCount > 1 )
+										rows+='<BR/>';
+								}
+								if ( activity != null ) {
+									rows+=activity; 
+									if ( lineCount > 1 )
+										rows+='<BR/>';
+								}
+								if ( description != null ) {
+									rows+=description; 
+								}
+								rows += '</td>';
+	
+								rows += '</tr>';
+							}
+				            
+							json.total = data.total_rows;
+							json.rows = $(rows);
+							return json;
+				            
+				    		}
+					},
+					customAjaxUrl: function(table, url) {
+						var startDate = $("#startDatePicker").datepicker("getDate");
+						if ( startDate )
+							url += "&startDate="+startDate.getTime();
+						var endDate = $("#endDatePicker").datepicker("getDate");
+						if ( endDate )
+							url += "&endDate="+endDate.getTime();
+						var area = $("#areaMenu").val();
+						if ( area )
+							url += "&area="+area;
+						var typeId = $("#typeMenu").val();
+						if ( typeId )
+					    	  	url += "&typeId="+typeId;
+				        return url;
+				   	},
+				  })
+				  .bind('pagerInitialized pagerComplete', function(event, options){
+					  if ( options.totalRows == 0 ) {
+						  $.tablesorter.showError($(this), '<fmt:message key="label.no.data.found"/>');
+					  } else {
+						initializePortraitPopover('${lams}');
+					  }
+	 				})
+				 
+				});
+	
+		}); // end document.ready
+		
+		function addEventType(typeId, typeDescription, areaCode, areaDescription) {
+			var areaTypes = areaTypeMenus[areaCode];
+			if ( ! areaTypes ) {
+				areaTypes = [];
+				areaTypes.push(new Option('<fmt:message key="label.select.type"/>',''));
+				areaTypeMenus[areaCode] = areaTypes;
+				areaOptions.push(new Option(areaDescription, areaCode));
+			}
+			areaTypes.push(new Option(typeDescription, typeId));
+			typeDescriptions[typeId] = typeDescription;
 		}
-		typeMenu = document.getElementById("typeMenu");
 		
-		$("#endDatePicker").datepicker();
-		var now = new Date();
-		$("#endDatePicker").datepicker( "setDate", now );
-		$("#startDatePicker").datepicker();
-		var startDateParts = "${startDate}".split("-"); 	// YYYY-MM-DD
-		if ( startDateParts.length == 3 ) {
-			var startDate = new Date(startDateParts[0], startDateParts[1]-1, startDateParts[2]);
-			$("#startDatePicker").datepicker( "setDate", startDate );
-		} else {
-			$("#startDatePicker").datepicker( "setDate",  now);
+		function configureTypeDropdown( areaCode ) {
+	        typeMenu.length = 0;
+	        var newTypeOptions = areaTypeMenus[areaCode];
+	        if ( newTypeOptions ) {
+		    		for ( i=0; i < newTypeOptions.length; i++) {
+		    			typeMenu.options[i] = newTypeOptions[i];
+		    		}
+	        }
+	        typeMenu[0].selected = true;
 		}
 		
-		$(".tablesorter").tablesorter({
-			theme: 'bootstrap',
-			headerTemplate : '{content} {icon}',
-		    sortInitialOrder: 'desc',
-		    sortList: [[0]],
-		    widgets: [ "uitheme", "resizable", "filter" ],
-		    headers: { 0: { filter: false}, 1: { filter: false, sorter: false}, 2: { filter: false, sorter: false}, 3: { filter: false, sorter: false}, 4: { filter: false, sorter: false},  }, 
-		    sortList : [[0,1]],
-		    showProcessing: true,
-		    widgetOptions: {
-		    	resizable: true,
-		    	// include column filters 
-		        filter_columnFilters: true, 
-		        filter_placeholder: { search : '<fmt:message key="label.search"/>' }, 
-		        filter_searchDelay: 700 
-		    }
-		});
+		function getEvents() {
+			$(".tablesorter").trigger('pagerUpdate', 1);
+		}
+	 </script>
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="title"><fmt:message key="label.event.log"/></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>
 
-		$(".tablesorter").each(function() {
-			$(this).tablesorterPager({
-				processAjaxOnInit: false, 
-				initialRows: {
-			        total: 10,
-			        filtered: 10
-			      },
-				savePages: false,
-		        container: $(this).find(".ts-pager"),
-		        output: '{startRow} to {endRow} ({totalRows})',
-		        cssPageDisplay: '.pagedisplay',
-		        cssPageSize: '.pagesize',
-		        cssDisabled: 'disabled',
-				ajaxUrl : "<c:url value='logevent.do'/>?method=getEventLog&sessionMapID=${sessionMapID}&page={page}&size={size}&{sortList:column}&{filterList:fcol}&s",
-				ajaxProcessing: function (data, table) {
-			    	if (data && data.hasOwnProperty('rows')) {
-			    		var rows = [],
-			            json = {};
-			    		
-						for (i = 0; i < data.rows.length; i++){
-							var logData = data.rows[i];
-							
-							rows += '<tr>';
+			<div class="form form-inline">
+				<span><select id="areaMenu" class="form-control" onchange="javascript:configureTypeDropdown(this.value)"></select>&nbsp;
+				<select id="typeMenu" class="form-control"></select></span>
+				<span class="pull-right"><fmt:message key="label.between.dates"/>&nbsp;<input type="text" class="form-control" name="startDatePicker" id="startDatePicker" value=""/>
+				&nbsp;<input type="text" class="form-control" name="endDatePicker" id="endDatePicker" value=""/>
+				<a href="#" class="btn btn-default" onclick="javascript:getEvents()"><fmt:message key="admin.search"/></a>
+				</span>
+			</div>
+		
+			<div class="voffset10">	
+			<lams:TSTable numColumns="5" dataId="data-session-id='1'">
+					<th style="width:20%"><fmt:message key="label.date"/></th>
+					<th class="no-spinner"><fmt:message key="label.event.type"/></th>
+					<th class="no-spinner" style="width:12%"><fmt:message key="audit.change.made.by"/></th>
+					<th class="no-spinner" style="width:12%"><fmt:message key="audit.change.made.to"/></th>
+					<th class="no-spinner"><fmt:message key="audit.remarks"/></th>
+			</lams:TSTable>
+			</div>
+	</lams:Page>
 
-							rows += '<td style="width:20%">';
-							rows += 	logData['dateOccurred'];
-							rows += '</td>';
+</body>
+</lams:html>
 
-							rows += '<td>';
-							var typeId = logData['typeId'];
-							var typeDescription;
-							if ( typeId )
-								typeDescription = typeDescriptions[typeId];
-							if ( ! typeDescription ) {
-								// this should never occur but just in case
-								typeDescription = '[<fmt:message key="label.unknown"/>'+typeId+']';
-							}
-							rows += typeDescription;
-							rows += '</td>';
 
-							rows += '<td>';
-							if ( logData['userId'] ) {
-								rows += 	definePortraitPopover(logData['userPortraitId'], logData['userId'], logData['userName'], logData['userName']);
-							} else {
-								rows += '-';
-							}
-							rows += '</td>';
 
-							rows += '<td>';
-							if ( logData['targetUserId'] ) {
-								rows += 	definePortraitPopover(logData['targetUserPortraitId'], logData['targetUserId'], logData['targetUserName'], logData['targetUserName']);
-							} else {
-								rows += '-';
-							}
-							rows += '</td>';
-
-							rows += '<td>';
-							var lesson = null, activity = null, description = null, lineCount = 0;
-							if ( logData['lessonId'] ) {
-								lesson = LESSON_LABEL.replace('{0}',logData['lessonName']).replace('{1}',logData['lessonId']);
-								lineCount++;
-							}
-							if ( logData['activityId'] ) {
-								activity = ACTIVITY_LABEL.replace('{0}',logData['activityName']).replace('{1}',logData['activityId']);
-								lineCount++;
-							}
-							if ( logData['description'] ) {
-								description = logData['description'];
-								lineCount++;
-							}
-							if ( lesson != null ) {
-								rows+=lesson; 
-								if ( lineCount > 1 )
-									rows+='<BR/>';
-							}
-							if ( activity != null ) {
-								rows+=activity; 
-								if ( lineCount > 1 )
-									rows+='<BR/>';
-							}
-							if ( description != null ) {
-								rows+=description; 
-							}
-							rows += '</td>';
-
-							rows += '</tr>';
-						}
-			            
-						json.total = data.total_rows;
-						json.rows = $(rows);
-						return json;
-			            
-			    		}
-				},
-				customAjaxUrl: function(table, url) {
-					var startDate = $("#startDatePicker").datepicker("getDate");
-					if ( startDate )
-						url += "&startDate="+startDate.getTime();
-					var endDate = $("#endDatePicker").datepicker("getDate");
-					if ( endDate )
-						url += "&endDate="+endDate.getTime();
-					var area = $("#areaMenu").val();
-					if ( area )
-						url += "&area="+area;
-					var typeId = $("#typeMenu").val();
-					if ( typeId )
-				    	  	url += "&typeId="+typeId;
-			        return url;
-			   	},
-			  })
-			  .bind('pagerInitialized pagerComplete', function(event, options){
-				  if ( options.totalRows == 0 ) {
-					  $.tablesorter.showError($(this), '<fmt:message key="label.no.data.found"/>');
-				  } else {
-					initializePortraitPopover('${lams}');
-				  }
- 				})
-			 
-			});
-
-	}); // end document.ready
-	
-	function addEventType(typeId, typeDescription, areaCode, areaDescription) {
-		var areaTypes = areaTypeMenus[areaCode];
-		if ( ! areaTypes ) {
-			areaTypes = [];
-			areaTypes.push(new Option('<fmt:message key="label.select.type"/>',''));
-			areaTypeMenus[areaCode] = areaTypes;
-			areaOptions.push(new Option(areaDescription, areaCode));
-		}
-		areaTypes.push(new Option(typeDescription, typeId));
-		typeDescriptions[typeId] = typeDescription;
-	}
-	
-	function configureTypeDropdown( areaCode ) {
-        typeMenu.length = 0;
-        var newTypeOptions = areaTypeMenus[areaCode];
-        if ( newTypeOptions ) {
-	    		for ( i=0; i < newTypeOptions.length; i++) {
-	    			typeMenu.options[i] = newTypeOptions[i];
-	    		}
-        }
-        typeMenu[0].selected = true;
-	}
-	
-	function getEvents() {
-		$(".tablesorter").trigger('pagerUpdate', 1);
-	}
- </script>
-
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
-
-	<div class="form form-inline">
-		<span><select id="areaMenu" class="form-control" onchange="javascript:configureTypeDropdown(this.value)"></select>&nbsp;
-		<select id="typeMenu" class="form-control"></select></span>
-		<span class="pull-right"><fmt:message key="label.between.dates"/>&nbsp;<input type="text" class="form-control" name="startDatePicker" id="startDatePicker" value=""/>
-		&nbsp;<input type="text" class="form-control" name="endDatePicker" id="endDatePicker" value=""/>
-		<a href="#" class="btn btn-default" onclick="javascript:getEvents()"><fmt:message key="admin.search"/></a>
-		</span>
-	</div>
-
-	<div class="voffset10">	
-	<lams:TSTable numColumns="5" dataId="data-session-id='1'">
-			<th style="width:20%"><fmt:message key="label.date"/></th>
-			<th class="no-spinner"><fmt:message key="label.event.type"/></th>
-			<th class="no-spinner" style="width:12%"><fmt:message key="audit.change.made.by"/></th>
-			<th class="no-spinner" style="width:12%"><fmt:message key="audit.change.made.to"/></th>
-			<th class="no-spinner"><fmt:message key="audit.remarks"/></div></th>
-	</lams:TSTable>
-	</div>
-</div>
\ No newline at end of file
Index: lams_admin/web/loginmaintain.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,19 +1,50 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.maintain.loginpage"/></c:set>
+	<title>${title}</title>
 
-<html:errors />
+	<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="title"><fmt:message key="sysadmin.maintain.loginpage"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="loginMaintainForm">
+		
+		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+		
+		<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>
+		
+		<form:form action="./loginsave.do" modelAttribute="loginMaintainForm" id="loginMaintainForm" enctype="multipart/form-data" method="post">
+		<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+		<p class="help-block"><fmt:message key="sysadmin.login.text"/></p>
+		
+		<c:set var="existingContent"><c:out value="${loginMaintainForm.news}" filter='false' /></c:set>
+		
+		<lams:CKEditor id="news" value="${existingContent}"	contentFolderID="../public" height="600px"></lams:CKEditor>
+		
+		<div class="pull-right voffset5">
+			<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+			<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+		</div>
+		</form:form>
+	</lams:Page>
 
-<html:form action="/loginsave.do?method=save" enctype="multipart/form-data" method="post">
-<c:set var="language"><lams:user property="localeLanguage"/></c:set>
-<p class="help-block"><fmt:message key="sysadmin.login.text"/></p>
+</body>
+</lams:html>
 
-<c:set var="existingContent"><bean:write name='LoginMaintainForm' property='news' filter='false' /></c:set>
 
-<lams:CKEditor id="news" value="${existingContent}"	contentFolderID="../public" height="600px"></lams:CKEditor>
-
-<div class="pull-right voffset5">
-	<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
-	<html:submit styleId="saveButton" styleClass="btn btn-primary loffset5"><fmt:message key="admin.save" /></html:submit>
-</div>
-</html:form>
Index: lams_admin/web/lti/ltiConsumer.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -4,8 +4,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title" value="${label.edit.tool.consumer}"/>
-	<c:set var="title"><fmt:message key="${title}"/></c:set>
+	<c:set var="title"><fmt:message key="label.edit.tool.consumer"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -45,16 +44,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="label.edit.tool.consumer"/></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 				<p>
 					<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
 						<fmt:message key="sysadmin.maintain" />
@@ -118,95 +110,12 @@
 					</table>
 					
 					<div class="pull-right">
-						<html:cancel styleClass="btn btn-default">
-							<fmt:message key="admin.cancel" />
-						</html:cancel>
-						<input type="submit" name="submitbutton" class="btn btn-primary loffset5" 
-							value="<fmt:message key="admin.save" />" />
+						<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+						<input type="submit" name="submitbutton" 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="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
-						<fmt:message key="sysadmin.maintain" />
-					</a>
-					
-					<a href="<lams:LAMSURL/>/admin/ltiConsumerManagement/start.do" class="btn btn-default">
-						<fmt:message key="label.manage.tool.consumers" />
-					</a>
-				</p>
-					
-				<%-- 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>
-				<br />
-				
-				<form:form action="save.do" id="ltiConsumerForm" modelAttribute="ltiConsumerForm" method="post">
-					<form:hidden path="sid" />
-					<input type="hidden" name="serverTypeId" value="2">
-					<input type="hidden" name="timeToLiveLoginRequestEnabled" value="false">
-						
-					<table class="table table-no-border">
-						<tr>
-							<td><fmt:message key="sysadmin.serverkey" />&nbsp;*</td>
-							<td><input type="text" name="serverid" size="20" class="form-control"/></td>
-						</tr>
-						<tr>
-							<td><fmt:message key="sysadmin.serversecret" />&nbsp;*</td>
-							<td><input type="text" name="serverkey" size="30" class="form-control"/></td>
-						</tr>
-						<tr>
-							<td><fmt:message key="sysadmin.servername" />&nbsp;*</td>
-							<td><input type="text" name="servername" size="30" class="form-control"/></td>
-						</tr>
-						<tr>
-							<td valign="top"><fmt:message key="sysadmin.serverdesc" />:</td>
-							<td><input type="text" name="serverdesc" cols="40" rows="3" class="form-control"/></td>
-						</tr>
-						<tr>
-							<td><fmt:message key="sysadmin.prefix" />&nbsp;*</td>
-							<td><input type="text" name="prefix" size="10" class="form-control"/></td>
-						</tr>
-						
-						<tr>
-							<td><fmt:message key="sysadmin.disabled" />:</td>
-							<td><form:checkbox path="disabled" /></td>
-						</tr>
-						<tr>
-							<td><fmt:message key="sysadmin.lessonFinishUrl" />:</td>
-							<td>${lessonFinishUrl}</td>
-						</tr>
-						<tr>
-							<td><fmt:message key="sysadmin.lti.consumer.monitor.roles" />:</td>
-							<td><input type="text" name="ltiToolConsumerMonitorRoles" size="30"/></td>
-						</tr>
-					</table>
-					
-					<div class="pull-right">
-						<html:cancel styleClass="btn btn-default">
-							<fmt:message key="admin.cancel" />
-						</html:cancel>
-						<input type="submit" name="submitbutton" class="btn btn-primary loffset5" 
-							value="<fmt:message key="admin.save" />" />
-					</div>
-				</form:form>
-
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
 </body>
 </lams:html>
 
Index: lams_admin/web/lti/ltiConsumerList.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -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="label.manage.tool.consumers"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -16,16 +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}">
+	<c:set var="title"><fmt:message key="label.manage.tool.consumers"/></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" />
@@ -94,81 +86,6 @@
 				
 			</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>
-				
-				<table class="table table-striped">
-				
-					<tr>
-						<th><fmt:message key="sysadmin.serverid" /></th>
-						<th><fmt:message key="sysadmin.serverkey" /></th>
-						<th><fmt:message key="sysadmin.servername" /></th>
-						<th><fmt:message key="sysadmin.serverdesc" /></th>
-						<th><fmt:message key="sysadmin.prefix" /></th>
-						<th><fmt:message key="sysadmin.disabled" /></th>
-						<th><fmt:message key="admin.actions"/></th>
-					</tr>
-					
-					<c:forEach var="ltiConsumer" items="${ltiConsumers}">
-						<tr>
-							<td><c:out value="${ltiConsumer.serverid}" /></td>
-							<td><c:out value="${ltiConsumer.serverkey}" /></td>
-							<td><c:out value="${ltiConsumer.servername}" /></td>
-							<td><c:out value="${ltiConsumer.serverdesc}" /></td>
-							<td><c:out value="${ltiConsumer.prefix}" /></td>
-							<td>
-								<c:choose>
-									<c:when test="${ltiConsumer.disabled}" >
-										<fmt:message key="label.yes" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="label.no" />
-									</c:otherwise>
-								</c:choose>
-							</td>
-							<td>
-								<a href="ltiConsumerManagement/edit.do?sid=<c:out value='${ltiConsumer.sid}' />">
-									<fmt:message key="admin.edit" />
-								</a>
-								&nbsp;
-								<c:choose>
-									<c:when test="${ltiConsumer.disabled}">
-										<a href="ltiConsumerManagement/disable.do?disable=false&sid=<c:out value='${ltiConsumer.sid}' />">
-											<fmt:message key="admin.enable" />
-										</a>
-									</c:when>
-									<c:otherwise>
-										<a href="ltiConsumerManagement/disable.do?disable=true&sid=<c:out value='${ltiConsumer.sid}' />">
-											<fmt:message key="admin.disable" />
-										</a>
-									</c:otherwise>
-								</c:choose>
-								&nbsp;
-								<a href="ltiConsumerManagement/delete.do?sid=<c:out value='${ltiConsumer.sid}' />">
-									<fmt:message key="admin.delete" />
-								</a>
-							</td>
-						</tr>
-					</c:forEach>
-				</table>
-				
-				<p>${fn:length(ltiConsumers)}&nbsp;<fmt:message key="label.tool.consumers.count" /></p>
-				
-				<input class="btn btn-default pull-right" name="addNewLtiConsumer" type="button" value="<fmt:message key='label.add.tool.consumer' />" 
-						onClick="javascript:document.location='ltiConsumerManagement/edit.do'" />
-
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
 </body>
 </lams:html>
 
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,441 +1,462 @@
-<%@ include file="/taglibs.jsp"%>
+<!DOCTYPE html>
 
+<%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
-<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
-<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
-<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
-<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 
-<lams:css />
-<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet" />
-<style type="text/css">
-	.changeContainer .checkbox {
-		display: inline-block;
-	}
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.org.password.change.title"/></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" />
 	
-	.changeContainer .pass {
-		display: inline-block;
-		margin-left: 20px;
-		margin-right: 10px;
-		width: 260px;
-	}
+	<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
+	<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
+	<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
+	<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
+	<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 	
-	.changeContainer .fa {
-		cursor: pointer;
-	}
+	<lams:css />
+	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet" />
+	<style type="text/css">
+		.changeContainer .checkbox {
+			display: inline-block;
+		}
+		
+		.changeContainer .pass {
+			display: inline-block;
+			margin-left: 20px;
+			margin-right: 10px;
+			width: 260px;
+		}
+		
+		.changeContainer .fa {
+			cursor: pointer;
+		}
+		
+		h3, h4 {
+			text-align: center;
+		}
+		
+		#changeTable > tbody > tr > td{
+			padding-left: 50px;
+			padding-top: 20px;
+		}
+		
+		#changeTable > tbody > tr > td:first-child {
+			border-right: thin solid black;
+			padding-right: 50px;
+		}
+		
+		.gridCell {
+			vertical-align: top;
+		}
+		
+		.ui-jqgrid-btable tr[role="row"] {
+			cursor: pointer;	
+		}
+		
+		.ui-jqgrid-btable tr.success > td {
+			background-color: transparent !important;
+		}
+		
+		#formValidationErrors {
+			display: none;
+			text-align: center;		
+		}
+	</style>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
+	<script type="text/javascript">
+	     var mustHaveUppercase = ${mustHaveUppercase},
+		     mustHaveNumerics  = ${mustHaveNumerics},
+		     mustHaveLowercase  = ${mustHaveLowercase},
+		     mustHaveSymbols   = ${mustHaveSymbols};
+		 
+	     $.validator.addMethod("pwcheck", function(value) {
+		      return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters 
+				     (!mustHaveNumerics || /\d/.test(value)) && // has a digit
+				     (!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case
+				     (!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols
+	     });
+		 $.validator.addMethod("charactersAllowed", function(value) {
+			  return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/
+				     .test(value)
+		 });
 	
-	h3, h4 {
-		text-align: center;
-	}
+		$(function() {
+			// assign grid ID to each checkbox and define what happens when it gets (un)checked
+			var changeCheckboxes = $('#isStaffChange').data('grid', 'staffGrid')
+								  .add($('#isLearnerChange').data('grid', 'learnerGrid'))
+								  .change(function(){
+									  		var checkbox = $(this);
+											// prevent both checkboxes from being unchecked
+											if (!changeCheckboxes.is(':checked')) {
+												checkbox.prop('checked', true);
+												return;
+											}
+											
+											var	enabled = checkbox.prop('checked'),
+												grid = $('#' + checkbox.data('grid')).closest('.ui-jqgrid'),
+												pass = checkbox.closest('.changeContainer').find('.pass');
+											// disable/enable password input depending on checkbox state
+											// hide/show users grid
+											if (enabled) {
+												grid.slideDown();
+												pass.prop('disabled', false);
+											} else {
+												grid.slideUp();
+												pass.val(null).prop('disabled', true);
+											}
+										});
 	
-	#changeTable > tbody > tr > td{
-		padding-left: 50px;
-		padding-top: 20px;
-	}
-	
-	#changeTable > tbody > tr > td:first-child {
-		border-right: thin solid black;
-		padding-right: 50px;
-	}
-	
-	.gridCell {
-		vertical-align: top;
-	}
-	
-	.ui-jqgrid-btable tr[role="row"] {
-		cursor: pointer;	
-	}
-	
-	.ui-jqgrid-btable tr.success > td {
-		background-color: transparent !important;
-	}
-	
-	#formValidationErrors {
-		display: none;
-		text-align: center;		
-	}
-</style>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
-<script type="text/javascript">
-     var mustHaveUppercase = ${mustHaveUppercase},
-	     mustHaveNumerics  = ${mustHaveNumerics},
-	     mustHaveLowercase  = ${mustHaveLowercase},
-	     mustHaveSymbols   = ${mustHaveSymbols};
-	 
-     $.validator.addMethod("pwcheck", function(value) {
-	      return (!mustHaveUppercase || /[A-Z]/.test(value)) && // has uppercase letters 
-			     (!mustHaveNumerics || /\d/.test(value)) && // has a digit
-			     (!mustHaveLowercase || /[a-z]/.test(value)) && // has a lower case
-			     (!mustHaveSymbols || /[`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]/.test(value)); //has symbols
-     });
-	 $.validator.addMethod("charactersAllowed", function(value) {
-		  return /^[A-Za-z0-9\d`~!@#$%^&*\(\)_\-+={}\[\]\\|:\;\"\'\<\>,.?\/]*$/
-			     .test(value)
-	 });
-
-	$(function() {
-		// assign grid ID to each checkbox and define what happens when it gets (un)checked
-		var changeCheckboxes = $('#isStaffChange').data('grid', 'staffGrid')
-							  .add($('#isLearnerChange').data('grid', 'learnerGrid'))
-							  .change(function(){
-								  		var checkbox = $(this);
-										// prevent both checkboxes from being unchecked
-										if (!changeCheckboxes.is(':checked')) {
-											checkbox.prop('checked', true);
-											return;
-										}
-										
-										var	enabled = checkbox.prop('checked'),
-											grid = $('#' + checkbox.data('grid')).closest('.ui-jqgrid'),
-											pass = checkbox.closest('.changeContainer').find('.pass');
-										// disable/enable password input depending on checkbox state
-										// hide/show users grid
-										if (enabled) {
-											grid.slideDown();
-											pass.prop('disabled', false);
-										} else {
-											grid.slideUp();
-											pass.val(null).prop('disabled', true);
-										}
-									});
-
-		// generate new password on click
-		$('.generatePassword').click(function(){
-			var container = $(this).closest('.changeContainer');
-			if (!container.find('input[type="checkbox"]').prop('checked')) {
-				return;
-			}
-			$.ajax({
-				'url' : 'orgPasswordChange.do',
-				'data': {
-					'method' : 'generatePassword'
+			// generate new password on click
+			$('.generatePassword').click(function(){
+				var container = $(this).closest('.changeContainer');
+				if (!container.find('input[type="checkbox"]').prop('checked')) {
+					return;
 				}
-			}).done(function(password){
-				container.find('.pass').val(password);
+				$.ajax({
+					'url' : 'orgPasswordChange/generatePassword.do'
+					}
+				}).done(function(password){
+					container.find('.pass').val(password);
+				});
 			});
-		});
-		
-		
-		
-		// Setup form validation 
-		$("#OrgPasswordChangeForm").validate({
-			errorLabelContainer : '#formValidationErrors',
-			errorClass : 'errorMessage',
-			rules : {
-				learnerPass : {
-					required: false,
-					minlength : <c:out value="${minNumChars}"/>,
-					maxlength : 25,
-					charactersAllowed : true,
-					pwcheck : true
+			
+			
+			
+			// Setup form validation 
+			$("#OrgPasswordChangeForm").validate({
+				errorLabelContainer : '#formValidationErrors',
+				errorClass : 'errorMessage',
+				rules : {
+					learnerPass : {
+						required: false,
+						minlength : <c:out value="${minNumChars}"/>,
+						maxlength : 25,
+						charactersAllowed : true,
+						pwcheck : true
+					},
+					staffPass: {
+						required: false,
+						minlength : <c:out value="${minNumChars}"/>,
+						maxlength : 25,
+						charactersAllowed : true,
+						pwcheck : true
+					}
+					
 				},
-				staffPass: {
-					required: false,
-					minlength : <c:out value="${minNumChars}"/>,
-					maxlength : 25,
-					charactersAllowed : true,
-					pwcheck : true
-				}
-				
-			},
-
-			// Specify the validation error messages
-			messages : {
-				learnerPass : {
-					required : "<fmt:message key='error.password.empty'/>",
-					minlength : "<fmt:message key='admin.org.password.change.error.prefix.learner'/> <fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
-					maxlength : "<fmt:message key='admin.org.password.change.error.prefix.learner'/> <fmt:message key='label.password.max.length'/>",
-					charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
-					pwcheck : "<fmt:message key='label.password.restrictions'/>"
-				},
-				staffPass: {
-					required : "<fmt:message key='error.password.empty'/>",
-					minlength : "<fmt:message key='admin.org.password.change.error.prefix.staff'/> <fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
-					maxlength : "<fmt:message key='admin.org.password.change.error.prefix.staff'/> <fmt:message key='label.password.max.length'/>",
-					charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
-					pwcheck : "<fmt:message key='label.password.restrictions'/>"
-				}
-				
-			},
-
-			submitHandler : function(form) {
-				// see which mode are we in (included/excluded) and serialize JSON arrays into strings
-				var learnerGrid = $('#learnerGrid'),
-					staffGrid = $('#staffGrid'),
-					includedLearners = learnerGrid.data('included'),
-					excludedLearners = learnerGrid.data('excluded'),
-					includedStaff = staffGrid.data('included'),
-					excludedStaff = staffGrid.data('excluded');
-				$('#includedLearners').val(includedLearners === null ? '' : JSON.stringify(includedLearners));
-				$('#excludedLearners').val(excludedLearners === null ? '' : JSON.stringify(excludedLearners));
-				$('#includedStaff').val(includedStaff === null ? '' : JSON.stringify(includedStaff));
-				$('#excludedStaff').val(excludedStaff === null ? '' : JSON.stringify(excludedStaff));
-				form.submit();
-			}
-		});
-
-		var jqGridURL = "orgPasswordChange.do?method=getGridUsers&organisationID=<bean:write name='OrgPasswordChangeForm' property='organisationID' />&role=",
-			jqGridSettings = {
-				datatype		   : "json",
-			    height			   : "100%",
-			    // use new theme
-			    guiStyle 		   : "bootstrap",
-			    iconSet 		   : 'fontAwesome',
-			    autowidth		   : true,
-			    shrinkToFit 	   : true,
-			    multiselect 	   : true,
-			    multiPageSelection : true,
-			    // it gets ordered by 
-			    sortorder		   : "asc", 
-			    sortname		   : "firstName", 
-			    pager			   : true,
-			    rowNum			   : 10,
-				colNames : [
-					'<fmt:message key="admin.org.password.change.grid.name"/>',
-					'<fmt:message key="admin.org.password.change.grid.login"/>',
-					'<fmt:message key="admin.org.password.change.grid.email"/>'
-				],
-			    colModel : [
-			        {
-					   'name'  : 'name', 
-					   'index' : 'firstName',
-					   'title' : false
+	
+				// Specify the validation error messages
+				messages : {
+					learnerPass : {
+						required : "<fmt:message key='error.password.empty'/>",
+						minlength : "<fmt:message key='admin.org.password.change.error.prefix.learner'/> <fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
+						maxlength : "<fmt:message key='admin.org.password.change.error.prefix.learner'/> <fmt:message key='label.password.max.length'/>",
+						charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
+						pwcheck : "<fmt:message key='label.password.restrictions'/>"
 					},
-					{
-					   'name'  : 'login', 
-					   'index' : 'login',
-					   'title' : false
-					},
-			        {
-					   'name'  : 'email', 
-					   'index' : 'email',
-					   'title' : false
+					staffPass: {
+						required : "<fmt:message key='error.password.empty'/>",
+						minlength : "<fmt:message key='admin.org.password.change.error.prefix.staff'/> <fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
+						maxlength : "<fmt:message key='admin.org.password.change.error.prefix.staff'/> <fmt:message key='label.password.max.length'/>",
+						charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
+						pwcheck : "<fmt:message key='label.password.restrictions'/>"
 					}
-			    ],
-			    onSelectRow : function(id, status, event) {
-				    var grid = $(this),
-				   		included = grid.data('included'),
-						excluded = grid.data('excluded'),
-						selectAllChecked = grid.closest('.ui-jqgrid-view').find('.jqgh_cbox .cbox').prop('checked');
-					if (selectAllChecked) {
-						var index = excluded.indexOf(+id);
-						// if row is deselected, add it to excluded array
-						if (index < 0) {
-							if (!status) {
-								excluded.push(+id);
-							}
-						} else if (status) {
-							excluded.splice(index, 1);
+					
+				},
+	
+				submitHandler : function(form) {
+					// see which mode are we in (included/excluded) and serialize JSON arrays into strings
+					var learnerGrid = $('#learnerGrid'),
+						staffGrid = $('#staffGrid'),
+						includedLearners = learnerGrid.data('included'),
+						excludedLearners = learnerGrid.data('excluded'),
+						includedStaff = staffGrid.data('included'),
+						excludedStaff = staffGrid.data('excluded');
+					$('#includedLearners').val(includedLearners === null ? '' : JSON.stringify(includedLearners));
+					$('#excludedLearners').val(excludedLearners === null ? '' : JSON.stringify(excludedLearners));
+					$('#includedStaff').val(includedStaff === null ? '' : JSON.stringify(includedStaff));
+					$('#excludedStaff').val(excludedStaff === null ? '' : JSON.stringify(excludedStaff));
+					form.submit();
+				}
+			});
+	
+			var jqGridURL = "orgPasswordChange/getGridUsers.do?organisationID=<c:out value='${orgPasswordChangeForm.organisationID}' />&role=",
+				jqGridSettings = {
+					datatype		   : "json",
+				    height			   : "100%",
+				    // use new theme
+				    guiStyle 		   : "bootstrap",
+				    iconSet 		   : 'fontAwesome',
+				    autowidth		   : true,
+				    shrinkToFit 	   : true,
+				    multiselect 	   : true,
+				    multiPageSelection : true,
+				    // it gets ordered by 
+				    sortorder		   : "asc", 
+				    sortname		   : "firstName", 
+				    pager			   : true,
+				    rowNum			   : 10,
+					colNames : [
+						'<fmt:message key="admin.org.password.change.grid.name"/>',
+						'<fmt:message key="admin.org.password.change.grid.login"/>',
+						'<fmt:message key="admin.org.password.change.grid.email"/>'
+					],
+				    colModel : [
+				        {
+						   'name'  : 'name', 
+						   'index' : 'firstName',
+						   'title' : false
+						},
+						{
+						   'name'  : 'login', 
+						   'index' : 'login',
+						   'title' : false
+						},
+				        {
+						   'name'  : 'email', 
+						   'index' : 'email',
+						   'title' : false
 						}
-					} else {
-						var index = included.indexOf(+id);
-						// if row is selected, add it to included array
-						if (index < 0) {
-							if (status) {
-								included.push(+id);
+				    ],
+				    onSelectRow : function(id, status, event) {
+					    var grid = $(this),
+					   		included = grid.data('included'),
+							excluded = grid.data('excluded'),
+							selectAllChecked = grid.closest('.ui-jqgrid-view').find('.jqgh_cbox .cbox').prop('checked');
+						if (selectAllChecked) {
+							var index = excluded.indexOf(+id);
+							// if row is deselected, add it to excluded array
+							if (index < 0) {
+								if (!status) {
+									excluded.push(+id);
+								}
+							} else if (status) {
+								excluded.splice(index, 1);
 							}
-						} else if (!status) {
-							included.splice(index, 1);
+						} else {
+							var index = included.indexOf(+id);
+							// if row is selected, add it to included array
+							if (index < 0) {
+								if (status) {
+									included.push(+id);
+								}
+							} else if (!status) {
+								included.splice(index, 1);
+							}
 						}
-					}
-				},
-				gridComplete : function(){
-					var grid = $(this),
-						included = grid.data('included'),
-						// cell containing "(de)select all" button
-						selectAllCell = grid.closest('.ui-jqgrid-view').find('.jqgh_cbox > div');
-					// remove the default button provided by jqGrid
-					$('.cbox', selectAllCell).remove();
-					// create own button which follows own rules
-					var selectAllCheckbox = $('<input type="checkbox" class="cbox" />')
-											.prop('checked', included === null)
-											.prependTo(selectAllCell)
-											.change(function(){
-												// start with deselecting everyone on current page
-												grid.resetSelection();
-												if ($(this).prop('checked')){
-													// on select all change mode and select all on current page
-													grid.data('included', null);
-													grid.data('excluded', []);
-													$('[role="row"]', grid).each(function(){
-														grid.jqGrid('setSelection', +$(this).attr('id'), false);
-													});
-												} else {
-													// on deselect all just change mode
-													grid.data('excluded', null);
-													grid.data('included', []);
-												}
-											});
+					},
+					gridComplete : function(){
+						var grid = $(this),
+							included = grid.data('included'),
+							// cell containing "(de)select all" button
+							selectAllCell = grid.closest('.ui-jqgrid-view').find('.jqgh_cbox > div');
+						// remove the default button provided by jqGrid
+						$('.cbox', selectAllCell).remove();
+						// create own button which follows own rules
+						var selectAllCheckbox = $('<input type="checkbox" class="cbox" />')
+												.prop('checked', included === null)
+												.prependTo(selectAllCell)
+												.change(function(){
+													// start with deselecting everyone on current page
+													grid.resetSelection();
+													if ($(this).prop('checked')){
+														// on select all change mode and select all on current page
+														grid.data('included', null);
+														grid.data('excluded', []);
+														$('[role="row"]', grid).each(function(){
+															grid.jqGrid('setSelection', +$(this).attr('id'), false);
+														});
+													} else {
+														// on deselect all just change mode
+														grid.data('excluded', null);
+														grid.data('included', []);
+													}
+												});
+						
+						grid.resetSelection();
+						if (selectAllCheckbox.prop('checked')) {
+							var excluded = grid.data('excluded');
+							// go through each loaded row
+							$('[role="row"]', grid).each(function(){
+								var id = +$(this).attr('id'),
+									selected = $(this).hasClass('success');
+								// if row is not selected and is not excluded, select it
+								if (!selected && !excluded.includes(id)) {
+									// select without triggering onSelectRow
+									grid.jqGrid('setSelection', id, false);
+								}
+							}); 
+						} else {
+							// go through each loaded row
+							$('[role="row"]', grid).each(function(){
+								var id = +$(this).attr('id'),
+									selected = $(this).hasClass('success');
+								// if row is not selected and is included, select it
+								if (!selected && included.includes(id)) {
+									// select without triggering onSelectRow
+									grid.jqGrid('setSelection', id, false);
+								}
+							});
+						}
+	
+						changeCheckboxes.trigger('change');
+					},
+				    loadError : function(xhr,st,err) {
+				    	$.jgrid.info_dialog('<fmt:message key="admin.error"/>', 
+		    					'<fmt:message key="admin.org.password.change.grid.error.load"/>',
+		    					'<fmt:message key="label.ok"/>');
+				    }
+			};
+	
+	
+		    var includedLearners = "<c:out value='${orgPasswordChangeForm.includedLearners}' />",
+		    	excludedLearners = "<c:out value='${orgPasswordChangeForm.excludedLearners}' />",
+		    	includedStaff = "<c:out value='${orgPasswordChangeForm.includedStaff}' />",
+		    	excludedStaff = "<c:out value='${orgPasswordChangeForm.excludedStaff}' />";
+			jqGridSettings.url = jqGridURL + 'learner'
+			$("#learnerGrid").data('excluded', excludedLearners ? JSON.parse(excludedLearners) : null)
+							 .data('included', includedLearners ? JSON.parse(includedLearners) : null)
+							 .jqGrid(jqGridSettings);
+			jqGridSettings.url = jqGridURL + 'staff'
+			$("#staffGrid").data('excluded', excludedStaff ? JSON.parse(excludedStaff) : null)
+						   .data('included', includedStaff ? JSON.parse(includedStaff) : null)
+						   .jqGrid(jqGridSettings);
+	
+		});
+	</script>
+	
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="title"><fmt:message key="admin.org.password.change.title"/></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+				<p>
+					<a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value='${orgPasswordChangeForm.organisationID}' />" class="btn btn-default">
+					<fmt:message key="admin.user.manage" /></a>
+				</p>
+				
+				<div class="panel panel-default panel-body">
+					<h3><c:out value='${orgPasswordChangeForm.orgName}' /></h3>
 					
-					grid.resetSelection();
-					if (selectAllCheckbox.prop('checked')) {
-						var excluded = grid.data('excluded');
-						// go through each loaded row
-						$('[role="row"]', grid).each(function(){
-							var id = +$(this).attr('id'),
-								selected = $(this).hasClass('success');
-							// if row is not selected and is not excluded, select it
-							if (!selected && !excluded.includes(id)) {
-								// select without triggering onSelectRow
-								grid.jqGrid('setSelection', id, false);
-							}
-						}); 
-					} else {
-						// go through each loaded row
-						$('[role="row"]', grid).each(function(){
-							var id = +$(this).attr('id'),
-								selected = $(this).hasClass('success');
-							// if row is not selected and is included, select it
-							if (!selected && included.includes(id)) {
-								// select without triggering onSelectRow
-								grid.jqGrid('setSelection', id, false);
-							}
-						});
-					}
+					<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>
+					
+					<form:form action="changePassword.do" modelAttribute="orgPasswordChangeForm" id="orgPasswordChangeForm">
+						<form:hidden path="organisationID" />
+						<form:hidden path="orgName" />
+						<form:hidden path="includedLearners" id="includedLearners" />
+						<form:hidden path="excludedLearners" id="excludedLearners" />
+						<form:hidden path="includedStaff" id="includedStaff" />
+						<form:hidden path="excludedStaff" id="excludedStaff" />
+						
+						<div class="form-group">
+							<div class="checkbox">
+								<label>
+									<form:checkbox path="email"/><fmt:message key="admin.org.password.change.email" />
+								</label>
+							</div>
+							<div class="checkbox">
+								<label>
+									<form:checkbox path="force"/><fmt:message key="admin.org.password.change.force" />
+								</label>
+							</div>
+						</div>
+						
+						<c:if test="${success}">
+							<lams:Alert type="info" id="passwordConditions" close="false">
+								<h4><fmt:message key="admin.org.password.change.success" /></h4>
+							</lams:Alert>
+						</c:if>
+						
+						<div id="formValidationErrors">
+							<ul></ul>
+						</div>
+						<h4><fmt:message key="admin.org.password.change.choose" /></h4>
+						<table id="changeTable">
+							<tbody>
+								<tr>
+									<td class="changeContainer">
+										<div class="checkbox">
+											<label>
+												<form:checkbox path="isStaffChange" od="isStaffChange"/>
+													<fmt:message key="admin.org.password.change.is.staff" />
+											</label>
+										</div>
+										<input type="text" name="staffPass" id="staffPass" value="${staffPass}" class="pass form-control" maxlength="25"
+												   title="<fmt:message key='admin.org.password.change.custom' />" />
+										<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
+									</td>
+									<td class="changeContainer">
+										<div class="checkbox">
+											<label>
+												<form:checkbox path="isLearnerChange" id="isLearnerChange">
+													<fmt:message key="admin.org.password.change.is.learner" />
+											</label>
+										</div>
+										<input type="text" name="learnerPass" id="learnersPass" value="${learnerPass}" class="pass form-control" maxlength="25"
+											   title="<fmt:message key='admin.org.password.change.custom' />" />
+										<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
+									</td>
+								</tr>
+								<tr>
+									<td class="gridCell">
+										<table id="staffGrid"></table>
+									</td>
+									<td class="gridCell">
+										<table id="learnerGrid"></table>
+									</td>
+								</tr>
+							</tbody>
+						</table>
+						<div class="pull-right voffset20">
+							<input type="submit" class="btn btn-primary" value="<fmt:message key='admin.org.password.change.submit' />" />
+						</div>
+					</form:form>
+				</div>
+	</lams:Page>
+		
+</body>
+</lams:html>
 
-					changeCheckboxes.trigger('change');
-				},
-			    loadError : function(xhr,st,err) {
-			    	$.jgrid.info_dialog('<fmt:message key="admin.error"/>', 
-	    					'<fmt:message key="admin.org.password.change.grid.error.load"/>',
-	    					'<fmt:message key="label.ok"/>');
-			    }
-		};
 
 
-	    var includedLearners = "<bean:write name='OrgPasswordChangeForm' property='includedLearners' />",
-	    	excludedLearners = "<bean:write name='OrgPasswordChangeForm' property='excludedLearners' />",
-	    	includedStaff = "<bean:write name='OrgPasswordChangeForm' property='includedStaff' />",
-	    	excludedStaff = "<bean:write name='OrgPasswordChangeForm' property='excludedStaff' />";
-		jqGridSettings.url = jqGridURL + 'learner'
-		$("#learnerGrid").data('excluded', excludedLearners ? JSON.parse(excludedLearners) : null)
-						 .data('included', includedLearners ? JSON.parse(includedLearners) : null)
-						 .jqGrid(jqGridSettings);
-		jqGridSettings.url = jqGridURL + 'staff'
-		$("#staffGrid").data('excluded', excludedStaff ? JSON.parse(excludedStaff) : null)
-					   .data('included', includedStaff ? JSON.parse(includedStaff) : null)
-					   .jqGrid(jqGridSettings);
 
-	});
-</script>
-
-<p>
-	<a href="<lams:LAMSURL/>admin/usermanage.do?org=<bean:write name='OrgPasswordChangeForm' property='organisationID' />" class="btn btn-default">
-	<fmt:message key="admin.user.manage" /></a>
-</p>
-
-<div class="panel panel-default panel-body">
-	<h3><bean:write name='OrgPasswordChangeForm' property='orgName' /></h3>
-	
-	<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>
-	
-	<html:form action="orgPasswordChange.do" styleId="OrgPasswordChangeForm">
-		<input type="hidden" name="method" value="changePassword" />
-		<html:hidden property="organisationID" />
-		<html:hidden property="orgName" />
-		<html:hidden property="includedLearners" styleId="includedLearners" />
-		<html:hidden property="excludedLearners" styleId="excludedLearners" />
-		<html:hidden property="includedStaff" styleId="includedStaff" />
-		<html:hidden property="excludedStaff" styleId="excludedStaff" />
-		
-		<div class="form-group">
-			<div class="checkbox">
-				<label>
-					<html:checkbox property="email"><fmt:message key="admin.org.password.change.email" /></html:checkbox>
-				</label>
-			</div>
-			<div class="checkbox">
-				<label>
-					<html:checkbox property="force"><fmt:message key="admin.org.password.change.force" /></html:checkbox>
-				</label>
-			</div>
-		</div>
-		
-		<c:if test="${success}">
-			<lams:Alert type="info" id="passwordConditions" close="false">
-				<h4><fmt:message key="admin.org.password.change.success" /></h4>
-			</lams:Alert>
-		</c:if>
-		
-		<div id="formValidationErrors">
-			<ul></ul>
-		</div>
-		<h4><fmt:message key="admin.org.password.change.choose" /></h4>
-		<table id="changeTable">
-			<tbody>
-				<tr>
-					<td class="changeContainer">
-						<div class="checkbox">
-							<label>
-								<html:checkbox property="isStaffChange" styleId="isStaffChange">
-									<fmt:message key="admin.org.password.change.is.staff" />
-								</html:checkbox>
-							</label>
-						</div>
-						<html:text property="staffPass" styleId="staffPass" styleClass="pass form-control" maxlength="25"
-								   title="<fmt:message key='admin.org.password.change.custom' />" />
-						<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
-					</td>
-					<td class="changeContainer">
-						<div class="checkbox">
-							<label>
-								<html:checkbox property="isLearnerChange" styleId="isLearnerChange">
-									<fmt:message key="admin.org.password.change.is.learner" />
-								</html:checkbox>
-							</label>
-						</div>
-						<html:text property="learnerPass" styleId="learnersPass" styleClass="pass form-control" maxlength="25"
-							   title="<fmt:message key='admin.org.password.change.custom' />" />
-						<i class="fa fa-refresh generatePassword" title="<fmt:message key='admin.org.password.change.generate' />"></i>
-					</td>
-				</tr>
-				<tr>
-					<td class="gridCell">
-						<table id="staffGrid"></table>
-					</td>
-					<td class="gridCell">
-						<table id="learnerGrid"></table>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-		<div class="pull-right voffset20">
-			<input type="submit" class="btn btn-primary" value="<fmt:message key='admin.org.password.change.submit' />" />
-		</div>
-	</html:form>
-</div>
\ No newline at end of file
Index: lams_admin/web/organisation/cloneResult.jsp
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -5,8 +5,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="title.clone.lessons"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -17,80 +16,40 @@
 </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}">
-				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
-					<c:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
-					<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
-						<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
-							<c:out value="${org.parentOrganisation.name}" />
-						</a> :
-					</c:if>
-					<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
-						<c:out value="${org.name}" />
-					</a>
-				</p>
 
-				<h4><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h4>
-				
-				<c:if test="${not empty errors}">
-					<lams:Alert type="danger" id="errorKey" close="false">	
-						<c:forEach items="${errors}" var="error">
-							<c:out value="${error}" />
-						</c:forEach>
-					</lams:Alert>
+	<c:set var="title"><fmt:message key="title.clone.lessons"/></c:set>
+	<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:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
+			<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
+				<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
+				<c:out value="${org.parentOrganisation.name}" />
+				</a> :
 				</c:if>
-				
-				<p>
-					<fmt:message key="message.cloned.lessons"><fmt:param value="${result}" /></fmt:message>
-				</p>
-				
-				<input type="button" class="btn btn-default pull-right" value="<fmt:message key="label.return.to.group" />" 
-						onclick="document.location='orgmanage.do?org=<c:out value="${org.organisationId}" />';"	>
-			</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:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
-					<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
-						<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
-							<c:out value="${org.parentOrganisation.name}" />
-						</a> :
-					</c:if>
-					<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
-						<c:out value="${org.name}" />
-					</a>
-				</p>
+				<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
+					<c:out value="${org.name}" />
+				</a>
+		</p>
 
-				<h4><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h4>
+		<h4><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h4>
 				
-				<c:if test="${not empty errors}">
-					<lams:Alert type="danger" id="errorKey" close="false">	
-						<c:forEach items="${errors}" var="error">
-							<c:out value="${error}" />
-						</c:forEach>
-					</lams:Alert>
-				</c:if>
+		<c:if test="${not empty errors}">
+			<lams:Alert type="danger" id="errorKey" close="false">	
+				<c:forEach items="${errors}" var="error">
+					<c:out value="${error}" />
+				</c:forEach>
+			</lams:Alert>
+		</c:if>
 				
-				<p>
-					<fmt:message key="message.cloned.lessons"><fmt:param value="${result}" /></fmt:message>
-				</p>
+		<p>
+			<fmt:message key="message.cloned.lessons"><fmt:param value="${result}" /></fmt:message>
+		</p>
 				
-				<input type="button" class="btn btn-default pull-right" value="<fmt:message key="label.return.to.group" />" 
-						onclick="document.location='orgmanage.do?org=<c:out value="${org.organisationId}" />';"	>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+		<input type="button" class="btn btn-default pull-right" value="<fmt:message key="label.return.to.group" />" 
+		onclick="document.location='orgmanage.do?org=<c:out value="${org.organisationId}" />';"	>
+		
+	</lams:Page>
+	
 </body>
 </lams:html>
Index: lams_admin/web/organisation/cloneStart.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -5,7 +5,7 @@
 
 <lams:html>
 <lams:head>
-	<c:set var="title"><fmt:message key="${title.clone.lessons}"/></c:set>
+	<c:set var="title"><fmt:message key="title.clone.lessons"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -133,16 +133,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="title.clone.lessons"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="cloneForm">
 			
 			<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
 				<c:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
@@ -248,119 +241,7 @@
 				</div>
 				
 			</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:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
-				<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
-					<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
-						<c:out value="${org.parentOrganisation.name}" />
-					</a> :
-				</c:if>
-				<a href="orgmanage.do?org=<c:out value="${org.organisationId}" />" class="btn btn-default">
-					<c:out value="${org.name}" />
-				</a>
-			</p>			
-			<h4><fmt:message key="title.clone.lessons.for"><fmt:param value="${org.name}" /></fmt:message></h4>
-			
-			<c:if test="${not empty errors}">
-				<lams:Alert type="danger" id="errorKey" close="false">			
-					<c:forEach items="${errors}" var="error">
-						<c:out value="${error}" />
-					</c:forEach>
-				</lams:Alert>
-			</c:if>
-			
-			<div class="panel panel-default voffset5" >
-				<div class="panel-heading">
-					<span class="panel-title">
-						<fmt:message key="title.choose.group" />
-					</span>
-				</div>
-				<div class="panel-body">
-					<div class="form-group">
-						<fmt:message key="admin.course" />:
-						<select id="sourceGroupId" class="form-control">
-							<option value="">...</option>
-						</select>
-					</div>
-					<div class="form-group">
-						<fmt:message key="admin.class" />:
-						<select id="sourceSubgroupId" class="form-control">
-						</select>
-					</div>
-					<div class="form-group">
-						<input type="submit" class="btn btn-default" value="<fmt:message key="label.choose" />" onclick="javascript:loadGroupAttributes(chosenGroup());">
-					</div>
-				</div>
-			</div>
-			
-			<div id="staffDialog" title="<fmt:message key="label.configure.staff" />" style="display:none;">
-			
-			</div>
-			
-			<div id="learnerDialog" title="<fmt:message key="label.configure.learners" />" style="display:none;">
-			
-			</div>
-			
-			
-			<form name="cloneForm" id="cloneForm" action="clone.do" method="post">
-				<input type="hidden" name="groupId" value="<c:out value="${org.organisationId}" />">
-				<input type="hidden" name="lessons">
-				<input type="hidden" name="staff">
-				<input type="hidden" name="learners">
-			
-				<div style="display:none;" id="cloneOptionsDiv">
-				
-					<div class="panel panel-default voffset5" >
-					<div class="panel-heading">
-						<span class="panel-title">
-							<fmt:message key="title.select.lessons" />
-						</span>
-					</div>
-					<div class="panel-body">
-						<p id="availableLessons"></p>
-					</div>
-					</div>
-				
-					<div class="panel panel-default voffset5" >
-					<div class="panel-heading">
-						<span class="panel-title">
-							<fmt:message key="title.select.staff" />
-						</span>
-					</div>
-					<div class="panel-body">
-						<input type="checkbox" id="addAllStaff" name="addAllStaff" checked="checked"> <fmt:message key="message.add.all.monitors" />
-						<a onclick="staffDialog();" class="btn btn-default pull-right"><fmt:message key="label.configure.staff" /></a>
-					</div>
-					</div>
-					
-					<div class="panel panel-default voffset5" >
-					<div class="panel-heading">
-						<span class="panel-title">
-							<fmt:message key="title.select.learners" />
-						</span>
-					</div>
-					<div class="panel-body">
-						<input type="checkbox" id="addAllLearners" name="addAllLearners" checked="checked"> <fmt:message key="message.add.all.learners" />
-						<a onclick="learnerDialog();" class="btn btn-default pull-right"><fmt:message key="label.configure.learners" /></a>
-					</div>
-					</div>
-			
-					<div class="pull-right">
-						<input type="submit" class="btn btn-primary" onclick="return clone();" value="<fmt:message key="label.clone" />">
-					</div>
-				</div>
-				
-			</form>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+	</lams:Page>	
 </body>
 </lams:html>
 
Index: lams_admin/web/organisation/courseAdminEdit.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/organisation/courseAdminEdit.jsp	(.../courseAdminEdit.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/organisation/courseAdminEdit.jsp	(.../courseAdminEdit.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -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.organisation.entry"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -16,35 +15,28 @@
 </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="title"><fmt:message key="admin.organisation.entry"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="organisationForm">
 	
-	<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:form action="orgsave.do" modelAttribute="organisationForm" method="post">
+		<form:form action="orgsave.do" modelAttribute="organisationForm" id="organisationForm" method="post">
 				<form:hidden path="orgId" />
 				<form:hidden path="parentId" />
 				<form:hidden path="typeId" />
 				<form:hidden path="courseAdminCanAddNewUsers" />
 				<form:hidden path="courseAdminCanBrowseAllUsers" />
 				<form:hidden path="courseAdminCanChangeStatusOfCourse" />
-				<c:if test="${OrganisationForm.courseAdminCanChangeStatusOfCourse == false}">
+				<c:if test="${organisationForm.courseAdminCanChangeStatusOfCourse == false}">
 					<form:hidden path="stateId" />
 				</c:if>
 				<p>
 					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> : 
-					<a href="orgmanage.do?org=<c:out value="${OrganisationForm.orgId}" />" class="btn btn-default">
-						<c:out value="${OrganisationForm.name}"/>
+					<a href="orgmanage.do?org=<c:out value="${organisationForm.orgId}" />" class="btn btn-default">
+						<c:out value="${organisationForm.name}"/>
 					</a>
 				</p>
 				
 				<h1>
-					<fmt:message key="admin.edit"/> <c:out value="${OrganisationForm.name}"/>
+					<fmt:message key="admin.edit"/> <c:out value="${organisationForm.name}"/>
 				</h1>
 				
 				<div align="center"><html-el:errors/></div>
@@ -73,7 +65,7 @@
 							</form:select>
 						</td>
 					</tr>
-					<c:if test=${OrganisationForm.courseAdminCanChangeStatusOfCourse == true}>
+					<c:if test=${organisationForm.courseAdminCanChangeStatusOfCourse == true}>
 					<tr>
 						<td><fmt:message key="admin.organisation.status"/>:</td>
 						<td>
@@ -89,9 +81,9 @@
 						<td colspan="2">&nbsp;</td>
 					</tr>
 					<tr>
-						<td><c:if test="${OrganisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
-							<c:if test="${OrganisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
-							<c:out value="${OrganisationForm.orgId}" />.
+						<td><c:if test="${organisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
+							<c:if test="${organisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
+							<c:out value="${organisationForm.orgId}" />.
 						</td>
 					</tr>
 					<tr>
@@ -100,103 +92,14 @@
 				</table>
 				
 				<div class="pull-right">
-					<html-el:cancel 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 type="reset" class="btn btn-default loffset5" value="<fmt:message key="admin.reset"/>" />
 					<input type="submit" 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}" >
-				<form:form action="orgsave.do" modelAttribute="organisationForm" method="post">
-				<form:hidden path="orgId" />
-				<form:hidden path="parentId" />
-				<form:hidden path="typeId" />
-				<form:hidden path="courseAdminCanAddNewUsers" />
-				<form:hidden path="courseAdminCanBrowseAllUsers" />
-				<form:hidden path="courseAdminCanChangeStatusOfCourse" />
-				<c:if test="${OrganisationForm.courseAdminCanChangeStatusOfCourse == false}">
-					<form:hidden path="stateId" />
-				</c:if>
-				<p>
-					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> : 
-					<a href="orgmanage.do?org=<c:out value="${OrganisationForm.orgId}" />" class="btn btn-default">
-						<c:out value="${OrganisationForm.name}"/>
-					</a>
-				</p>
-				
-				<h1>
-					<fmt:message key="admin.edit"/> <c:out value="${OrganisationForm.name}"/>
-				</h1>
-				
-				<div align="center"><html-el:errors/></div>
-				<table  class="table table-no-border">
-					<tr>
-						<td><fmt:message key="admin.organisation.name"/>:</td>
-						<td><input type="text" name="name" size="40" class="form-control"/> *</td>
-					</tr>
-					<tr>
-					<td><fmt:message key="admin.organisation.code"/>:</td>
-						<td><input type="text" name="code" size="20"  class="form-control"/></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.description"/>:</td>
-						<td><form:textarea path="description" cols="50" rows="3"  cssClass="form-control"/></td>
-					</tr>
-					<tr>
-						<td><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>
-					<c:if test=${OrganisationForm.courseAdminCanChangeStatusOfCourse == true}>
-					<tr>
-						<td><fmt:message key="admin.organisation.status"/>:</td>
-						<td>
-							<form:select path="stateId"  cssClass="form-control">
-								<c:forEach items="${status}" var="state">
-									<form:option value="${state.organisationStateId}"><fmt:message key="organisation.state.${state.description}"/></form:option>
-								</c:forEach>
-							</form:select>
-						</td>
-					</tr>
-					</c:if>
-					<tr>
-						<td colspan="2">&nbsp;</td>
-					</tr>
-					<tr>
-						<td><c:if test="${OrganisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
-							<c:if test="${OrganisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
-							<c:out value="${OrganisationForm.orgId}" />.
-						</td>
-					</tr>
-					<tr>
-						<td colspan="2">&nbsp;</td>
-					</tr>
-				</table>
-				
-				<div class="pull-right">
-					<html-el:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel"/></html-el:cancel>
-					<input type="reset" class="btn btn-default loffset5" value="<fmt:message key="admin.reset"/>" />
-					<input type="submit" 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/organisation/createOrEdit.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -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.organisation.entry"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -39,195 +38,48 @@
 </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:form action="orgsave.do" method="post" modelAttribute="organisationForm" onsubmit="return warnIfRemoved()">
+	<c:set var="title"><fmt:message key="admin.organisation.entry"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="organisationForm">
+		<form:form action="orgsave.do" method="post" modelAttribute="organisationForm" onsubmit="return warnIfRemoved()">
 				<form:hidden path="orgId" />
 				<form:hidden path="parentId" />
 				<form:hidden path="typeId" />
 				
 				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-					<c:if test="${OrganisationForm.typeId == 3}">
-						: <a href="orgmanage.do?org=<c:out value="${OrganisationForm.parentId}" />" class="btn btn-default"><c:out value="${OrganisationForm.parentName}"/></a>
+					<c:if test="${organisationForm.typeId == 3}">
+						: <a href="orgmanage.do?org=<c:out value="${organisationForm.parentId}" />" class="btn btn-default"><c:out value="${organisationForm.parentName}"/></a>
 					</c:if>
 					
-					<c:if test="${not empty OrganisationForm.orgId}">
-						: <a href="orgmanage.do?org=<c:out value="${OrganisationForm.orgId}" />" class="btn btn-default"><c:out value="${OrganisationForm.name}"/></a>
+					<c:if test="${not empty organisationForm.orgId}">
+						: <a href="orgmanage.do?org=<c:out value="${organisationForm.orgId}" />" class="btn btn-default"><c:out value="${organisationForm.name}"/></a>
 					</c:if>
 				</p>
 				
 				<h4>
-					<c:if test="${not empty OrganisationForm.orgId}">
-						<fmt:message key="admin.edit"/>&nbsp;<c:out value="${OrganisationForm.name}"/>&nbsp;
+					<c:if test="${not empty organisationForm.orgId}">
+						<fmt:message key="admin.edit"/>&nbsp;<c:out value="${organisationForm.name}"/>&nbsp;
 					</c:if>
-					<<c:if test="${empty OrganisationForm.orgId}">
-						<c:if test="${OrganisationForm.typeId == 2}">
+					<<c:if test="${empty organisationForm.orgId}">
+						<c:if test="${organisationForm.typeId == 2}">
 							<fmt:message key="admin.course.add"/>
 						</c:if>
-						<c:if test="${OrganisationForm.typeId == 3}">
+						<c:if test="${organisationForm.typeId == 3}">
 							<fmt:message key="admin.class.add"/>
 						</c:if>
 					</c:if>
 				</h4>
 				
-				<div align="center"><html-el:errors/></div>
-				
-				<div id="deleteAllLessonsBox" class="alert alert-info" style="display: none">
-					<fmt:message key="label.delete.all.lesson.count" />&nbsp;<span id="lessonCount"></span> / <span id="totalLessonCount"></span>
-					<fmt:message key="label.delete.all.lesson.progress" />
+				<div align="center">
+					 <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>
 				
-				
-				<table class="table table-condensed table-no-border">
-					<tr>
-						<td width="15%"><fmt:message key="admin.organisation.name"/> *</td>
-						<td><input type="text" name="name" size="40" class="form-control" maxlength="240"/></td>
-					</tr>
-					<tr>
-					<td><fmt:message key="admin.organisation.code"/></td>
-						<td><input type="text" name="code" size="20" class="form-control" maxlength="20"/></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.description"/></td>
-						<td><input type="text" name="description" cols="50" rows="3" class="form-control" id="description" /></td>
-					</tr>
-					<tr>
-						<td><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><fmt:message key="admin.organisation.status"/></td>
-						<td>
-							<form:select path="stateId" cssClass="form-control" >
-								<c:forEach items="${status}" var="state">
-									<form:option value="${state.organisationStateId}"><fmt:message key="organisation.state.${state.description}"/></form:option>
-								</c:forEach>
-							</form:select>
-						</td>
-					</tr>
-				</table>
-					
-					<c:if test="${OrganisationForm.typeId == 2}">
-						<div class="checkbox">
-							<label for="course-admin-can-add-new-users">
-							<form:checkbox path="courseAdminCanAddNewUsers" id="course-admin-can-add-new-users" />
-								<fmt:message key="admin.can.add.user"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="course-admin-can-browse-all-users">
-							<form:checkbox path="courseAdminCanBrowseAllUsers" id="course-admin-can-browse-all-users"/>
-								<fmt:message key="admin.can.browse.user"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="course-admin-can-change-status-of-course">
-							<form:checkbox path="courseAdminCanChangeStatusOfCourse" id="course-admin-can-change-status-of-course"/>
-								<fmt:message key="admin.can.change.status"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="enable-course-notifications">
-							<form:checkbox path="enableCourseNotifications" id="enable-course-notifications"/>
-								<fmt:message key="admin.enable.course.notifications"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="enableGradebookForLearners">
-							<form:checkbox id="enableGradebookForLearners" path="enableGradebookForLearners" />
-								<fmt:message key="admin.gradebook.learner.enable"/>
-							</label>
-						</div>
-						<div class="checkbox">
-							<label for="enable-single-activity-lessons">
-							<form:checkbox path="enableSingleActivityLessons" id="enable-single-activity-lessons"/>
-								<fmt:message key="config.authoring.single.activity"/>
-							</label>
-						</div>
-					</c:if>
-					
-						<div class="checkbox">
-							<label for="enable-live-edit">
-							<form:checkbox path="enableLiveEdit" id="enable-live-edit"/>
-							<!-- to overcome nasty DynaActionForm bug (http://www.coderanch.com/t/46408/Struts/DynaValidatorActionForm-checkboxes) -->
-							<input type="hidden" name="enableLiveEdit" value="false">
-								<fmt:message key="config.live.edit"/>
-							</label>
-						</div>
-						
-						<div class="checkbox">
-							<label for="enable-kumalive">
-							<form:checkbox path="enableKumalive" id="enable-kumalive"/>
-								<fmt:message key="config.kumalive.enable"/>
-							</label>
-						</div>
-					
-					<c:if test="${not empty OrganisationForm.orgId}">
-						<div class="voffset10">
-							<c:if test="${OrganisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
-							<c:if test="${OrganisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
-							&nbsp;<c:out value="${OrganisationForm.orgId}" />.
-						</div>
-					</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" 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}" >
-				<form:form action="orgsave.do" method="post" modelAttribute="organisationForm" onsubmit="return warnIfRemoved()">
-				<form:hidden path="orgId" />
-				<form:hidden path="parentId" />
-				<form:hidden path="typeId" />
-				
-				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-					<c:if test="${OrganisationForm.typeId == 3}">
-						: <a href="orgmanage.do?org=<c:out value="${OrganisationForm.parentId}" />" class="btn btn-default"><c:out value="${OrganisationForm.parentName}"/></a>
-					</c:if>
-					
-					<c:if test="${not empty OrganisationForm.orgId}">
-						: <a href="orgmanage.do?org=<c:out value="${OrganisationForm.orgId}" />" class="btn btn-default"><c:out value="${OrganisationForm.name}"/></a>
-					</c:if>
-				</p>
-				
-				<h4>
-					<c:if test="${not empty OrganisationForm.orgId}">
-						<fmt:message key="admin.edit"/>&nbsp;<c:out value="${OrganisationForm.name}"/>&nbsp;
-					</c:if>
-					<<c:if test="${empty OrganisationForm.orgId}">
-						<c:if test="${OrganisationForm.typeId == 2}">
-							<fmt:message key="admin.course.add"/>
-						</c:if>
-						<c:if test="${OrganisationForm.typeId == 3}">
-							<fmt:message key="admin.class.add"/>
-						</c:if>
-					</c:if>
-				</h4>
-				
-				<div align="center"><html-el:errors/></div>
-				
 				<div id="deleteAllLessonsBox" class="alert alert-info" style="display: none">
 					<fmt:message key="label.delete.all.lesson.count" />&nbsp;<span id="lessonCount"></span> / <span id="totalLessonCount"></span>
 					<fmt:message key="label.delete.all.lesson.progress" />
@@ -271,7 +123,7 @@
 					</tr>
 				</table>
 					
-					<c:if test="${OrganisationForm.typeId == 2}">
+					<c:if test="${organisationForm.typeId == 2}">
 						<div class="checkbox">
 							<label for="course-admin-can-add-new-users">
 							<form:checkbox path="courseAdminCanAddNewUsers" id="course-admin-can-add-new-users" />
@@ -326,25 +178,22 @@
 							</label>
 						</div>
 					
-					<c:if test="${not empty OrganisationForm.orgId}">
+					<c:if test="${not empty organisationForm.orgId}">
 						<div class="voffset10">
-							<c:if test="${OrganisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
-							<c:if test="${OrganisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
-							&nbsp;<c:out value="${OrganisationForm.orgId}" />.
+							<c:if test="${organisationForm.typeId == 2}"><fmt:message key="msg.group.organisation_id"/></c:if>
+							<c:if test="${organisationForm.typeId == 3}"><fmt:message key="msg.subgroup.organisation_id"/></c:if>
+							&nbsp;<c:out value="${organisationForm.orgId}" />.
 						</div>
 					</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 type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
 					</div>
 				
 				</form:form>
-				
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
 
+	</lams:Page>
 
 </body>
 </lams:html>
Index: lams_admin/web/organisation/deleteAllLessons.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -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="sysadmin.lesson.delete.title"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -74,16 +73,8 @@
 </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.lesson.delete.title"/></c:set>
+	<lams:Page type="admin" title="${title}">
 				<p>
 					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 					:  <a href="orgmanage.do?org=${param.orgId}" class="btn btn-default"><c:out value="${courseName}" /></a>
@@ -107,40 +98,8 @@
 				<div class="pull-right">
 					<button id="deleteButton" class="btn btn-primary loffset5"><fmt:message key="admin.delete"/></button>
 				</div>
-			</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>
-					:  <a href="orgmanage.do?org=${param.orgId}" class="btn btn-default"><c:out value="${courseName}" /></a>
-				</p>
-				
-				<%-- 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>
-				
-				<fmt:message key="label.delete.all.lesson.count" />&nbsp;<span id="lessonCount">${lessonCount}</span>&nbsp;/&nbsp;<span>${lessonCount}</span>
-				<div id="deletingBox" style="display: none">
-					<fmt:message key="label.delete.all.lesson.progress" />
-				</div>
-				
-				<div class="pull-right">
-					<button id="deleteButton" class="btn btn-primary loffset5"><fmt:message key="admin.delete"/></button>
-				</div>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
+	</lams:Page>
 
-
 </body>
 </lams:html>
 
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -6,8 +6,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.course.manage"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -69,7 +68,7 @@
 	                cssPageDisplay: '.pagedisplay',
 	                cssPageSize: '.pagesize',
 	                cssDisabled: 'disabled',
-	                ajaxUrl : "<c:url value='/orgmanage/getOrgs.do'/>?type=${OrgManageForm.type}&page={page}&size={size}&{sortList:column}&parentOrgId=${OrgManageForm.parentId}&{filterList:fcol}",
+	                ajaxUrl : "<c:url value='/orgmanage/getOrgs.do'/>?type=${orgManageForm.type}&page={page}&size={size}&{sortList:column}&parentOrgId=${orgManageForm.parentId}&{filterList:fcol}",
 					ajaxProcessing: function (data, table) {
 				    	if (data && data.hasOwnProperty('rows')) {
 				    		var rows = [],
@@ -123,66 +122,58 @@
 </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:if test="${OrgManageForm.type == 1}">
+	<c:set var="title"><fmt:message key="admin.course.manage"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="orgManageForm">
+		<c:if test="${orgManageForm.type == 1}">
 				<form>
 				
 				<div class="btn-group btn-group-sm">
 					<a id="userCreate" class="btn btn-default" href="user/edit.do"><i class="fa fa-user-plus"></i> <fmt:message key="admin.user.create"/></a>
 					<a id="findUsers" class="btn btn-default" href="usersearch.do"><i class="fa fa-search"></i> <fmt:message key="admin.user.find"/></a>
 					
 					<c:if test="${manageGlobalRoles == true}">
-						<a id="manageGlobalRoles" class="btn btn-default" href="usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>"><i class="fa fa-globe"></i> <fmt:message key="admin.global.roles.manage" /></a>
+						<a id="manageGlobalRoles" class="btn btn-default" href="usermanage.do?org=<c:out value="${orgManageForm.parentId}"/>"><i class="fa fa-globe"></i> <fmt:message key="admin.global.roles.manage" /></a>
 					</c:if>
 					<c:if test="${createGroup == true}">
 						<c:url var="editaction" value="organisation/create.do">
 							<c:param name="typeId" value="2" />
-							<c:param name="parentId" value="${OrgManageForm.parentId}" />
+							<c:param name="parentId" value="${orgManageForm.parentId}" />
 						</c:url>
 						<a id="createCourse" class="btn btn-default" href="<c:out value="${editaction}"/>"><i class="fa fa-graduation-cap"></i> <fmt:message key="admin.course.add"/></a>
 					</c:if>
 				</div>
 				<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 				</form>
 			
-				<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
-					<input type="hidden" name="org" value="<c:out value="${OrgManageForm.parentId}"/>" />
+				<form:form cssClass="indentPad" action="start.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
+					<input type="hidden" name="org" value="<c:out value="${orgManageForm.parentId}"/>" />
 					<fmt:message key="label.show"/>&nbsp;
-					<form:select property="stateId" styleId="org-state-id" styleClass="form-control form-control-inline input-sm">
+					<form:select path="stateId" id="org-state-id" cssClass="form-control form-control-inline input-sm">
 						<form:option value="1"><fmt:message key="organisation.state.ACTIVE"/></form:option>
 						<form:option value="2"><fmt:message key="organisation.state.HIDDEN"/></form:option>
 						<form:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></form:option>
 					</form:select> &nbsp;
 					<fmt:message key="label.groups"/>:
 				</form:form>
-			</c:if>
+		</c:if>
 			
-			<c:if test="${ OrgManageForm.type == 2}">
-				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
+		<c:if test="${orgManageForm.type == 2}">
+				<p><a href="orgmanage/start.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
 			
 				<div class="panel panel-default voffset5" >
 					<div class="panel-heading">
 						<div class="panel-title">
-							<span id="courseName"><c:out value="${OrgManageForm.parentName}"/></span>
+							<span id="courseName"><c:out value="${orgManageForm.parentName}"/></span>
 			
 							<div class="btn-group btn-group-sm  pull-right">
 								<c:if test="${editGroup == true}">
-									<a href="organisation/edit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>" id="editCourse" class="btn btn-default"><i class="fa fa-edit"></i><span class="hidden-xs"> <fmt:message key="admin.edit" /></span></a> 
+									<a href="organisation/edit.do?orgId=<c:out value="${orgManageForm.parentId}"/>" id="editCourse" class="btn btn-default"><i class="fa fa-edit"></i><span class="hidden-xs"> <fmt:message key="admin.edit" /></span></a> 
 								</c:if>
-								<a href="usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>" id="manageUsers" class="btn btn-default"><i class="fa fa-users"></i> <span class="hidden-xs"><fmt:message key="admin.user.manage" /></span></a>
+								<a href="usermanage.do?org=<c:out value="${orgManageForm.parentId}"/>" id="manageUsers" class="btn btn-default"><i class="fa fa-users"></i> <span class="hidden-xs"><fmt:message key="admin.user.manage" /></span></a>
 								
 								<% if (request.isUserInRole(Role.SYSADMIN)) { %>
-									<a href="clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-clone"></i><span class="hidden-xs"> <fmt:message key="title.clone.lessons" /></span></a>
-									<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
+									<a href="clone/start.do?groupId=<c:out value="${orgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-clone"></i><span class="hidden-xs"> <fmt:message key="title.clone.lessons" /></span></a>
+									<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${orgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
 								<% } %>
 							</div>
 						</div>
@@ -233,28 +224,28 @@
 				<div class="pull-right">
 					<c:url var="createSubgroupLink" value="organisation/create.do">
 						<c:param name="typeId" value="3" />
-						<c:param name="parentId" value="${OrgManageForm.parentId}" />
+						<c:param name="parentId" value="${orgManageForm.parentId}" />
 					</c:url>
 					<input id="createNewSubcourse" class="btn btn-default" type="button" value="<fmt:message key="admin.class.add"/>" onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
 				</div>
 				</form>
 			
 				<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
-					<input type="hidden" name="org" value="<c:out value="${OrgManageForm.parentId}"/>" />
+					<input type="hidden" name="org" value="<c:out value="${orgManageForm.parentId}"/>" />
 					<fmt:message key="label.show"/>&nbsp;
-					<form:select property="stateId" styleId="org-state-id" styleClass="form-control form-control-inline input-sm">
+					<form:select path="stateId" id="org-state-id" cssClass="form-control form-control-inline input-sm">
 						<form:option value="1"><fmt:message key="organisation.state.ACTIVE"/></form:option>
 						<form:option value="2"><fmt:message key="organisation.state.HIDDEN"/></form:option>
 						<form:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></form:option>
 					</form:select> &nbsp;
 					<fmt:message key="label.subgroups"/>:
 				</form:form>
-			</c:if>
+		</c:if>
 			
-			<c:if test=${OrgManageForm.type == 3}>
+		<c:if test=${orgManageForm.type == 3}>
 				<p>
-					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-					: <a href="orgmanage.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
+					<a href="orgmanage/start.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+					: <a href="orgmanage/start.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
 				</p>
 				
 				<div class="panel panel-default voffset5" >
@@ -263,12 +254,12 @@
 							<span><c:out value="${OrgManageForm.parentName}"/></span>
 							<div class="btn-group btn-group-sm  pull-right">
 								<c:if test="${editGroup == true}">
-									<input class="btn btn-default" type="button" value="<fmt:message key="admin.edit" />&nbsp;<c:out value="${OrgManageForm.parentName}"/>" onclick=javascript:document.location='organisation/edit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>' />
+									<input class="btn btn-default" type="button" value="<fmt:message key="admin.edit" />&nbsp;<c:out value="${orgManageForm.parentName}"/>" onclick=javascript:document.location='organisation/edit.do?orgId=<c:out value="${orgManageForm.parentId}"/>' />
 								</c:if>
-								<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
+								<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${orgManageForm.parentId}"/>' />
 								<% if (request.isUserInRole(Role.SYSADMIN)) { %>
-										<input class="btn btn-default" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
-										<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
+										<input class="btn btn-default" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone/start.do?groupId=<c:out value="${orgManageForm.parentId}"/>';">
+										<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${orgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
 								<% } %>
 						</div>
 						</div>
@@ -317,9 +308,9 @@
 					</table>
 				
 					</div>	
-			</c:if>
+		</c:if>
 			
-			<c:if test="${OrgManageForm.type != 3}">
+		<c:if test="${orgManageForm.type != 3}">
 			
 				<div class="voffset10">
 				<lams:TSTable numColumns="4"> 
@@ -337,224 +328,8 @@
 					</th>
 				</lams:TSTable>
 				</div>
-			</c:if>
-			</lams:Page>
-			
-		</c:when>
-		
-		<c:otherwise>
-		
-			<lams:Page type="admin" title="${title}" >
-			<c:if test="${OrgManageForm.type == 1}">
-			<form>
-			
-			<div class="btn-group btn-group-sm">
-				<a id="userCreate" class="btn btn-default" href="user/edit.do"><i class="fa fa-user-plus"></i> <fmt:message key="admin.user.create"/></a>
-				<a id="findUsers" class="btn btn-default" href="usersearch.do"><i class="fa fa-search"></i> <fmt:message key="admin.user.find"/></a>
-				
-				<c:if test="${manageGlobalRoles == true}">
-					<a id="manageGlobalRoles" class="btn btn-default" href="usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>"><i class="fa fa-globe"></i> <fmt:message key="admin.global.roles.manage" /></a>
-				</c:if>
-				<c:if test="${createGroup == true}">
-					<c:url var="editaction" value="organisation/create.do">
-						<c:param name="typeId" value="2" />
-						<c:param name="parentId" value="${OrgManageForm.parentId}" />
-					</c:url>
-					<a id="createCourse" class="btn btn-default" href="<c:out value="${editaction}"/>"><i class="fa fa-graduation-cap"></i> <fmt:message key="admin.course.add"/></a>
-				</c:if>
-			</div>
-			<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
-			</form>
-		
-			<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
-				<input type="hidden" name="org" value="<c:out value="${OrgManageForm.parentId}"/>" />
-				<fmt:message key="label.show"/>&nbsp;
-				<form:select property="stateId" styleId="org-state-id" styleClass="form-control form-control-inline input-sm">
-					<form:option value="1"><fmt:message key="organisation.state.ACTIVE"/></form:option>
-					<form:option value="2"><fmt:message key="organisation.state.HIDDEN"/></form:option>
-					<form:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></form:option>
-				</form:select> &nbsp;
-				<fmt:message key="label.groups"/>:
-			</form:form>
 		</c:if>
-		
-		<c:if test="${ OrgManageForm.type == 2}">
-			<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
-		
-			<div class="panel panel-default voffset5" >
-				<div class="panel-heading">
-					<div class="panel-title">
-						<span id="courseName"><c:out value="${OrgManageForm.parentName}"/></span>
-		
-						<div class="btn-group btn-group-sm  pull-right">
-							<c:if test="${editGroup == true}">
-								<a href="organisation/edit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>" id="editCourse" class="btn btn-default"><i class="fa fa-edit"></i><span class="hidden-xs"> <fmt:message key="admin.edit" /></span></a> 
-							</c:if>
-							<a href="usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>" id="manageUsers" class="btn btn-default"><i class="fa fa-users"></i> <span class="hidden-xs"><fmt:message key="admin.user.manage" /></span></a>
-							
-							<% if (request.isUserInRole(Role.SYSADMIN)) { %>
-								<a href="clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-clone"></i><span class="hidden-xs"> <fmt:message key="title.clone.lessons" /></span></a>
-								<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
-							<% } %>
-						</div>
-					</div>
-				</div>
-				<div class="panel-body">
-		
-				<table class="table table-striped table-bordered">
-					<tr>
-						<td width="50%"><fmt:message key="admin.organisation.code"/>:</td>
-						<td><c:out value="${org.code}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.description"/>:</td>
-						<td><c:out value="${org.description}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.status"/>:</td>
-						<td id="courseStatus"><c:out value="${org.organisationState.description}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.create.date"/>:</td>
-						<td><fmt:formatDate value="${org.createDate}" pattern="${datePattern}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.locale"/>:</td>
-						<td><c:out value="${org.locale.description}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.can.add.user"/>:</td>
-						<td><c:out value="${org.courseAdminCanAddNewUsers}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.can.browse.user"/>:</td>
-						<td><c:out value="${org.courseAdminCanBrowseAllUsers}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.can.change.status"/>:</td>
-						<td><c:out value="${org.courseAdminCanChangeStatusOfCourse}" /></td>
-					</tr>
-					<tr>
-						<td colspan="2"><c:out value="${numUsers}"/></td>
-					</tr>
-				</table>
-				</div>		
-			</div>
-			
-			<form>
-			<div class="pull-right">
-				<c:url var="createSubgroupLink" value="organisation/create.do">
-					<c:param name="typeId" value="3" />
-					<c:param name="parentId" value="${OrgManageForm.parentId}" />
-				</c:url>
-				<input id="createNewSubcourse" class="btn btn-default" type="button" value="<fmt:message key="admin.class.add"/>" onclick=javascript:document.location='<c:out value="${createSubgroupLink}"/>' />
-			</div>
-			</form>
-		
-			<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
-				<input type="hidden" name="org" value="<c:out value="${OrgManageForm.parentId}"/>" />
-				<fmt:message key="label.show"/>&nbsp;
-				<form:select property="stateId" styleId="org-state-id" styleClass="form-control form-control-inline input-sm">
-					<form:option value="1"><fmt:message key="organisation.state.ACTIVE"/></form:option>
-					<form:option value="2"><fmt:message key="organisation.state.HIDDEN"/></form:option>
-					<form:option value="3"><fmt:message key="organisation.state.ARCHIVED"/></form:option>
-				</form:select> &nbsp;
-				<fmt:message key="label.subgroups"/>:
-			</form:form>
-		</c:if>
-		
-		<c:if test=${OrgManageForm.type == 3}>
-			<p>
-				<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-				: <a href="orgmanage.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
-			</p>
-			
-			<div class="panel panel-default voffset5" >
-				<div class="panel-heading">
-					<div class="panel-title">
-						<span><c:out value="${OrgManageForm.parentName}"/></span>
-						<div class="btn-group btn-group-sm  pull-right">
-							<c:if test="${editGroup == true}">
-								<input class="btn btn-default" type="button" value="<fmt:message key="admin.edit" />&nbsp;<c:out value="${OrgManageForm.parentName}"/>" onclick=javascript:document.location='organisation/edit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>' />
-							</c:if>
-							<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${OrgManageForm.parentId}"/>' />
-							<% if (request.isUserInRole(Role.SYSADMIN)) { %>
-									<input class="btn btn-default" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone.do?groupId=<c:out value="${OrgManageForm.parentId}"/>';">
-									<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${OrgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
-							<% } %>
-					</div>
-					</div>
-				</div>
-		
-				<table class="table table-striped">
-					<tr>
-						<td width="50%"><fmt:message key="admin.organisation.name"/>:</td>
-						<td><c:out value="${org.name}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.code"/>:</td>
-						<td><c:out value="${org.code}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.description"/>:</td>
-						<td><c:out value="${org.description}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.status"/>:</td>
-						<td><c:out value="${org.organisationState.description}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.create.date"/>:</td>
-						<td><fmt:formatDate value="${org.createDate}" pattern="${datePattern}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.organisation.locale"/>:</td>
-						<td><c:out value="${org.locale.description}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.can.add.user"/>:</td>
-						<td><c:out value="${org.courseAdminCanAddNewUsers}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.can.browse.user"/>:</td>
-						<td><c:out value="${org.courseAdminCanBrowseAllUsers}" /></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="admin.can.change.status"/>:</td>
-						<td><c:out value="${org.courseAdminCanChangeStatusOfCourse}" /></td>
-					</tr>
-					<tr>
-						<td colspan="2"><c:out value="${numUsers}"/></td>
-					</tr>
-				</table>
-			
-				</div>	
-		</c:if>
-		
-		<c:if test="${OrgManageForm.type != 3}">
-		
-			<div class="voffset10">
-			<lams:TSTable numColumns="4"> 
-				<th width="3%" clas="filter-false">
-					Id
-				</th>
-				<th width="10%" align="center"> 
-					<fmt:message key="admin.organisation.name"/>
-				</th>
-				<th width="10%" align="center">
-					<fmt:message key="admin.organisation.code"/>
-				</th>
-				<th width="20%" align="center">
-					<fmt:message key="admin.organisation.create.date"/>
-				</th>
-			</lams:TSTable>
-			</div>
-		</c:if>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+	</lams:Page>
 </body>
 </lams:html>
 
Index: lams_admin/web/serverlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,52 +1,80 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.maintain.external.servers"/></c:set>
+	<title>${title}</title>
 
-<table class="table table-striped">
-	<tr>
-		<th><fmt:message key="sysadmin.serverid" /></th>
-		<th><fmt:message key="sysadmin.serverkey" /></th>
-		<th><fmt:message key="sysadmin.servername" /></th>
-		<th><fmt:message key="sysadmin.serverdesc" /></th>
-		<th><fmt:message key="sysadmin.prefix" /></th>
-		<th><fmt:message key="sysadmin.disabled" /></th>
-		<th><fmt:message key="admin.actions"/></th>
-	</tr>
-	<c:forEach items="${servers}" var="server">
-	<tr>
-		<td><c:out value="${server.serverid}" /></td>
-		<td><c:out value="${server.serverkey}" /></td>
-		<td><c:out value="${server.servername}" /></td>
-		<td><c:out value="${server.serverdesc}" /></td>
-		<td><c:out value="${server.prefix}" /></td>
-		<td>
-			<c:choose>
-			<c:when test="${server.disabled}" >
-				<fmt:message key="label.yes" />
-			</c:when>
-			<c:otherwise>
-				<fmt:message key="label.no" />
-			</c:otherwise>
-			</c:choose>
-		</td>
-		<td>
-			<a id="edit_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=edit&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.edit" /></a>
-			&nbsp;
-			<c:choose>
-				<c:when test="${server.disabled}">
-					<a id="enable_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=enable&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.enable" /></a>
-				</c:when>
-				<c:otherwise>
-					<a id="disable_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=disable&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.disable" /></a>
-				</c:otherwise>
-			</c:choose>
-			&nbsp;
-			<a id="delete_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=delete&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.delete" /></a>
-		</td>
-	</tr>
-	</c:forEach>
-</table>
-<p>${fn:length(servers)}&nbsp;<fmt:message key="sysadmin.integrated.servers" /></p>
+	<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="title"><fmt:message key="sysadmin.maintain.external.servers"/></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>
 
-<input class="btn btn-default pull-right" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" />
+			<table class="table table-striped">
+				<tr>
+					<th><fmt:message key="sysadmin.serverid" /></th>
+					<th><fmt:message key="sysadmin.serverkey" /></th>
+					<th><fmt:message key="sysadmin.servername" /></th>
+					<th><fmt:message key="sysadmin.serverdesc" /></th>
+					<th><fmt:message key="sysadmin.prefix" /></th>
+					<th><fmt:message key="sysadmin.disabled" /></th>
+					<th><fmt:message key="admin.actions"/></th>
+				</tr>
+				<c:forEach items="${servers}" var="server">
+				<tr>
+					<td><c:out value="${server.serverid}" /></td>
+					<td><c:out value="${server.serverkey}" /></td>
+					<td><c:out value="${server.servername}" /></td>
+					<td><c:out value="${server.serverdesc}" /></td>
+					<td><c:out value="${server.prefix}" /></td>
+					<td>
+						<c:choose>
+						<c:when test="${server.disabled}" >
+							<fmt:message key="label.yes" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.no" />
+						</c:otherwise>
+						</c:choose>
+					</td>
+					<td>
+						<a id="edit_<c:out value='${server.serverid}'/>" href="servermaintain/edit.do?sid=<c:out value='${server.sid}' />"><fmt:message key="admin.edit" /></a>
+						&nbsp;
+						<c:choose>
+							<c:when test="${server.disabled}">
+								<a id="enable_<c:out value='${server.serverid}'/>" href="servermaintain/enable.do?sid=<c:out value='${server.sid}' />"><fmt:message key="admin.enable" /></a>
+							</c:when>
+							<c:otherwise>
+								<a id="disable_<c:out value='${server.serverid}'/>" href="servermaintain/disable.do?sid=<c:out value='${server.sid}' />"><fmt:message key="admin.disable" /></a>
+							</c:otherwise>
+						</c:choose>
+						&nbsp;
+						<a id="delete_<c:out value='${server.serverid}'/>" href="servermaintain/delete.do?sid=<c:out value='${server.sid}' />"><fmt:message key="admin.delete" /></a>
+					</td>
+				</tr>
+				</c:forEach>
+			</table>
+			<p>${fn:length(servers)}&nbsp;<fmt:message key="sysadmin.integrated.servers" /></p>
+			
+			<input class="btn btn-default pull-right" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" />
 
+
+	</lams:Page>
+	
+
+
+</body>
+</lams:html>
+
+
+
+
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -6,8 +6,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="sysadmin.maintain.server.edit"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -26,7 +25,7 @@
 			});
 	
 			// validate signup form on keyup and submit
-			var validator = $("#ext-server-form").validate({
+			var validator = $("#extServerForm").validate({
 				rules: {
 					serverid: "required", 
 					serverkey: "required",
@@ -56,16 +55,11 @@
 </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.maintain.server.edit"/></c:set>
+	<c:set var="help"><fmt:message key="Integrations"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 				<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 				<%-- Error Messages --%>
@@ -78,7 +72,7 @@
 				            </lams:Alert>
 				        </c:if>
 				
-				<form:form action="serversave.do" id="ext-server-form" modelAttribute="extServerForm" method="post">
+				<form:form action="serversave.do" id="extServerForm" modelAttribute="extServerForm" method="post">
 					<form:hidden path="sid" />
 					
 				<table class="table table-no-border">
@@ -116,7 +110,7 @@
 						</td>
 					</tr>
 					
-					<tr id="ttl-login-request-wrap" <c:if test="${!formBean.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
+					<tr id="ttl-login-request-wrap" <c:if test="${!extServerForm.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
 						<td><fmt:message key="sysadmin.login.request.ttl" /></td>
 						<td><input type="text" name="timeToLiveLoginRequest" size="10" id="ttl-login-request" class="form-control"/></td>
 					</tr>
@@ -136,99 +130,14 @@
 				</table>
 				<div class="pull-right">
 					<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
-					<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
+					<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
 					<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 				</div>
 				</form:form>
 				
 				<a href="sysadminstart.do" class="btn btn-default pull-left"><fmt:message key="sysadmin.maintain" /></a>
 			</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>
 
-				<%-- 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>
-				
-				<form:form action="serversave.do" id="ext-server-form" modelAttribute="extServerForm" method="post">
-					<form:hidden path="sid" />
-					
-				<table class="table table-no-border">
-					<tr>
-						<td width="25%"><fmt:message key="sysadmin.serverid" />&nbsp;*</td>
-						<td><input type="text" name="serverid" size="20" class="form-control"/></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="sysadmin.serverkey" />&nbsp;*</td>
-						<td><input type="text" name="serverkey" size="30" class="form-control"/></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="sysadmin.servername" />&nbsp;*</td>
-						<td><input type="text" name="servername" size="30" class="form-control"/></td>
-					</tr>
-					<tr>
-						<td valign="top"><fmt:message key="sysadmin.serverdesc" /></td>
-						<td><input type="text" name="serverdesc" cols="40" rows="3" class="form-control"/> </td>
-					</tr>
-					<tr>
-						<td><fmt:message key="sysadmin.prefix" />&nbsp;*</td>
-						<td><input type="text" name="prefix" size="10" class="form-control"/></td>
-					</tr>
-					
-					<tr>
-						<td><fmt:message key="sysadmin.disabled" /></td>
-						<td><form:checkbox path="disabled" /></td>
-					</tr>
-					
-					<tr>
-						<td><fmt:message key="sysadmin.login.request.ttl.enable" /></td>
-						<td>
-							<form:checkbox path="timeToLiveLoginRequestEnabled" id="ttl-login-request-enabled"/>
-							<input type="hidden" name="timeToLiveLoginRequestEnabled" value="false">
-						</td>
-					</tr>
-					
-					<tr id="ttl-login-request-wrap" <c:if test="${!formBean.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
-						<td><fmt:message key="sysadmin.login.request.ttl" /></td>
-						<td><input type="text" name="timeToLiveLoginRequest" size="10" id="ttl-login-request" class="form-control"/></td>
-					</tr>
-				
-					<tr>
-						<td><fmt:message key="sysadmin.userinfoUrl" />&nbsp;*</td>
-						<td><input type="text" name="userinfoUrl" size="70" class="form-control"/></td>
-					</tr>
-					<tr>
-						<td><fmt:message key="sysadmin.lessonFinishUrl" /></td>
-						<td><input type="text" name="lessonFinishUrl" size="70" class="form-control"/></td>
-					</tr>
-						<tr>
-						<td><fmt:message key="sysadmin.extGroupsUrl" /></td>
-						<td><input type="text" name="extGroupsUrl" size="70" class="form-control"/></td>
-					</tr>
-				</table>
-				<div class="pull-right">
-					<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
-					<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
-					<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
-				</div>
-				</form:form>
-				
-				<a href="sysadminstart.do" class="btn btn-default pull-left"><fmt:message key="sysadmin.maintain" /></a>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
 </body>
 </lams:html>
 
Index: lams_admin/web/sessionmaintain.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,22 +1,44 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="sysadmin.maintain.session"/></c:set>
+	<title>${title}</title>
 
-<table class="table table-striped">
-	<tr>
-		<th><fmt:message key="sysadmin.maintain.session.login" /></th>
-		<th><fmt:message key="sysadmin.maintain.session.id" /></th>
-		<th></th>
-	</tr>
-	<c:forEach items="${sessions}" var="ses">
-	<tr>
-		<td><c:out value="${ses.key}" /></td>
-		<td><c:out value="${ses.value}" /></td>
-		<td>
-			<a href="<lams:LAMSURL/>/admin/sessionmaintain.do?method=delete&login=${ses.key}" class="btn btn-default">
+	<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">
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+
+		<table class="table table-striped">
+			<tr>
+				<th><fmt:message key="sysadmin.maintain.session.login" /></th>
+				<th><fmt:message key="sysadmin.maintain.session.id" /></th>
+				<th></th>
+			</tr>
+			<c:forEach items="${sessions}" var="ses">
+			<tr>
+				<td><c:out value="${ses.key}" /></td>
+				<td><c:out value="${ses.value}" /></td>
+				<td>
+					<a href="<lams:LAMSURL/>/admin/sessionmaintain/delete.do?login=${ses.key}" class="btn btn-default">
 				<fmt:message key="sysadmin.maintain.session.delete" />
-			</a>
-		</td>
-	</tr>
-	</c:forEach>
-</table>
\ No newline at end of file
+					</a>
+				</td>
+			</tr>
+			</c:forEach>
+		</table>
+	</lams:Page>
+
+</body>
+</lams:html>
+
+
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,79 +1,122 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<div>
-<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
-<a href="signupManagement.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
-</div>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.signup.title"/></c:set>
+	<title>${title}</title>
 
-<html:form action="/signupManagement.do" method="post">
-	<html:hidden property="method" value="add" />
-	<html:hidden property="signupOrganisationId" />
+	<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.add.edit.signup.page"/></c:set>	
+	<c:if test="${not empty subtitle}">
+		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
+	</c:if>
 	
-	<table class="table table-condensed table-no-border">
-		<tr>
-			<td style="width: 250px;"><fmt:message key="admin.group" />:</td>
-			<td>
-				<html:select property="organisationId" styleClass="form-control">
-					<c:forEach items="${organisations}" var="organisation">
-						<html:option value="${organisation.organisationId}"><c:out value="${organisation.name}" /></html:option>
-					</c:forEach>
-				</html:select>
-			</td>
-			<td></td>
-		</tr>
-		<tr>
-			<td><fmt:message key="admin.lessons" />:</td>
-			<td><html:checkbox property="addToLessons" /></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td><fmt:message key="admin.staff" />:</td>
-			<td><html:checkbox property="addAsStaff" /></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td colspan="2"><html:errors property="courseKey" /></td>
-		</tr>
-		<tr>
-			<td><fmt:message key="admin.course.key" />:</td>
-			<td><html:text property="courseKey" size="40" maxlength="255"  styleClass="form-control"/></td>
-		<tr>
-			<td><fmt:message key="admin.confirm.course.key" />:</td>
-			<td><html:text property="confirmCourseKey" size="40" maxlength="255"  styleClass="form-control"/></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td><fmt:message key="admin.description.txt" />:</td>
-			<td>
-			  <lams:CKEditor id="blurb" 
-			     value="${signupForm.map.blurb}" 
-			     contentFolderID="../public/signups">
-			  </lams:CKEditor>
-			</td>
-			<td></td>
-		</tr>
-		<tr>
-			<td><fmt:message key="admin.disable.option" />:</td>
-			<td><html:checkbox property="disabled" /></td>
-			<td></td>
-		</tr>
-		<tr>
-			<td><fmt:message key="admin.login.tab" />:</td>
-			<td><html:checkbox property="loginTabActive" /></td>
-			<td></td>
-		</tr>		
-		<tr>
-			<td colspan="2"><html:errors property="context" /></td>
-		</tr>
-		<tr>
-			<td><fmt:message key="admin.context.path" />:</td>
-			<td style="vertical-align: middle;"><lams:LAMSURL/>signup/<html:text property="context" /></td>
-		</tr>
-	</table>
-	
-	<div class="pull-right">
-				<html:cancel styleId="cancelButton" styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
-				<html:submit styleId="submitButton" styleClass="btn btn-primary loffset5"><fmt:message key="admin.submit" /></html:submit>
-	</div>
+	<lams:Page type="admin" title="${title}">
+		<div>
+			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
+			<a href="signupManagement.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
+			</div>
+			
+			<form:form action="add.do" modelAttribute="signupForm" id="signupForm" method="post">
+				<form:hidden path="signupOrganisationId" />
+				
+				<table class="table table-condensed table-no-border">
+					<tr>
+						<td style="width: 250px;"><fmt:message key="admin.group" />:</td>
+						<td>
+							<form:select path="organisationId" cssClass="form-control">
+								<c:forEach items="${organisations}" var="organisation">
+									<form:option value="${organisation.organisationId}"><c:out value="${organisation.name}" /></form:option>
+								</c:forEach>
+							</form:select>
+						</td>
+						<td></td>
+					</tr>
+					<tr>
+						<td><fmt:message key="admin.lessons" />:</td>
+						<td><form:checkbox path="addToLessons" /></td>
+						<td></td>
+					</tr>
+					<tr>
+						<td><fmt:message key="admin.staff" />:</td>
+						<td><form:checkbox path="addAsStaff" /></td>
+						<td></td>
+					</tr>
+					<tr>
+						<td colspan="2">
+						 <c:set var="errorKey" value="courseKey" />
+							   <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>
+						</td>
+					</tr>
+					<tr>
+						<td><fmt:message key="admin.course.key" />:</td>
+						<td><input type="text" name="courseKey" size="40" maxlength="255"  class="form-control"/></td>
+					<tr>
+						<td><fmt:message key="admin.confirm.course.key" />:</td>
+						<td><input type="text" name="confirmCourseKey" size="40" maxlength="255"  class="form-control"/></td>
+						<td></td>
+					</tr>
+					<tr>
+						<td><fmt:message key="admin.description.txt" />:</td>
+						<td>
+						  <lams:CKEditor id="blurb" 
+						     value="${signupForm.map.blurb}" 
+						     contentFolderID="../public/signups">
+						  </lams:CKEditor>
+						</td>
+						<td></td>
+					</tr>
+					<tr>
+						<td><fmt:message key="admin.disable.option" />:</td>
+						<td><form:checkbox path="disabled" /></td>
+						<td></td>
+					</tr>
+					<tr>
+						<td><fmt:message key="admin.login.tab" />:</td>
+						<td><form:checkbox path="loginTabActive" /></td>
+						<td></td>
+					</tr>		
+					<tr>
+						<td colspan="2">
+						<c:set var="errorKey" value="context" />
+							   <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>
+						</td>
+					</tr>
+					<tr>
+						<td><fmt:message key="admin.context.path" />:</td>
+						<td style="vertical-align: middle;"><lams:LAMSURL/>signup/<input type="text" name="context" /></td>
+					</tr>
+				</table>
+				
+				<div class="pull-right">
+					<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+					<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.delete"/>" />
+				</div>
+			
+			</form:form>
+	</lams:Page>
 
-</html:form>
\ No newline at end of file
+</body>
+</lams:html>
+
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,55 +1,83 @@
+<!DOCTYPE html>
+
 <%@ page import="org.lamsfoundation.lams.signup.model.SignupOrganisation" %>
 <%@ include file="/taglibs.jsp"%>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.signup.title"/></c:set>
+	<title>${title}</title>
 
-<c:if test="${not empty error}">
-	<lams:Alert type="warn" id="errorMessage" close="false">	
-		<c:out value="${error}" />
-	</lams:Alert>
-</c:if>
+	<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="title"><fmt:message key="admin.signup.title"/></c:set>
+	<c:set var="help"><fmt:message key="LAMS+Signup"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<table class="table table-striped table-condensed" >
-	<tr>
-		<th><fmt:message key="admin.group" /></th>
-		<th><fmt:message key="admin.group.code" /></th>
-		<th><fmt:message key="admin.lessons" /></th>
-		<th><fmt:message key="admin.staff" /></th>
-		<th><fmt:message key="admin.added.on"/></th>
-		<th><fmt:message key="admin.disable.option"/></th>
-		<th><fmt:message key="admin.context.path"/></th>
-		<th><fmt:message key="admin.actions"/></th>
-	</tr>
-	<c:forEach items="${signupOrganisations}" var="signupOrganisation">
-		<tr>
-			<td>
-				<c:out value="${signupOrganisation.organisation.name}" />
-			</td>
-			<td>
-				<c:out value="${signupOrganisation.organisation.code}" />
-			</td>
-			<td>
-				<c:out value="${signupOrganisation.addToLessons}" />
-			</td>
-			<td>
-				<c:out value="${signupOrganisation.addAsStaff}" />
-			</td>
-			<td>
-				<c:out value="${signupOrganisation.createDate}" />
-			</td>
-			<td>
-				<c:out value="${signupOrganisation.disabled}" />
-			</td>
-			<td>
-				<c:out value="${signupOrganisation.context}" />
-			</td>
-			<td>
-				<html:link page="/signupManagement.do?method=edit&soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.edit"/></html:link>
-				&nbsp;&nbsp;
-				<html:link page="/signupManagement.do?method=delete&soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.delete"/></html:link>
-			</td>
-		</tr>
-	</c:forEach>
-</table>
+		<c:if test="${not empty error}">
+			<lams:Alert type="warn" id="errorMessage" close="false">	
+				<c:out value="${error}" />
+			</lams:Alert>
+		</c:if>
+		
+		<table class="table table-striped table-condensed" >
+			<tr>
+				<th><fmt:message key="admin.group" /></th>
+				<th><fmt:message key="admin.group.code" /></th>
+				<th><fmt:message key="admin.lessons" /></th>
+				<th><fmt:message key="admin.staff" /></th>
+				<th><fmt:message key="admin.added.on"/></th>
+				<th><fmt:message key="admin.disable.option"/></th>
+				<th><fmt:message key="admin.context.path"/></th>
+				<th><fmt:message key="admin.actions"/></th>
+			</tr>
+			<c:forEach items="${signupOrganisations}" var="signupOrganisation">
+				<tr>
+					<td>
+						<c:out value="${signupOrganisation.organisation.name}" />
+					</td>
+					<td>
+						<c:out value="${signupOrganisation.organisation.code}" />
+					</td>
+					<td>
+						<c:out value="${signupOrganisation.addToLessons}" />
+					</td>
+					<td>
+						<c:out value="${signupOrganisation.addAsStaff}" />
+					</td>
+					<td>
+						<c:out value="${signupOrganisation.createDate}" />
+					</td>
+					<td>
+						<c:out value="${signupOrganisation.disabled}" />
+					</td>
+					<td>
+						<c:out value="${signupOrganisation.context}" />
+					</td>
+					<td>
+						<a href="/signupManagement/edit.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.edit"/></a>
+						&nbsp;&nbsp;
+						<a href="/signupManagement/delete.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.delete"/></a>
+					</td>
+				</tr>
+			</c:forEach>
+		</table>
+		
+		<a href="/signupManagement/add.do" class="btn btn-primary pull-right"><fmt:message key="admin.add.new.signup.page"/></a>
 
-<html:link styleClass="btn btn-primary pull-right" page="/signupManagement.do?method=add"><fmt:message key="admin.add.new.signup.page"/></html:link>
+	</lams:Page>
+
+</body>
+</lams:html>
+
+
+
+
Index: lams_admin/web/statistics.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,108 +1,134 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<script src="<lams:LAMSURL/>/includes/javascript/jquery.js" type="text/javascript"></script>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.statistics.title"/></c:set>
+	<title>${title}</title>
 
-<script type="text/javascript">
-	function loadGroupStats(orgId) {
-		if (orgId) {
-			jQuery.ajax({		
-				type: "GET",
-				url: "<lams:WebAppURL/>/statistics.do",
-				data: {method : "groupStats", orgId : orgId},
-				cache: false,
-				success: function (html) {
-					jQuery("#groupDiv").html(html);
-				}
-			});
-		} else {
-			jQuery("#groupDiv").html(null);
+	<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" />
+	
+	<script src="<lams:LAMSURL/>/includes/javascript/jquery.js" type="text/javascript"></script>
+
+	<script type="text/javascript">
+		function loadGroupStats(orgId) {
+			if (orgId) {
+				jQuery.ajax({		
+					type: "GET",
+					url: "<lams:WebAppURL/>/statistics/groupStats.do",
+					data: {orgId : orgId},
+					cache: false,
+					success: function (html) {
+						jQuery("#groupDiv").html(html);
+					}
+				});
+			} else {
+				jQuery("#groupDiv").html(null);
+			}
 		}
-	}
-</script>
+	</script>
+	
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="title"><fmt:message key="admin.statistics.title"/></c:set>
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+			
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<div class="panel-title"><fmt:message key="admin.statistics.overall" /></div>
+				</div>
+				<div class="panel-body">
+				<table class="table table-striped table-condensed" >
+					<tr>
+						<td>
+							<fmt:message key="admin.statistics.totalUsers" />
+						</td>
+						<td width="150px">
+							${statisticsDTO.users}
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.statistics.learningDesigns" />
+						</td>
+						<td>
+							${statisticsDTO.sequences}
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.statistics.lessons" />
+						</td>
+						<td>
+							${statisticsDTO.lessons}
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.statistics.activities" />
+						</td>
+						<td>
+							${statisticsDTO.activities}
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.statistics.completedActivities" />
+						</td>
+						<td>
+							${statisticsDTO.completedActivities}
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.statistics.groups" />
+						</td>
+						<td>
+							${statisticsDTO.groups}
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.statistics.subGroups" />
+						</td>
+						<td>
+							${statisticsDTO.subGroups}
+						</td>
+					</tr>
+				</table>
+				</div>
+			</div>
+			
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<div class="panel-title"><fmt:message key="admin.statistics.title.byGroup" /></div>
+				</div>
+				
+				<div class="panel-body">
+					<select onchange="javascript:loadGroupStats(this.options[this.selectedIndex].value)" class="form-control">
+						<option></option>
+						<c:forEach var="groupEntry" items="${groupMap}" >	
+							<option value="${groupEntry.value}">${groupEntry.key}</option>
+						</c:forEach>
+					</select>
+					<br />
+					<div id="groupDiv">
+				
+					</div>
+				</div>
+			</div>
+	</lams:Page>
+</body>
+</lams:html>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<div class="panel-title"><fmt:message key="admin.statistics.overall" /></div>
-	</div>
-	<div class="panel-body">
-	<table class="table table-striped table-condensed" >
-		<tr>
-			<td>
-				<fmt:message key="admin.statistics.totalUsers" />
-			</td>
-			<td width="150px">
-				${statisticsDTO.users}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.statistics.learningDesigns" />
-			</td>
-			<td>
-				${statisticsDTO.sequences}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.statistics.lessons" />
-			</td>
-			<td>
-				${statisticsDTO.lessons}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.statistics.activities" />
-			</td>
-			<td>
-				${statisticsDTO.activities}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.statistics.completedActivities" />
-			</td>
-			<td>
-				${statisticsDTO.completedActivities}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.statistics.groups" />
-			</td>
-			<td>
-				${statisticsDTO.groups}
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.statistics.subGroups" />
-			</td>
-			<td>
-				${statisticsDTO.subGroups}
-			</td>
-		</tr>
-	</table>
-	</div>
-</div>
 
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<div class="panel-title"><fmt:message key="admin.statistics.title.byGroup" /></div>
-	</div>
-	
-	<div class="panel-body">
-		<select onchange="javascript:loadGroupStats(this.options[this.selectedIndex].value)" class="form-control">
-			<option></option>
-			<c:forEach var="groupEntry" items="${groupMap}" >	
-				<option value="${groupEntry.value}">${groupEntry.key}</option>
-			</c:forEach>
-		</select>
-		<br />
-		<div id="groupDiv">
-	
-		</div>
-	</div>
-</div>
+
+
Index: lams_admin/web/sysadmin.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -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="sysadmin.maintain"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -16,16 +15,8 @@
 </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.maintain"/></c:set>
+	<lams:Page type="admin" title="${title}">
 			<c:forEach items="${groupedLinks}" var="links">
 				<div class="panel panel-default">
 					<div class="panel-heading">
@@ -43,32 +34,8 @@
 			 		</div>
 				</div>		
 			</c:forEach>
-			</lams:Page>
-		</c:when>
-		<c:otherwise>
-			<lams:Page type="admin" title="${title}" >
-				<c:forEach items="${groupedLinks}" var="links">
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title"><fmt:message key="${links[0]}"/></div>
-					</div>
-					<div class="list-group">
-						<c:set var="linkBeans" value="${links[1]}"/>
-			 			<c:forEach items="${linkBeans}" var="linkBean">
-							<span class="list-group-item">
-							<a href="<c:out value="${linkBean.link}"/>">
-									<fmt:message><c:out value="${linkBean.name}"/></fmt:message>
-							</a>
-							</span>
-						</c:forEach>
-			 		</div>
-				</div>		
-			</c:forEach>
-			</lams:Page>
-		</c:otherwise>
-	</c:choose>
-
-
+	</lams:Page>
+		
 </body>
 </lams:html>
 
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,189 +1,210 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.themes.title"/></c:set>
+	<title>${title}</title>
 
-<script type="text/javascript">
-	function editTheme(name, description, imageDirectory, id, currentDefaultTheme) {
-		document.getElementById("name").value = name;
-		document.getElementById("description").value = description;
-		document.getElementById("imageDirectory").value = imageDirectory;
-		document.getElementById("id").value = id;
-		
-		document.getElementById("method").value = "addOrEditTheme";
-
-		if(currentDefaultTheme == "true") {
-			document.getElementById("currentDefaultTheme").checked = true;
-		}
-		document.getElementById("cancelEdit").style.display="block";
-		document.getElementById("normalSave").style.display="none";
-	}
-
-	function cancelEdit() {
-		document.getElementById("name").value = "";
-		document.getElementById("description").value = "";
-		document.getElementById("imageDirectory").value = "";
-		document.getElementById("id").value = "";
-		document.getElementById("currentDefaultTheme").checked = false;
-		document.getElementById("cancelEdit").style.display="none";
-		document.getElementById("normalSave").style.display="block";
-	}
-
-	function removeTheme(id, name) {
-		var answer = confirm("<fmt:message key="admin.themes.deleteConfirm" />")
-		if (answer) {
+	<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" />
+	
+	<script type="text/javascript">
+		function editTheme(name, description, imageDirectory, id, currentDefaultTheme) {
 			document.getElementById("name").value = name;
+			document.getElementById("description").value = description;
+			document.getElementById("imageDirectory").value = imageDirectory;
 			document.getElementById("id").value = id;
-			document.getElementById("method").value = "removeTheme";
-			submitForm();
+			
+			if(currentDefaultTheme == "true") {
+				document.getElementById("currentDefaultTheme").checked = true;
+			}
+			document.getElementById("cancelEdit").style.display="block";
+			document.getElementById("normalSave").style.display="none";
 		}
-	}
-
-	function setAsDefault(name) {
-		document.getElementById("name").value = name;
-		document.getElementById("method").value = "setAsDefault";
-		submitForm();
-	} 
-
-	function checkAndSubmit() {
-		var name = document.getElementById("name").value;
-
-		if (name == null || name == "") {
-			alert("<fmt:message key="admin.themes.nameAlreadyExists" />");
-			return;
+	
+		function cancelEdit() {
+			document.getElementById("name").value = "";
+			document.getElementById("description").value = "";
+			document.getElementById("imageDirectory").value = "";
+			document.getElementById("id").value = "";
+			document.getElementById("currentDefaultTheme").checked = false;
+			document.getElementById("cancelEdit").style.display="none";
+			document.getElementById("normalSave").style.display="block";
 		}
-		
-		<c:forEach var="theme" items="${themes}" >
-			if (name == '${theme.name}') {
+	
+		function removeTheme(id, name) {
+			var answer = confirm("<fmt:message key="admin.themes.deleteConfirm" />")
+			if (answer) {
+				document.getElementById("name").value = name;
+				document.getElementById("id").value = id;
+				submitForm("removeTheme");
+			}
+		}
+	
+		function setAsDefault(name) {
+			document.getElementById("name").value = name;
+			submitForm("setAsDefault");
+		} 
+	
+		function checkAndSubmit() {
+			var name = document.getElementById("name").value;
+	
+			if (name == null || name == "") {
 				alert("<fmt:message key="admin.themes.nameAlreadyExists" />");
 				return;
 			}
-		</c:forEach>
-		submitForm();
-	}
+			
+			<c:forEach var="theme" items="${themes}" >
+				if (name == '${theme.name}') {
+					alert("<fmt:message key="admin.themes.nameAlreadyExists" />");
+					return;
+				}
+			</c:forEach>
+			submitForm();
+		}
 
-	function submitForm() {
-		document.getElementById("themeForm").submit();
-	}
-</script>
+		function submitForm(methodName) {
+			document.getElementById("themeForm").submit();
+		}
+	</script>
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="title"><fmt:message key="admin.themes.title"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="themeForm">
+			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+			
+			<table class="table table-striped table-condensed" >
+				<tr>
+					<th>
+						<fmt:message key="admin.themes.theme" />
+					</th>
+					<th>
+						<fmt:message key="admin.themes.description" />
+					</th>
+					<th>
+						<fmt:message key="admin.themes.imageDir" />
+					</th>
+					<th>
+						<fmt:message key="admin.themes.defaultTheme" />
+					</th>
+					<th>
+					</th>
+					<th>
+					</th>
+				</tr>
+				<c:forEach var="theme" items="${themes}" >
+					<tr>
+						<td>
+							${theme.name}
+						</td>
+						<td>
+							${theme.description}
+						</td>
+						<td>
+							${theme.imageDirectory}
+						</td>
+						<td align="center">
+							<c:if test="${theme.currentDefaultTheme}">
+								<i class="fa fa-check"></i>
+							</c:if>
+						</td>
+						<td align="center">
+			
+							<c:choose>
+								<c:when test="${not theme.notEditable}">
+									<i class="fa fa-pencil" 
+										title="<fmt:message key="admin.themes.edit" />"
+										onclick="editTheme('${theme.name}', '${theme.description}', '${theme.imageDirectory}', '${theme.themeId}', '${theme.currentDefaultTheme}')"
+									></i>
+									<i class="fa fa-times" 
+										title="<fmt:message key="admin.themes.remove" />"
+										onclick="removeTheme('${theme.themeId}', '${theme.name}')"
+									></i>
+								</c:when>
+								<c:otherwise>
+									<a href="javascript:setAsDefault('${theme.name}')" class="btn btn-default btn-sm" title="<fmt:message key="admin.themes.makeThemeDefault"/>">
+										<fmt:message key="admin.themes.makeDefault" />
+									</a>
+								</c:otherwise>
+							</c:choose>
+						</td>	
+					</tr>
+				</c:forEach>
+			</table>
+			
+			<div class="panel panel-default">
+				<div class="panel-heading">
+					<div class="panel-title"><fmt:message key="admin.themes.addNew" /></div>
+				</div>
+				
+				<div class="panel-body">
+				<form:form action="addOrEditTheme.do" method="post" modelAttribute="themeForm" id="themeForm">	
+				<form:hidden path="id" id="id" />
+				
+				
+				<table class="table table-no-border" >
+					<tr>
+						<td>
+							* <fmt:message key="admin.themes.name" />:
+						</td>
+						<td>
+							<input type="text" name="name" id="name" size="40" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.themes.description" />:
+						</td>
+						<td>
+							<input type="text" name="description" id="description" size="40" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.themes.imageDir" />:
+						</td>
+						<td>
+							<input type="text" name="imageDirectory" id="imageDirectory" size="40" />
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<fmt:message key="admin.themes.makeThemeDefault" />:
+						</td>
+						<td>
+							<form:checkbox path="currentDefaultTheme" id="currentDefaultTheme" />
+						</td>
+					</tr>
+				</table>
+				
+				<div class="pull-right">
+				<div id="normalSave">
+					<a href="javascript:checkAndSubmit()" class="btn btn-default"><fmt:message key="admin.save" /></a>
+				</div>
+				<div id="cancelEdit" style="display:none;">
+					<a href="javascript:cancelEdit()" class="btn btn-default"><fmt:message key="admin.cancel" /></a>
+					<a href="javascript:submitForm()" class="btn btn-default loffset5"><fmt:message key="admin.save" /></a>
+				</div>
+				</div>
+				</form:form>
+				
+			</div>
+			</div>
 
+	</lams:Page>
 
-<table class="table table-striped table-condensed" >
-	<tr>
-		<th>
-			<fmt:message key="admin.themes.theme" />
-		</th>
-		<th>
-			<fmt:message key="admin.themes.description" />
-		</th>
-		<th>
-			<fmt:message key="admin.themes.imageDir" />
-		</th>
-		<th>
-			<fmt:message key="admin.themes.defaultTheme" />
-		</th>
-		<th>
-		</th>
-		<th>
-		</th>
-	</tr>
-	<c:forEach var="theme" items="${themes}" >
-		<tr>
-			<td>
-				${theme.name}
-			</td>
-			<td>
-				${theme.description}
-			</td>
-			<td>
-				${theme.imageDirectory}
-			</td>
-			<td align="center">
-				<c:if test="${theme.currentDefaultTheme}">
-					<i class="fa fa-check"></i>
-				</c:if>
-			</td>
-			<td align="center">
+</body>
+</lams:html>
 
-				<c:choose>
-					<c:when test="${not theme.notEditable}">
-						<i class="fa fa-pencil" 
-							title="<fmt:message key="admin.themes.edit" />"
-							onclick="editTheme('${theme.name}', '${theme.description}', '${theme.imageDirectory}', '${theme.themeId}', '${theme.currentDefaultTheme}')"
-						></i>
-						<i class="fa fa-times" 
-							title="<fmt:message key="admin.themes.remove" />"
-							onclick="removeTheme('${theme.themeId}', '${theme.name}')"
-						></i>
-					</c:when>
-					<c:otherwise>
-						<a href="javascript:setAsDefault('${theme.name}')" class="btn btn-default btn-sm" title="<fmt:message key="admin.themes.makeThemeDefault"/>">
-							<fmt:message key="admin.themes.makeDefault" />
-						</a>
-					</c:otherwise>
-				</c:choose>
-			</td>	
-		</tr>
-	</c:forEach>
-</table>
 
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<div class="panel-title"><fmt:message key="admin.themes.addNew" /></div>
-	</div>
-	
-	<div class="panel-body">
-	<html:form action="/themeManagement" method="post" styleId="themeForm">	
-	<html:hidden property="method" styleId="method" value="addOrEditTheme"/>
-	<html:hidden property="id" styleId="id" />
-	
-	
-	<table class="table table-no-border" >
-		<tr>
-			<td>
-				* <fmt:message key="admin.themes.name" />:
-			</td>
-			<td>
-				<html:text property="name" styleId="name" size="40"></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.themes.description" />:
-			</td>
-			<td>
-				<html:text property="description" styleId="description" size="40"></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.themes.imageDir" />:
-			</td>
-			<td>
-				<html:text property="imageDirectory" styleId="imageDirectory" size="40"></html:text>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<fmt:message key="admin.themes.makeThemeDefault" />:
-			</td>
-			<td>
-				<html:checkbox property="currentDefaultTheme" styleId="currentDefaultTheme" />
-			</td>
-		</tr>
-	</table>
-	
-	<div class="pull-right">
-	<div id="normalSave">
-		<a href="javascript:checkAndSubmit()" class="btn btn-default"><fmt:message key="admin.save" /></a>
-	</div>
-	<div id="cancelEdit" style="display:none;">
-		<a href="javascript:cancelEdit()" class="btn btn-default"><fmt:message key="admin.cancel" /></a>
-		<a href="javascript:submitForm()" class="btn btn-default loffset5"><fmt:message key="admin.save" /></a>
-	</div>
-	</div>
-	</html:form>
-	
-</div>
-</div>
 
+
+
+
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,81 +1,108 @@
+<!DOCTYPE html>
+
 <%@ page import="org.lamsfoundation.lams.timezone.Timezone" %>
 <%@ include file="/taglibs.jsp"%>
-<link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen">
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox.js"></script>
-<script type="text/javascript">	
-	//this script lets user select all available timezones just by enabling the checkbox in header label
-	$(document).ready(function(){
-		if ($('.timezoneCheckBox:checked').length == $('.timezoneCheckBox').length) {
-				$('#currentSelectAllTZ').prop('checked', true);			
-			}
-		$("#currentSelectAllTZ").click(function(){
-			if ($("#currentSelectAllTZ").is(':checked')) {
-				//$('#ttl-login-request').prop("value", 80);
-			    $('input:checkbox').not(this).prop('checked', this.checked);
-			}else{
-			    $('input:checkbox').not(this).prop('checked', false);	
-			}
-		});
-	});
-</script>
-<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
-<fmt:message key="admin.timezone.select.timezones.you.want.users.choose" >
-<fmt:param>
-	<a class="thickbox" href="timezonemanagement.do?method=serverTimezoneManagement&KeepThis=true&TB_iframe=true&height=188&width=820" title="<fmt:message key='admin.servertimezone.server.timezone.management'/>">
-		${serverTimezone}
-	</a>
-</fmt:param>
-</fmt:message>
 
-<c:if test="${not empty error}">
-	<lams:Alert type="danger" id="errorKey" close="false">				
-		<c:out value="${error}"/></p>
-	</lams:Alert>
-</c:if>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.timezone.title"/></c:set>
+	<title>${title}</title>
 
-<html:form action="/timezonemanagement" method="post">
-	<html:hidden property="method" value="save"/>
+	<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" />
 	
-	<table class="table table-striped table-condensed">
-		<tr>
-			<th width="10%" align="center"><fmt:message key="admin.timezone.select" />
-			<!-- added this check box for the user to enable all available time zones -->
-			  <html:checkbox property="selected" styleId="currentSelectAllTZ"> </html:checkbox>
-			</th>
-			<th width="22%"><fmt:message key="admin.timezone.time.zone.id" /></th>
-			<th width="24%" align="center"><fmt:message key="admin.timezone.raw.offset" /></th>
-			<th width="12%" align="center"><fmt:message key="admin.timezone.dst.offset" /></th>
-			<th width="32%"><fmt:message key="admin.timezone.display.name" /></th>
-		</tr>	
-	
-		<logic:iterate name="timezoneDtos" id="timezoneDto">
-			<tr>
-				<td align="center">
-					<html:checkbox name="timezoneDto" styleClass="timezoneCheckBox" property="selected" value="${timezoneDto.timeZoneId}"></html:checkbox>
-				</td>
-				<td>
-					${timezoneDto.timeZoneId}
-				</td>
-				<td align="center">
-					<c:if test="${timezoneDto.rawOffsetNegative}">-</c:if>
-					<fmt:formatDate value="${timezoneDto.rawOffset}" pattern="H : mm" timeZone="GMT" /> 
-				</td>
-				<td align="center">
-					<c:if test="${timezoneDto.dstOffset != 0}">
-						${timezoneDto.dstOffset}
-					</c:if>
-				</td>												
-				<td>
-					${timezoneDto.displayName}
-				</td>				
-			</tr>
-		</logic:iterate>
+	<link rel="stylesheet" href="<lams:LAMSURL/>/css/thickbox.css" type="text/css" media="screen">
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/thickbox.js"></script>
+	<script type="text/javascript">	
+		//this script lets user select all available timezones just by enabling the checkbox in header label
+		$(document).ready(function(){
+			if ($('.timezoneCheckBox:checked').length == $('.timezoneCheckBox').length) {
+					$('#currentSelectAllTZ').prop('checked', true);			
+				}
+			$("#currentSelectAllTZ").click(function(){
+				if ($("#currentSelectAllTZ").is(':checked')) {
+					//$('#ttl-login-request').prop("value", 80);
+				    $('input:checkbox').not(this).prop('checked', this.checked);
+				}else{
+				    $('input:checkbox').not(this).prop('checked', false);	
+				}
+			});
+		});
+	</script>
+</lams:head>
+    
+<body class="stripes">
+	<c:set var="title"><fmt:message key="admin.timezone.title"/></c:set>
+	<c:set var="help"><fmt:message key="LAMS+Configuration"/></c:set>
+	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
+		<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 		
-	</table>
-	
-	<div class="pull-right">
-		<html:cancel styleClass="btn btn-default"><fmt:message key="admin.cancel" /></html:cancel>
-		<html:submit styleClass="btn btn-primary loffset5"><fmt:message key="admin.save" /></html:submit>
-	</p>
-</html:form>
\ No newline at end of file
+			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
+			<fmt:message key="admin.timezone.select.timezones.you.want.users.choose" >
+			<fmt:param>
+				<a class="thickbox" href="timezonemanagement/serverTimezoneManagement.do?KeepThis=true&TB_iframe=true&height=188&width=820" title="<fmt:message key='admin.servertimezone.server.timezone.management'/>">
+					${serverTimezone}
+				</a>
+			</fmt:param>
+			</fmt:message>
+			
+			<c:if test="${not empty error}">
+				<lams:Alert type="danger" id="errorKey" close="false">				
+					<c:out value="${error}"/></p>
+				</lams:Alert>
+			</c:if>
+			
+			<form:form action="save.do" id="timezoneForm" modelAttribute="timezoneForm" method="post">
+				
+				<table class="table table-striped table-condensed">
+					<tr>
+						<th width="10%" align="center"><fmt:message key="admin.timezone.select" />
+						<!-- added this check box for the user to enable all available time zones -->
+						  <html:checkbox property="selected" styleId="currentSelectAllTZ"> </html:checkbox>
+						</th>
+						<th width="22%"><fmt:message key="admin.timezone.time.zone.id" /></th>
+						<th width="24%" align="center"><fmt:message key="admin.timezone.raw.offset" /></th>
+						<th width="12%" align="center"><fmt:message key="admin.timezone.dst.offset" /></th>
+						<th width="32%"><fmt:message key="admin.timezone.display.name" /></th>
+					</tr>	
+				
+					<c:forEach items="${timezoneDtos}" var="timezoneDto">
+						<tr>
+							<td align="center">
+								<form:checkbox name="timezoneDto" cssClass="timezoneCheckBox" path="selected" value="${timezoneDto.timeZoneId}"/>
+							</td>
+							<td>
+								${timezoneDto.timeZoneId}
+							</td>
+							<td align="center">
+								<c:if test="${timezoneDto.rawOffsetNegative}">-</c:if>
+								<fmt:formatDate value="${timezoneDto.rawOffset}" pattern="H : mm" timeZone="GMT" /> 
+							</td>
+							<td align="center">
+								<c:if test="${timezoneDto.dstOffset != 0}">
+									${timezoneDto.dstOffset}
+								</c:if>
+							</td>												
+							<td>
+								${timezoneDto.displayName}
+							</td>				
+						</tr>
+					</c:forEach>
+					
+				</table>
+				
+				<div class="pull-right">
+					<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+					<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.delete"/>" />
+				</p>
+			</form:form>
+		</lams:Page>
+		
+</body>
+</lams:html>
+
+
Index: lams_admin/web/timezoneServerManagement.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef
--- lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
@@ -1,11 +1,18 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 
-<!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<title><fmt:message key="admin.servertimezone.server.timezone"/></title>
+	<c:set var="title"><fmt:message key="admin.servertimezone.title"/></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" />
 	<link rel="icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
-	<link rel="shortcut icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 	
 	<lams:css />
 	<style media="screen,projection" type="text/css">
@@ -25,40 +32,43 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
 		function changeServerTimezone() {
-			parent.document.location.href ='<c:url value="/timezonemanagement.do?method=changeServerTimezone&timeZoneId="/>' + $("#timeZoneId").val();
+			parent.document.location.href ='<c:url value="/timezonemanagement/changeServerTimezone.do?timeZoneId="/>' + $("#timeZoneId").val();
 		}
-	</script>	
+	</script>
+
 </lams:head>
+    
+<body class="stripes">
+			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+				<h4 class="loffset10"><fmt:message key="admin.servertimezone.select.server.timezone" /></h4>
+				<div style="padding: 13px 20px 20px;">
+			
+					<form:select id="timeZoneId" path="timeZoneId" value="${serverTimezone}" style="margin-bottom:40px;">
+						<c:forEach items="${timezoneDtos}" var="timezoneDto">
+							<form:option value="${timezoneDto.timeZoneId}" cssClass="form-control">
+								${timezoneDto.timeZoneId}
+								&nbsp;&nbsp;-&nbsp;&nbsp;
+								<fmt:message key="admin.servertimezone.raw.offset" ><fmt:param><fmt:formatDate value="${timezoneDto.rawOffset}" pattern="H:mm" timeZone="GMT" /></fmt:param></fmt:message>
+								&nbsp;&nbsp;-&nbsp;&nbsp;
+								<fmt:message key="admin.servertimezone.dst.offset"><fmt:param>${timezoneDto.dstOffset}</fmt:param></fmt:message>
+								&nbsp;&nbsp;-&nbsp;&nbsp;
+								<fmt:message key="admin.servertimezone.name"><fmt:param>${timezoneDto.displayName}</fmt:param></fmt:message>
+							</form:option>
+						</c:forEach>
+					</form:select>
+					
+					<div class="pull-right">
+						<a href="#" onclick="self.parent.tb_remove();" class="btn btn-default btn-sm">
+							<fmt:message key="admin.cancel" /> 
+						</a>
+						<a href="#" onclick="changeServerTimezone();" class="btn btn-primary btn-sm">
+							<fmt:message key="admin.servertimezone.select" /> 
+						</a>
+					</div>
+				</div>
+			</lams:Page>
 
-<body>
-
-<h4 class="loffset10"><fmt:message key="admin.servertimezone.select.server.timezone" /></h4>
-	<div style="padding: 13px 20px 20px;">
-
-		<html:select styleId="timeZoneId" property="timeZoneId" value="${serverTimezone}" style="margin-bottom:40px;">
-			<logic:iterate name="timezoneDtos" id="timezoneDto">
-				<html:option value="${timezoneDto.timeZoneId}" styleClass="form-control">
-					${timezoneDto.timeZoneId}
-					&nbsp;&nbsp;-&nbsp;&nbsp;
-					<fmt:message key="admin.servertimezone.raw.offset" ><fmt:param><fmt:formatDate value="${timezoneDto.rawOffset}" pattern="H:mm" timeZone="GMT" /></fmt:param></fmt:message>
-					&nbsp;&nbsp;-&nbsp;&nbsp;
-					<fmt:message key="admin.servertimezone.dst.offset"><fmt:param>${timezoneDto.dstOffset}</fmt:param></fmt:message>
-					&nbsp;&nbsp;-&nbsp;&nbsp;
-					<fmt:message key="admin.servertimezone.name"><fmt:param>${timezoneDto.displayName}</fmt:param></fmt:message>
-				</html:option>
-			</logic:iterate>
-		</html:select>
-		
-		<div class="pull-right">
-			<a href="#" onclick="self.parent.tb_remove();" class="btn btn-default btn-sm">
-				<fmt:message key="admin.cancel" /> 
-			</a>
-			<a href="#" onclick="changeServerTimezone();" class="btn btn-primary btn-sm">
-				<fmt:message key="admin.servertimezone.select" /> 
-			</a>
-		</div>
-	</div>
-	
 </body>
 </lams:html>
 
+