Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java	(.../LdapConfigController.java)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java	(.../LdapConfigController.java)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -120,7 +120,7 @@
 	return "ldap";
     }
 
-    @RequestMapping(path = "/sync", method = RequestMethod.POST)
+    @RequestMapping(path = "/sync")
     public String sync(HttpServletRequest request) throws Exception {
 
 	String sessionId = SessionManager.getSession().getId();
@@ -132,7 +132,7 @@
 	return "ldap";
     }
 
-    @RequestMapping(path = "/waiting", method = RequestMethod.POST)
+    @RequestMapping(path = "/waiting")
     public String waiting(HttpServletRequest request) throws Exception {
 
 	request.setAttribute("wait", getMessageService().getMessage("msg.ldap.synchronise.wait"));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -18,7 +18,8 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
@@ -125,39 +126,42 @@
      * Stores in the DB a new or edited LTI tool consumer
      */
     @RequestMapping(path = "/save", method = RequestMethod.POST)
-    public String save(@ModelAttribute LtiConsumerForm ltiConsumerForm, Errors errors, HttpServletRequest request,
+    public String save(@ModelAttribute LtiConsumerForm ltiConsumerForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
 	initServices();
 
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+
 	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix" };
 	for (String requiredField : requiredFields) {
-	    if (StringUtils.trimToNull(requiredField) == null) {
-		errors.reject("error.required", messageService.getMessage("sysadmin." + requiredField));
+	    if (StringUtils.trimToNull(ltiConsumerForm.getRequiredField()) == null) {
+		errorMap.add(requiredField, messageService.getMessage("error.required"));
 	    }
 	}
 
 	Integer sid = ltiConsumerForm.getSid();
 	//check duplication
-	if (!errors.hasErrors()) {
+	if (errorMap.isEmpty()) {
 	    String[] uniqueFields = { "serverid", "prefix" };
 	    for (String uniqueField : uniqueFields) {
-		List<ExtServer> list = userManagementService.findByProperty(ExtServer.class, "uniqueField",
-			uniqueField);
+		List<ExtServer> list = userManagementService.findByProperty(ExtServer.class, uniqueField, ltiConsumerForm.getUniqueField());
 		if (list != null && list.size() > 0) {
 		    if (sid.equals(0)) {//new map
-			errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
+			errorMap.add(uniqueField,
+				messageService.getMessage("error.not.unique"));
 		    } else {
 			ExtServer ltiConsumer = list.get(0);
 			if (!ltiConsumer.getSid().equals(sid)) {
-			    errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
+			    errorMap.add(uniqueField,
+				    messageService.getMessage("error.not.unique"));
 			}
 		    }
 
 		}
 	    }
 	}
-	if (!errors.hasErrors()) {
+	if (errorMap.isEmpty()) {
 	    ExtServer ltiConsumer = null;
 	    if (sid.equals(0)) {
 		ltiConsumer = new ExtServer();
@@ -173,6 +177,7 @@
 	    return unspecified(request);
 
 	} else {
+	    request.setAttribute("errorMap", errorMap);
 	    return "lti/ltiConsumer";
 	}
     }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -73,8 +73,9 @@
 
 	String[] requiredFields = { "serverid", "serverkey", "servername", "prefix", "userinfoUrl" };
 	for (String requiredField : requiredFields) {
+	    request.setAttribute("requiredField", requiredField);
 	    if (StringUtils.trimToNull(extServerForm.getRequiredField()) == null) {
-		errorMap.add(requiredField, messageService.getMessage("error.required", messageService.getMessage("sysadmin." + requiredField)));
+		errorMap.add(requiredField, messageService.getMessage("error.required"));
 	    }
 	}
 
@@ -84,12 +85,13 @@
 	    for (String uniqueField : uniqueFields) {
 		List list = userService.findByProperty(ExtServer.class, uniqueField, extServerForm.getUniqueField());
 		if (list != null && list.size() > 0) {
+		    request.setAttribute("uniqueField", uniqueField);
 		    if (sid.equals(-1)) {//new map
-			errorMap.add(uniqueField, messageService.getMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)));
+			errorMap.add(uniqueField, messageService.getMessage("error.not.unique"));
 		    } else {
 			ExtServer map = (ExtServer) list.get(0);
 			if (!map.getSid().equals(sid)) {
-			    errorMap.add(uniqueField, messageService.getMessage("error.not.unique", messageService.getMessage("sysadmin." + uniqueField)));
+			    errorMap.add(uniqueField, messageService.getMessage("error.not.unique"));
 			}
 		    }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java	(.../ThemeManagementController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ThemeManagementController.java	(.../ThemeManagementController.java)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -88,7 +88,7 @@
 	return "themeManagement";
     }
 
-    @RequestMapping(path = "/addOrEditTheme", method = RequestMethod.POST)
+    @RequestMapping(path = "/addOrEditTheme")
     public String addOrEditTheme(@ModelAttribute ThemeForm themeForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -118,7 +118,7 @@
 	return unspecified(themeForm, request);
     }
 
-    @RequestMapping(path = "/removeTheme", method = RequestMethod.POST)
+    @RequestMapping(path = "/removeTheme")
     public String removeTheme(@ModelAttribute ThemeForm themeForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -137,7 +137,7 @@
 	return unspecified(themeForm, request);
     }
 
-    @RequestMapping(path = "/setAsDefault", method = RequestMethod.POST)
+    @RequestMapping(path = "/setAsDefault")
     public String setAsDefault(@ModelAttribute ThemeForm themeForm, HttpServletRequest request) throws Exception {
 
 	if (themeForm.getName() != null) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java	(.../ToolContentListController.java)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java	(.../ToolContentListController.java)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -54,6 +54,7 @@
 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;
 
@@ -200,18 +201,20 @@
 	return true;
     }
 
-    @RequestMapping("/disableLibrary")
-    public void disableLibrary(HttpServletRequest request) {
+    @RequestMapping("/disable")
+    public String disableLibrary(HttpServletRequest request) {
 	Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false);
 	ILearningDesignService ldService = getLearningDesignService();
 	ldService.setValid(learningLibraryId, false);
+	return "forward:/toolcontentlist/start.do";
     }
 
-    @RequestMapping("/enableLibrary")
-    public void enableLibrary(HttpServletRequest request) {
+    @RequestMapping("/enable")
+    public String enableLibrary(HttpServletRequest request) {
 	Long learningLibraryId = WebUtil.readLongParam(request, "libraryID", false);
 	ILearningDesignService ldService = getLearningDesignService();
 	ldService.setValid(learningLibraryId, true);
+	return "forward:/toolcontentlist/start.do";
     }
 
     /**
@@ -248,11 +251,11 @@
 	}
 	request.setAttribute("groups", groupsJSON.toString());
 
-	return "forward:/toolcontent/learningLibraryGroup";
+	return "toolcontent/learningLibraryGroup";
     }
 
-    @RequestMapping("/saveLearningLibraryGroups")
-    private void saveLearningLibraryGroups(HttpServletRequest request) throws IOException {
+    @RequestMapping(path = "/saveLearningLibraryGroups", method = RequestMethod.POST)
+    private String saveLearningLibraryGroups(HttpServletRequest request) throws IOException {
 	// extract groups from JSON and persist them
 
 	ArrayNode groupsJSON = JsonUtil.readArray(request.getParameter("groups"));
@@ -277,6 +280,8 @@
 	}
 
 	getLearningDesignService().saveLearningLibraryGroups(groups);
+	
+	return "forward:/toolcontentlist/start.do";
     }
 
     private ILearningDesignService getLearningDesignService() {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java	(.../LtiConsumerForm.java)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java	(.../LtiConsumerForm.java)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -43,11 +43,11 @@
     private boolean timeToLiveLoginRequestEnabled = false;
 
     private String ltiToolConsumerMonitorRoles;
-    
-    private String[] requiredFields;
 
-    private String[] uniqueFields;
+    private String requiredField;
 
+    private String uniqueField;
+
     public Integer getSid() {
 	return sid;
     }
@@ -128,19 +128,20 @@
 	this.ltiToolConsumerMonitorRoles = ltiToolConsumerMonitorRoles;
     }
 
-    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/import/importGroups.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -71,24 +71,24 @@
 				<th><fmt:message key="admin.organisation.name"/></th>
 			</tr>
 			<c:set var="results" value="${results}" />
-			<c:forEach var="i" begin="0" step="1" end="${results.size()}">
+			<c:forEach var="i" begin="0" step="1" end="${results.size()-1}">
 				<tr>
-				<c:set var="rowResult" value="${i}"/>
+				<c:set var="rowResult" value="${results[i]}"/>
 				<c:choose>
-					<c:when test="${(rowResult != null) && (rowResult >= 4)}">
-						<c:if test="${courseTypeId == 3}">
-							<th> <c:out value="${rowResult.orgId}" /> </th>
-							<th> <c:out value="${rowResult.name}" /> </th>
+					<c:when test="${(rowResult != null) && (rowResult.size() >= 4)}">
+						<c:if test="${courseTypeId == rowResult[3]}">
+							<th> <c:out value="${rowResult[0]}" /> </th>
+							<th> <c:out value="${rowResult[1]}" /> </th>
 						</c:if>
-						<c:if test="${classTypeId == 3}">
-							<td> <c:out value="${rowResult.orgId}" /> </td>
-							<td> <c:out value="${rowResult.name}" /> </td>
+						<c:if test="${classTypeId == rowResult[3]}">
+							<td> <c:out value="${rowResult[0]}" /> </td>
+							<td> <c:out value="${rowResult[1]}" /> </td>
 						</c:if>
 					</c:when>
 					<c:otherwise>
 						<td colspan="2">
-						<c:forEach var="j" begin="0" step="1" end="${results.size()}">
-							<c:out value="${j}"/> <br />
+						<c:forEach var="j" begin="0" step="1" end="${results.size()-1}">
+							<c:out value="${rowResult[j]}"/> <br />
 						</c:forEach>
 						</td>
 					</c:otherwise>
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -22,13 +22,13 @@
 	<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" />
+	<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" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/upload.js"></script>
 	 
 	<script language="javascript" type="text/JavaScript">
 		
Index: lams_admin/web/import/importresult.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -18,11 +18,11 @@
 	<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="${successful}"/></p>
+		<p><c:out value="${successful}"/></p>
 		<p>
-		<c:forEach items="${results}" var="messages">
+		<c:forEach items="${results}" var="messages" varStatus="index">
 			<c:if test="${not empty messages}">
-				Row <c:out value="${index+2}" />:
+				Row <c:out value="${index.index+2}" />:
 				<c:forEach items="${messages}" var="message">
 					<c:out value="${message}" /><br />
 				</c:forEach>
Index: lams_admin/web/includes/javascript/learningLibraryGroup.js
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -229,7 +229,7 @@
 		$.ajax({
 			'async'   : false,
 			'cache'   : false,
-			'url'     : '../toolcontentlist/saveLearningLibraryGroups.do',
+			'url'     : 'saveLearningLibraryGroups.do',
 			'data'    : {
 				'groups' : JSON.stringify(groups)
 			},
Index: lams_admin/web/ldap.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -5,6 +5,14 @@
 <%@ page import="org.lamsfoundation.lams.web.session.SessionManager" %>
 <%@ page import="org.lamsfoundation.lams.usermanagement.service.ILdapService" %>
 <c:set var="syncResult"><%= ILdapService.SYNC_RESULTS %></c:set>
+<script language="javascript" type="text/JavaScript">
+	<% if (SessionManager.getSession().getAttribute(ILdapService.SYNC_RESULTS) != null) { %>
+		document.location = 'results.do';
+	<% } %>
+	function startSync(){
+		document.location='sync.do';
+	}
+</script>
 
 <lams:html>
 <lams:head>
@@ -18,12 +26,6 @@
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
 	<script language="javascript" type="text/JavaScript">
-	<c:if test="${syncResult != null}">
-		document.location = '/ldap/results.do';
-	</c:if>
-	function startSync(){
-		document.location='/ldap/sync.do';
-	}
 </script>
 	
 </lams:head>
@@ -43,7 +45,7 @@
 				
 			<div class="panel-body panel-default">
 				<c:if test="${not empty config}">
-					<form:form action="save.do" modelAttribute="configForm" id="configForm" method="post">
+					<form:form action="../config/save.do" modelAttribute="configForm" id="configForm" method="post">
 						<c:forEach items="${config}" var="group">
 							<div class="panel panel-default">
 								<div class="panel-heading">
@@ -58,17 +60,17 @@
 												<c:if test="${row.required}">&nbsp;&nbsp;*</c:if>
 											</td>
 											<td>
-												<input type="hidden" name="key" value="${row.key}"/>
+												<form:hidden path="key" value="${row.key}"/>
 												<c:set var="BOOLEAN"><c:out value="<%= ConfigurationItem.BOOLEAN_FORMAT %>" /></c:set>
 												<c:choose>
 												<c:when test="${row.format==BOOLEAN}">
-													<form:select id="${row.key}" 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>
+													<select name="value" class="form-control form-control-sm">
+														<option value="true" ${row.value ? 'selected="selected"' : '' }>true</option>
+														<option value="false" ${row.value ? '' : 'selected="selected"' }>false&nbsp;&nbsp;</option>
+													</select>
 												</c:when>
 												<c:otherwise>
-													<input type="text" id="${row.key}" name="value" value="${row.value}" size="50" maxlength="255" class="form-control"/>
+													<form:input id="${row.key}" path="value" value="${row.value}" size="50" maxlength="255" cssClass="form-control"/>
 												</c:otherwise>
 												</c:choose>
 											</td>
@@ -80,7 +82,7 @@
 					
 						<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">
+							<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="admin.cancel"/></a>
 							<input type="submit" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 						</div>
 					</form:form>
@@ -105,7 +107,7 @@
 							<p><c:out value="${wait}"/></p>
 							<script language="javascript" type="text/javascript">
 								function refresh() {
-									document.location = 'ldap/waiting.do';
+									document.location = 'waiting.do';
 								}
 								window.setInterval("refresh()",5000);
 							</script>
@@ -139,7 +141,7 @@
 					</ul>
 			</c:if>
 						
-			<input class="btn btn-primary pull-right" value="<fmt:message key="label.synchronise" />" onclick='startSync();'/>
+			<input type="button" class="btn btn-primary pull-right" value="<fmt:message key="label.synchronise" />" onclick='startSync();'/>
 						
 			</div>
 		</div>				
Index: lams_admin/web/lti/ltiConsumer.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -57,7 +57,23 @@
 					</a>
 				</p>
 					
-				<form:errors path="*"/>
+				<c:set var="errorKey" value="${requiredField}" /> 
+						<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]}"> 
+						             <fmt:message key="sysadmin.${requiredField}" /> <c:out value="${error}" /><br /> 
+						         </c:forEach> 
+						     </lams:Alert> 
+						</c:if>
+						
+				<c:set var="errorKey" value="${uniqueField}" /> 		
+						<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]}"> 
+						            <fmt:message key="sysadmin.${uniqueField}" /> <c:out value="${error}" /><br /> 
+						         </c:forEach> 
+						     </lams:Alert> 
+						</c:if>
 				<br />
 				
 				<form:form action="save.do" id="ltiConsumerForm" modelAttribute="ltiConsumerForm" method="post">
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -58,29 +58,26 @@
 	
 	<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}">
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="extServerForm">
 				<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
-
 				
-				<c:set var="errorKey" value="${serverid || serverkey || servername || prefix || userinfoUrl}" /> 
+				<c:set var="errorKey" value="${requiredField}" /> 
 						<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 /> 
+						             <fmt:message key="sysadmin.${requiredField}" /> <c:out value="${error}" /><br /> 
 						         </c:forEach> 
 						     </lams:Alert> 
 						</c:if>
-				
 						
-				<c:set var="errorKey" value="${serverid || prefix}" /> 
+				<c:set var="errorKey" value="${uniqueField}" /> 		
 						<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 /> 
+						            <fmt:message key="sysadmin.${uniqueField}" /> <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" />
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -69,7 +69,7 @@
 		}
 
 		function submitForm(methodName) {
-			var f = document.getElementById("themeForm") += methodName + ".do";
+			var f = document.getElementById('themeForm');
 			f.submit();
 		}
 		
@@ -156,23 +156,23 @@
 							* <fmt:message key="admin.themes.name" />:
 						</td>
 						<td>
-							<input type="text" name="name" id="name" size="40" />
+							<form:input path="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" />
+							<form:input path="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" />
+							<form:input path="imageDirectory" id="imageDirectory" size="40" />
 						</td>
 					</tr>
 					<tr>
Index: lams_admin/web/toolcontent/learningLibraryGroup.jsp
===================================================================
diff -u -r9d51ed040508d8d5a10ee4033aded0c3784490a8 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision 9d51ed040508d8d5a10ee4033aded0c3784490a8)
+++ lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -8,11 +8,11 @@
 <lams:head>
 	<lams:css/>
 	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/learningLibraryGroup.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>admin/css/learningLibraryGroup.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/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/learningLibraryGroup.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>admin/includes/javascript/learningLibraryGroup.js"></script>
 	<script type="text/javascript">
 		var groups = ${groups},	
 			learningLibraries = ${learningLibraries},
@@ -32,33 +32,34 @@
 			};
 	</script>
 </lams:head>
-<body>
 
-	<div id="titleDiv">
-		<fmt:message key="tool.groups.dialog.instructions" />
-	</div>
+<body>
 	
-	<table id="groupsTable">
-		<tr>
-			<td id="learningLibraryCell">
-				<div class="learningLibraryContainer"></div>
-			</td>
-			<td id="groupsCell">
-				<div id="newGroupPlaceholder" class="groupContainer">
-					<div><fmt:message key="tool.groups.add.group.button" /></div>
-				</div>
-			</td>
-		</tr>
-	</table>
-	
-	<!-- A template which gets cloned when a group is added -->
-	<div id="groupTemplate" class="groupContainer">
-		<div class="learningLibraryContainerTitle">
-			<i class="removeGroupButton fa fa-times" src="<lams:LAMSURL/>images/css/delete.png"
-				 title="<fmt:message key='tool.groups.remove.group.button.tooltip' />"></i>
-			<input type="text" />
+		<div id="titleDiv">
+			<fmt:message key="tool.groups.dialog.instructions" />
 		</div>
-		<div class="learningLibraryContainer"></div>
-	</div>
+		
+		<table id="groupsTable">
+			<tr>
+				<td id="learningLibraryCell">
+					<div class="learningLibraryContainer"></div>
+				</td>
+				<td id="groupsCell">
+					<div id="newGroupPlaceholder" class="groupContainer">
+						<div><fmt:message key="tool.groups.add.group.button" /></div>
+					</div>
+				</td>
+			</tr>
+		</table>
+		
+		<!-- A template which gets cloned when a group is added -->
+		<div id="groupTemplate" class="groupContainer">
+			<div class="learningLibraryContainerTitle">
+				<i class="removeGroupButton fa fa-times" src="<lams:LAMSURL/>images/css/delete.png"
+					 title="<fmt:message key='tool.groups.remove.group.button.tooltip' />"></i>
+				<input type="text" />
+			</div>
+			<div class="learningLibraryContainer"></div>
+		</div>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -r472fb979e3afdb43a7d537e588c5204554ba9f38
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
@@ -9,9 +9,11 @@
 
 	<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">
+	<link rel="stylesheet" href="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" 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">
@@ -24,7 +26,7 @@
 				'height'   : 700,
 				'title'	   : '<fmt:message key="tool.groups.dialog.title" />',
 				'open' 	   : function(){
-					$('#toolGroupsFrame', this).attr('src', './openLearningLibraryGroups.do');
+					$('#toolGroupsFrame', this).attr('src', 'openLearningLibraryGroups.do');
 				},
 				'beforeClose'	   : function(){
 					$('#toolGroupsFrame', this).attr('src', null);
@@ -66,7 +68,7 @@
 					</p>
 					
 					<a href="javascript:openToolGroups()" class="btn btn-default pull-right" 
-					   title="<fmt:message key='tool.groups.open.button.tooltip' />"><fmt:message key="tool.groups.open.button" /></a>
+					   title="<fmt:message key='tool.groups.open.button.tooltip' />" ><fmt:message key="tool.groups.open.button" /></a>
 					<div id="toolGroupsDialog" style="display: none">
 						<a class="customDialogButton" href="javascript:saveToolGroups()" style="right: 50px;">
 							<fmt:message key="admin.save" />
@@ -109,10 +111,10 @@
 							<td>
 								<c:choose>
 									<c:when test="${learningLibraryValidity[dto.learningLibraryID]}">
-										[<a id="disable${dto.activityTitle}" href="../toolcontentlist/disableLibrary.do?libraryID=${dto.learningLibraryID}" ><fmt:message key="admin.disable" /></a>] 
+										[<a id="disable${dto.activityTitle}" href="<c:url value='disable.do?libraryID=${dto.learningLibraryID}' />" ><fmt:message key="admin.disable" /></a>] 
 									</c:when>
 									<c:otherwise>
-										[<a id="enable${dto.activityTitle}" href="../toolcontentlist/enableLibrary.do?libraryID=${dto.learningLibraryID}" ><fmt:message key="admin.enable" /></a>]
+										[<a id="enable${dto.activityTitle}" href="<c:url value='enable.do?libraryID=${dto.learningLibraryID}' />" ><fmt:message key="admin.enable" /></a>]
 										
 									</c:otherwise>
 								</c:choose>
@@ -123,7 +125,7 @@
 									[<a id="defaultContent${dto.activityTitle}" href="${editDefaultContentUrl}" target="_blank"><fmt:message key="sysadmin.edit.default.tool.content" /></a>]
 									<c:if test="${(displayToolManagement == 'true') and (dto.adminURL != null)}">
 										&nbsp;&nbsp;
-										[<a id="toolManagement${dto.activityTitle}" href="<lams:LAMSURL /><c:out value="${dto.adminURL}" />"><fmt:message key="msg.tool.management" /></a>]
+										[<a id="toolManagement${dto.activityTitle}" href="<lams:LAMSURL /><c:out value="${dto.adminURL}" />" ><fmt:message key="msg.tool.management" /></a>]
 									</c:if>
 								</c:if>
 							</td>