Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -144,7 +144,7 @@
 	    request.setAttribute("parentGroupName", pOrg.getName());
 	    request.setAttribute("parentGroupId", pOrg.getOrganisationId());
 	} else {
-	    request.setAttribute("OrgManageForm", orgManageForm);
+	    request.setAttribute("orgManageForm", orgManageForm);
 
 	    // display org info
 	    request.setAttribute("org", org);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -49,10 +49,9 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.validation.Errors;
+import org.springframework.validation.BindingResult;
 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;
 
@@ -92,8 +91,8 @@
     private WebApplicationContext applicationContext;
 
     @RequestMapping(path = "/orgsave")
-    public String execute(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public String execute(@ModelAttribute OrganisationForm organisationForm, BindingResult bindingResult,
+	    HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	if (service == null) {
 	    service = AdminServiceProxy.getService(applicationContext.getServletContext());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -144,7 +144,6 @@
 
 	// creating new organisation
 	organisationForm.setOrgId(null);
-	;
 	Integer parentId = WebUtil.readIntParam(request, "parentId", true);
 	if (parentId != null) {
 	    Organisation parentOrg = (Organisation) OrganisationController.service.findById(Organisation.class,
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -39,7 +39,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.validation.Errors;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.WebApplicationContext;
@@ -62,39 +62,41 @@
     private WebApplicationContext applicationContext;
 
     @RequestMapping(path = "/serversave")
-    public String execute(@ModelAttribute ExtServerForm extServerForm, Errors errors, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
+    public String execute(@ModelAttribute ExtServerForm extServerForm, BindingResult bindingResult,
+	    HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext());
 	userService = AdminServiceProxy.getService(applicationContext.getServletContext());
 	messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext());
 
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
 	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl" };
 	for (String requiredField : requiredFields) {
-	    if (StringUtils.trimToNull(requiredField) == null) {
-		errors.reject("error.required", messageService.getMessage("sysadmin." + requiredField));
+	    if (StringUtils.trimToNull(extServerForm.getRequiredField()) == null) {
+		errorMap.add(requiredField, messageService.getMessage("error.required", messageService.getMessage("sysadmin." + requiredField)));
 	    }
 	}
 
 	Integer sid = extServerForm.getSid();
-	if (!errors.hasErrors()) {//check duplication
+	if (errorMap.isEmpty()) {//check duplication
 	    String[] uniqueFields = { "serverid", "prefix" };
 	    for (String uniqueField : uniqueFields) {
-		List list = userService.findByProperty(ExtServer.class, "uniqueField", uniqueField);
+		List list = userService.findByProperty(ExtServer.class, uniqueField, extServerForm.getUniqueField());
 		if (list != null && list.size() > 0) {
 		    if (sid.equals(-1)) {//new map
-			errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
+			errorMap.add(uniqueField, messageService.getMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)));
 		    } else {
 			ExtServer map = (ExtServer) list.get(0);
 			if (!map.getSid().equals(sid)) {
-			    errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
+			    errorMap.add(uniqueField, messageService.getMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)));
 			}
 		    }
 
 		}
 	    }
 	}
-	if (!errors.hasErrors()) {
+	if (errorMap.isEmpty()) {
 	    ExtServer map = null;
 	    if (sid.equals(-1)) {
 		map = new ExtServer();
@@ -108,6 +110,7 @@
 	    service.saveExtServer(map);
 	    return "forward:/serverlist.do";
 	} else {
+	    request.setAttribute("errorMap", errorMap);
 	    return "servermaintain";
 	}
     }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(.../SignupManagementController.java)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(.../SignupManagementController.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -18,10 +18,10 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
-import org.springframework.validation.Errors;
+import org.springframework.util.LinkedMultiValueMap;
+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;
 
@@ -49,7 +49,7 @@
     private MessageService adminMessageService;
 
     @RequestMapping("/start")
-    public String execute(@ModelAttribute("signupForm") SignupManagementForm signupForm, Errors errors, HttpServletRequest request,
+    public String execute(@ModelAttribute("signupForm") SignupManagementForm signupForm, HttpServletRequest request,
 	    HttpServletResponse response) {
 
 	try {
@@ -71,7 +71,7 @@
 	    } else if (StringUtils.equals(action, "edit")) {
 		return edit(signupForm, request);
 	    } else if (StringUtils.equals(action, "add")) {
-		return add(signupForm, errors, request);
+		return add(signupForm, request);
 	    } else if (StringUtils.equals(action, "delete")) {
 		return delete(request);
 	    }
@@ -87,7 +87,8 @@
     }
 
     @RequestMapping(path = "/edit")
-    public String edit(@ModelAttribute("signupForm") SignupManagementForm signupForm, HttpServletRequest request) throws Exception {
+    public String edit(@ModelAttribute("signupForm") SignupManagementForm signupForm, HttpServletRequest request)
+	    throws Exception {
 
 	Integer soid = WebUtil.readIntParam(request, "soid", false);
 
@@ -118,21 +119,25 @@
     }
 
     @RequestMapping(path = "/add")
-    public String add(@ModelAttribute("signupForm") SignupManagementForm signupForm, Errors errors, HttpServletRequest request)
+    public String add(@ModelAttribute("signupForm") SignupManagementForm signupForm, HttpServletRequest request)
 	    throws Exception {
 
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
 	// check if form submitted
 	if (signupForm.getOrganisationId() != null && signupForm.getOrganisationId() > 0) {
 
 	    // validate
 	    if (!StringUtils.equals(signupForm.getCourseKey(), signupForm.getConfirmCourseKey())) {
-		errors.reject("courseKey", adminMessageService.getMessage("error.course.keys.unequal"));
+		errorMap.add("courseKey", adminMessageService.getMessage("error.course.keys.unequal"));
 	    }
 	    if (signupService.contextExists(signupForm.getSignupOrganisationId(), signupForm.getContext())) {
-		errors.reject("context", adminMessageService.getMessage("error.context.exists"));
+		errorMap.add("context", adminMessageService.getMessage("error.context.exists"));
 	    }
 
-	    if (!errors.hasErrors()) {
+	    if (!errorMap.isEmpty()) {
+		request.setAttribute("errorMap", errorMap);
+	    } else {
 		// proceed
 		SignupOrganisation signup;
 		if (signupForm.getSignupOrganisationId() != null && signupForm.getSignupOrganisationId() > 0) {
@@ -156,7 +161,7 @@
 		signup.setContext(signupForm.getContext());
 		userManagementService.save(signup);
 
-		return "forward:../signupManagement/start.do";
+		return "forward:/signupManagement/start.do";
 	    }
 	} else {
 	    // form not submitted, default values
@@ -178,6 +183,6 @@
 	    userManagementService.deleteById(SignupOrganisation.class, soid);
 	}
 
-	return "forward:../signupManagement/start.do";
+	return "forward:/signupManagement/start.do";
     }
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java	(.../ExtServerForm.java)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java	(.../ExtServerForm.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -48,10 +48,10 @@
 
     private Integer timeToLiveLoginRequest = 80;
 
-    private String[] requiredFields;
-
-    private String[] uniqueFields;
-
+    private String requiredField;
+    
+    private String uniqueField;
+    
     public Integer getSid() {
 	return sid;
     }
@@ -148,20 +148,20 @@
 	this.timeToLiveLoginRequest = timeToLiveLoginRequest;
     }
 
-    public String[] getRequiredFields() {
-	return requiredFields;
+    public String getRequiredField() {
+        return requiredField;
     }
 
-    public void setRequiredFields(String[] requiredFields) {
-	this.requiredFields = requiredFields;
+    public void setRequiredField(String requiredField) {
+        this.requiredField = requiredField;
     }
 
-    public String[] getUniqueFields() {
-	return uniqueFields;
+    public String getUniqueField() {
+        return uniqueField;
     }
 
-    public void setUniqueFields(String[] uniqueFields) {
-	this.uniqueFields = uniqueFields;
+    public void setUniqueField(String uniqueField) {
+        this.uniqueField = uniqueField;
     }
 
 }
Index: lams_admin/web/cleanup.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -10,7 +10,7 @@
 	<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/>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" />
@@ -20,7 +20,7 @@
 	
 	<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>
+	<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" />
Index: lams_admin/web/cleanupPreviewLessons.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -10,7 +10,7 @@
 	<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/>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" />
@@ -22,7 +22,7 @@
 	<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>
+		<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">
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -18,7 +18,7 @@
 	
 	<c:set var="title">${title}: <fmt:message key="admin.list.disabled.users"/></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><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>
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -22,7 +22,7 @@
 	<c:set var="lams"><lams:LAMSURL/></c:set>
 
 	<lams:css/>
-	<link rel="stylesheet" href="<lams:LAMSURL/>/admin/css/admin.css" type="text/css" media="screen">
+	<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" />
@@ -59,7 +59,7 @@
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="importForm">
 	
-	<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">
 	
@@ -123,7 +123,7 @@
 			<lams:WaitingSpinner id="fileUpload_Busy"/> 
 		
 		<div class="pull-right">
-		<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
 		<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import"/>" /> &nbsp; 	
 		</div>
 	
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -60,7 +60,7 @@
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 			<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="importExcelForm">
 				<p>
-					<a href="<lams:LAMSURL/>/admin/sysadminstart.do"
+					<a href="<lams:LAMSURL/>admin/sysadminstart.do"
 						class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
 				</p>
 				
@@ -123,7 +123,7 @@
 					<lams:WaitingSpinner id="fileUpload_Busy"/> 
 				
 					<div class="pull-right">
-						<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+						<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
 						<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import" />" />
 						&nbsp;
 					</div>
Index: lams_admin/web/import/importresult.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,15 +8,15 @@
 	<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/>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}">
-		<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>
 
 		<p><fmt:message key="${successful}"/></p>
 		<p>
Index: lams_admin/web/joblist.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/joblist.jsp	(.../joblist.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/joblist.jsp	(.../joblist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/ldap.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -12,7 +12,7 @@
 	<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/>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" />
@@ -34,7 +34,7 @@
 	<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 class="panel panel-default">
 			<div class="panel-heading">
Index: lams_admin/web/logevent.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -236,7 +236,7 @@
     
 <body class="stripes">
 	<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><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;
Index: lams_admin/web/loginmaintain.jsp
===================================================================
diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305)
+++ lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -17,7 +17,7 @@
 <body class="stripes">
 	<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>
+		<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]}">
Index: lams_admin/web/lti/ltiConsumer.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -48,11 +48,11 @@
 	<c:set var="title"><fmt:message key="label.edit.tool.consumer"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="ltiConsumerForm">
 				<p>
-					<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
+					<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">
+					<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do" class="btn btn-default">
 						<fmt:message key="label.manage.tool.consumers" />
 					</a>
 				</p>
@@ -102,7 +102,7 @@
 					</table>
 					
 					<div class="pull-right">
-						<a href="<lams:LAMSURL/>/admin/ltiConsumerManagement/start.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+						<a href="<lams:LAMSURL/>admin/ltiConsumerManagement/start.do" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
 						<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 					</div>
 				</form:form>
Index: lams_admin/web/lti/ltiConsumerList.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -18,7 +18,7 @@
 	
 	<lams:Page type="admin" title="${title}">
 				<p>
-					<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
+					<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default">
 						<fmt:message key="sysadmin.maintain" />
 					</a>
 				</p>
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -15,7 +15,7 @@
 	<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/>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" />
Index: lams_admin/web/organisation/cloneResult.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -10,7 +10,7 @@
 	<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/>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" />
Index: lams_admin/web/organisation/cloneStart.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -9,7 +9,7 @@
 	<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/>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" />
@@ -38,7 +38,7 @@
 					$("#sourceGroupId").change(function() {
 						loadSubgroups($("#sourceGroupId").val());
 					});
-					$("#sourceGroupId").load("<lams:LAMSURL/>/admin/clone/getGroups.do", function() {
+					$("#sourceGroupId").load("<lams:LAMSURL/>admin/clone/getGroups.do", function() {
 						loadSubgroups($("#sourceGroupId").val());
 					});
 					$("a.lessonNameLink").on("click", function() {
@@ -47,7 +47,7 @@
 				});
 			
 				function loadSubgroups(groupId) {
-					$("#sourceSubgroupId").load("<lams:LAMSURL/>/admin/clone/getSubgroups.do", { groupId: groupId });
+					$("#sourceSubgroupId").load("<lams:LAMSURL/>admin/clone/getSubgroups.do", { groupId: groupId });
 				}
 			
 				function chosenGroup() {
@@ -60,7 +60,7 @@
 			
 				function loadGroupAttributes(sourceGroupId) {
 					$("#cloneOptionsDiv").show();
-					$("#availableLessons").load("<lams:LAMSURL/>/admin/clone/availableLessons.do", { sourceGroupId: sourceGroupId });
+					$("#availableLessons").load("<lams:LAMSURL/>admin/clone/availableLessons.do", { sourceGroupId: sourceGroupId });
 				}
 			
 				function lessonDialog(lessonId) {
@@ -90,7 +90,7 @@
 			
 				function staffDialog() {
 					if (!staffLoaded) {
-						$("#staffDialog").load("<lams:LAMSURL/>/admin/clone/selectStaff.do", { groupId: <c:out value="${org.organisationId}" /> });
+						$("#staffDialog").load("<lams:LAMSURL/>admin/clone/selectStaff.do", { groupId: <c:out value="${org.organisationId}" /> });
 						initUserDialog("#staffDialog");
 						staffLoaded = true;
 					}
@@ -100,7 +100,7 @@
 			
 				function learnerDialog() {
 					if (!learnersLoaded) {
-						$("#learnerDialog").load("<lams:LAMSURL/>/admin/clone/selectLearners.do", { groupId: <c:out value="${org.organisationId}" /> });
+						$("#learnerDialog").load("<lams:LAMSURL/>admin/clone/selectLearners.do", { groupId: <c:out value="${org.organisationId}" /> });
 						initUserDialog("#learnerDialog");
 						learnersLoaded = true;
 					}
Index: lams_admin/web/organisation/courseAdminEdit.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/organisation/courseAdminEdit.jsp	(.../courseAdminEdit.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/organisation/courseAdminEdit.jsp	(.../courseAdminEdit.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -40,7 +40,7 @@
 <body class="stripes">
 
 	<lams:Page type="admin" title="${title}" formID="organisationForm">
-		<form:form action="./orgsave.do" method="post" modelAttribute="organisationForm" id="organisationForm" onsubmit="return warnIfRemoved()">
+		<form:form action="../orgsave.do" method="post" modelAttribute="organisationForm" id="organisationForm" onsubmit="return warnIfRemoved()">
 				<form:hidden path="orgId" />
 				<form:hidden path="parentId" />
 				<form:hidden path="typeId" />
Index: lams_admin/web/organisation/deleteAllLessons.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -13,7 +13,7 @@
 	<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/>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" />
Fisheye: Tag 79b6147f263fbc3c92e2db7d98227fa8f7358851 refers to a dead (removed) revision in file `lams_admin/web/organisation/parts/breadcrumbs.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_admin/web/remove.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/serverlist.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,15 +8,15 @@
 	<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/>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}">
-			<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">
 				<tr>
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -10,7 +10,7 @@
 	<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/>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" />
@@ -61,31 +61,50 @@
 	<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>
 
-				<form:errors path="*" />
 				
+				<c:set var="errorKey" value="${serverid || serverkey || servername || prefix || userinfoUrl}" /> 
+						<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}" /><br /> 
+						         </c:forEach> 
+						     </lams:Alert> 
+						</c:if>
+				
+						
+				<c:set var="errorKey" value="${serverid || prefix}" /> 
+						<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}" /><br /> 
+						         </c:forEach> 
+						     </lams:Alert> 
+						</c:if>
+						
+								
 				<form:form action="../serversave.do" id="extServerForm" 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>
+						<td><form:input path="serverid" size="20" cssClass="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>
+						<td><form:input path="serverkey" size="30" cssClass="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>
+						<td><form:input path="servername" size="30" cssClass="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>
+						<td><form:input path="serverdesc" cols="40" rows="3" cssClass="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>
+						<td><form:input path="prefix" size="10" cssClass="form-control"/></td>
 					</tr>
 					
 					<tr>
@@ -97,7 +116,7 @@
 						<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">
+							<form:hidden path="timeToLiveLoginRequestEnabled" value="false"/>
 						</td>
 					</tr>
 					<tr id="ttl-login-request-wrap" <c:if test="${!extServerForm.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
@@ -107,15 +126,15 @@
 				
 					<tr>
 						<td><fmt:message key="sysadmin.userinfoUrl" />&nbsp;*</td>
-						<td><input type="text" name="userinfoUrl" size="70" class="form-control"/></td>
+						<td><form:input path="userinfoUrl" size="70" cssClass="form-control"/></td>
 					</tr>
 					<tr>
 						<td><fmt:message key="sysadmin.lessonFinishUrl" /></td>
-						<td><input type="text" name="lessonFinishUrl" size="70" class="form-control"/></td>
+						<td><form:input path="lessonFinishUrl" size="70" cssClass="form-control"/></td>
 					</tr>
 						<tr>
 						<td><fmt:message key="sysadmin.extGroupsUrl" /></td>
-						<td><input type="text" name="extGroupsUrl" size="70" class="form-control"/></td>
+						<td><form:input path="extGroupsUrl" size="70" cssClass="form-control"/></td>
 					</tr>
 				</table>
 				<div class="pull-right">
Index: lams_admin/web/sessionmaintain.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,15 +8,15 @@
 	<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/>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}">
-		<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">
 			<tr>
@@ -29,7 +29,7 @@
 				<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">
+					<a href="<lams:LAMSURL/>admin/sessionmaintain/delete.do?login=${ses.key}" class="btn btn-default">
 				<fmt:message key="sysadmin.maintain.session.delete" />
 					</a>
 				</td>
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -19,12 +19,12 @@
 	<c:set var="title">${title}: <fmt:message key="admin.add.edit.signup.page"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="signupForm">
 		<div>
-			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
+			<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
 			<a href="../signupManagement/start.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">
-				<input type="hidden" name="signupOrganisationId" />
+				<form:hidden path="signupOrganisationId" />
 				
 				<table class="table table-condensed table-no-border">
 					<tr>
@@ -50,7 +50,14 @@
 					</tr>
 					<tr>
 						<td colspan="2">
-						 <form:errors path="courseKey" />
+						<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}" /><br /> 
+						         </c:forEach> 
+						     </lams:Alert> 
+						</c:if>
 						</td>
 					</tr>
 					<tr>
@@ -83,12 +90,19 @@
 					</tr>		
 					<tr>
 						<td colspan="2">
-						<form:errors path="context" />
+						<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}" /><br /> 
+						         </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>
+						<td style="vertical-align: middle;"><lams:LAMSURL/>signup/<form:input path="context" /></td>
 					</tr>
 				</table>
 				
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -9,7 +9,7 @@
 	<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/>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" />
Index: lams_admin/web/statistics.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -37,7 +37,7 @@
     
 <body class="stripes">
 	<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><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">
Index: lams_admin/web/sysadmin.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -78,7 +78,7 @@
     
 <body class="stripes">
 	<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" >
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -9,7 +9,7 @@
 	<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/>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" />
@@ -40,7 +40,7 @@
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="timezoneForm">
 		
-			<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>
 			<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'/>">
Index: lams_admin/web/timezoneServerManagement.jsp
===================================================================
diff -u -rc1cd3b5d3bc88f16ad489fbc19c7d21f5b748305 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision c1cd3b5d3bc88f16ad489fbc19c7d21f5b748305)
+++ lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -51,7 +51,7 @@
 <body class="stripes">
 	
 	<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><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 				<h1><fmt:message key="sysadmin.tool.management" /></h1>
 				
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -15,7 +15,7 @@
 	<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/>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" />
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
@@ -157,7 +157,7 @@
 				        : <a href="orgmanage.do?org=<c:out value="pOrgId" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
 				    </c:if>
 				    <c:if test="${userOrgForm.orgId != 1}">
-						: <a href="<c:if test="${userOrgForm.orgType == 3}">user</c:if><c:if test="${userOrgForm.orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
+						: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
 						<c:out value="${userOrgForm.orgName}"/></a>
 					</c:if>
 					<c:if test="${userOrgForm.orgId == 1}">
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -8,7 +8,7 @@
 	<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/>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" />
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -r79b6147f263fbc3c92e2db7d98227fa8f7358851
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
@@ -11,7 +11,7 @@
 	<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/>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" />
@@ -148,7 +148,7 @@
 
 	<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="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="sysadmin.maintain" /></a></p>
+		<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="sysadmin.maintain" /></a></p>
 		
 		<p><input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do'" />