Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,8 +32,8 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_admin/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
@@ -435,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_admin/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_admin/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -285,7 +285,7 @@
 						<fmt:message key="${minimumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							class="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
 						</form:option>
@@ -305,7 +305,7 @@
 						<fmt:message key="${maximumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							class="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
 						</form:option>
Index: lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,8 +32,8 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
Index: lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_gradebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
Index: lams_gradebook/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -57,7 +57,7 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -143,7 +143,7 @@
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook/lessonID.do?lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
Index: lams_gradebook/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_gradebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_gradebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_learning/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_learning/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -57,7 +57,7 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,8 +32,8 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
Index: lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_monitoring/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_monitoring/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
@@ -435,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_monitoring/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_monitoring/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -re962cd60c6fc58a68e93516844801045ed956870 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_monitoring/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision e962cd60c6fc58a68e93516844801045ed956870)
+++ lams_monitoring/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -122,10 +123,10 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<a href="javascript:doSubmit_Form_Only();" id="saveButton" property="submit" class="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</a>
-		<a href="javascript:;" property="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</a>
 </div>
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -283,42 +284,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<select property="${formContentPrefix}minimumRates" idd="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							class="form-control form-control-inline">
-						<option value="0">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-						<option value="7">7</option>
-						<option value="8">8</option>
-						<option value="9">9</option>
-						<option value="10">10</option>
-					</select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<select property="${formContentPrefix}maximumRates" idd="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							class="form-control form-control-inline">
-						<option value="0">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-						<option value="7">7</option>
-						<option value="8">8</option>
-						<option value="9">9</option>
-						<option value="10">10</option>
-					</select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,8 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
@@ -50,13 +51,13 @@
 
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_assessment/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r4353f26f9509808acdf41d0deef6cf5fd458a2b7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 4353f26f9509808acdf41d0deef6cf5fd458a2b7)
+++ lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,8 +32,8 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_chat/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -284,7 +285,7 @@
 						<fmt:message key="${minimumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
 						</form:option>
Index: lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -56,7 +57,7 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_daco/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -54,7 +54,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,37 +284,41 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</form:option>
 						<form:option value="1">1</form:option>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
-						<form:option value="1" label="1"/>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				</div>
 			</c:if>
Index: lams_tool_forum/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_forum/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,5 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_forum/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_forum/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -re062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision e062c5aeec4bd7e7f970ae5e907e8a7e59edaeaf)
+++ lams_tool_forum/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,37 +284,41 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</form:option>
 						<form:option value="1">1</form:option>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
-						<form:option value="1" label="1"/>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				</div>
 			</c:if>
Index: lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_images/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -138,12 +138,12 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -245,9 +245,8 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : LEARNING_URL + 'learner.do',
+						url : LEARNING_URL + 'learner/getLessonDetails.do',
 						data : {
-							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
 							'toolSessionID' : toolSessionId,
 						},
@@ -435,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_images/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -56,7 +57,7 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_imscc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -56,7 +57,7 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_kaltura/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_kaltura/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_kaltura/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -0,0 +1,150 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
+					'data': $.extend({
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
+			'data': {
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_kaltura/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_kaltura/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rff911101cbe92d6813691c20c292fa04519820b4 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision ff911101cbe92d6813691c20c292fa04519820b4)
+++ lams_tool_kaltura/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -42,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -55,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_lamc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -285,7 +285,7 @@
 						<fmt:message key="${minimumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							class="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
 						</form:option>
@@ -305,7 +305,7 @@
 						<fmt:message key="${maximumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							class="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
 						</form:option>
Index: lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -51,13 +51,13 @@
 
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -283,42 +284,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
+++ lams_tool_larsrc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -41,23 +42,23 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
+	<form:checkbox path="${allowAnonymousVariableName}" 
 		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_larsrc/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
+++ lams_tool_larsrc/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -ra5f1ca1dd020bb422c0a23bc69bdb18ec372696e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision a5f1ca1dd020bb422c0a23bc69bdb18ec372696e)
+++ lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -122,7 +123,7 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<a href="javascript:doSubmit_Form_Only();" id="saveButton" property="submit" class="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</a>
 		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -283,8 +284,8 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<form:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
 						</form:option>
@@ -303,8 +304,8 @@
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<form:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
 						</form:option>
Index: lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -42,16 +43,16 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
+		id="${allowCommentsVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_leader/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_leader/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_leader/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,37 +284,41 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</form:option>
 						<form:option value="1">1</form:option>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
-						<form:option value="1" label="1"/>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				</div>
 			</c:if>
Index: lams_tool_mindmap/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_mindmap/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_mindmap/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rebe9a494826fab1aebb345e6801ad512abb52416 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision ebe9a494826fab1aebb345e6801ad512abb52416)
+++ lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,8 +32,8 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
 <%@ attribute name="toolSignature" required="true" rtexprvalue="true" %>
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_nb/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_nb/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_nb/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_nb/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -122,10 +123,10 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<a href="javascript:doSubmit_Form_Only();" id="saveButton" property="submit" class="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</a>
-		<a href="javascript:;" property="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</a>
 </div>
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -283,42 +284,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<select property="${formContentPrefix}minimumRates" idd="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							class="form-control form-control-inline">
-						<option value="0">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-						<option value="7">7</option>
-						<option value="8">8</option>
-						<option value="9">9</option>
-						<option value="10">10</option>
-					</select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<select property="${formContentPrefix}maximumRates" idd="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							class="form-control form-control-inline">
-						<option value="0">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-						<option value="7">7</option>
-						<option value="8">8</option>
-						<option value="9">9</option>
-						<option value="10">10</option>
-					</select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,8 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
@@ -50,13 +51,13 @@
 
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_notebook/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
Index: lams_tool_pixlr/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_pixlr/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -50,13 +51,13 @@
 
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_pixlr/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_pixlr/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rb7b682644cd1d20e061092b1411eeb679a1f9fb2 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision b7b682644cd1d20e061092b1411eeb679a1f9fb2)
+++ lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rb67bc25f161fa3bf350e4c89696c24620674c8ef -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
+++ lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -54,7 +54,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
Index: lams_tool_sbmt/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_sbmt/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_sbmt/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -125,7 +126,7 @@
 		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</a>
-		<a href="javascript:;" nname="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</a>
 </div>
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -284,7 +285,7 @@
 						<fmt:message key="${minimumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
 						</form:option>
@@ -304,7 +305,7 @@
 						<fmt:message key="${maximumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
 						</form:option>
Index: lams_tool_scratchie/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -56,7 +57,7 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_scratchie/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rb18aa49cea9cab29bda065b37ee720bfa0a4ef6f -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision b18aa49cea9cab29bda065b37ee720bfa0a4ef6f)
+++ lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
Index: lams_tool_scribe/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_scribe/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -42,7 +42,7 @@
 
 <div class="checkbox">
 	<label>
-	<form:checkbox path="${allowCommentsVariableName}" value="true"
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
 		id="${allowCommentsVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
@@ -51,13 +51,13 @@
 
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_scribe/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_scribe/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,37 +284,41 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</form:option>
 						<form:option value="1">1</form:option>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
-						<form:option value="1" label="1"/>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				</div>
 			</c:if>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r977c1d91def623ad1c8d5adffb4b32c810ef1dc6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 977c1d91def623ad1c8d5adffb4b32c810ef1dc6)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -122,10 +123,10 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<a href="javascript:doSubmit_Form_Only();" id="saveButton" property="submit" class="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</a>
-		<a href="javascript:;" property="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</a>
 </div>
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -283,42 +284,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<select property="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							class="form-control form-control-inline">
-						<option value="0">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-						<option value="7">7</option>
-						<option value="8">8</option>
-						<option value="9">9</option>
-						<option value="10">10</option>
-					</select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<select property="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							class="form-control form-control-inline">
-						<option value="0">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							cssClass="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</option>
-						<option value="1">1</option>
-						<option value="2">2</option>
-						<option value="3">3</option>
-						<option value="4">4</option>
-						<option value="5">5</option>
-						<option value="6">6</option>
-						<option value="7">7</option>
-						<option value="8">8</option>
-						<option value="9">9</option>
-						<option value="10">10</option>
-					</select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_survey/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,4 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -50,13 +51,13 @@
 
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}">
+		styleId="${allowAnonymousVariableName}">
 	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
Index: lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rb67bc25f161fa3bf350e4c89696c24620674c8ef -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r417b301a93d0e3b232370eef325b15a0642a8f8c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 417b301a93d0e3b232370eef325b15a0642a8f8c)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_survey/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_survey/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_survey/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -35,7 +35,6 @@
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 
-
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
 	<c:set var="class">active</c:set>
Index: lams_tool_survey/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_survey/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_survey/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -31,7 +31,6 @@
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
 
-
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
 </div>
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,10 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
-
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
Index: lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -39,6 +39,7 @@
 </c:if>
 
 <lams:SimplePanel titleKey="advanced.comment.header">
+
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
@@ -47,15 +48,17 @@
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
+
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rb67bc25f161fa3bf350e4c89696c24620674c8ef -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
+++ lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_task/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_task/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_task/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,10 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
-
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
Index: lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -39,6 +39,7 @@
 </c:if>
 
 <lams:SimplePanel titleKey="advanced.comment.header">
+
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
@@ -47,16 +48,17 @@
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
+
 <div id="likedislike">
 <div class="loffset20">
-		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
+	<form:checkbox path="${allowAnonymousVariableName}" 
 		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_vote/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_vote/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_vote/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_vote/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_vote/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<form:hidden path="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<form:input size="40" path="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<form:input size="40" path="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<form:input size="40" path="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<form:input size="40" path="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r169ce779d0f88147f00cffb353f45f595b8c1a7c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 169ce779d0f88147f00cffb353f45f595b8c1a7c)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -32,6 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r169ce779d0f88147f00cffb353f45f595b8c1a7c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 169ce779d0f88147f00cffb353f45f595b8c1a7c)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r169ce779d0f88147f00cffb353f45f595b8c1a7c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 169ce779d0f88147f00cffb353f45f595b8c1a7c)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,37 +284,41 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" multiple="multiple" onmouseup="validateRatingLimits(true);" 
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMinimumLabel}' /></form:option>
+						<form:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</form:option>
 						<form:option value="1">1</form:option>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" multiple="multiple" onmouseup="validateRatingLimits(false);" 
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
 							cssClass="form-control form-control-inline">
-						<form:option value="0"><fmt:message key='${noMaximumLabel}' /></form:option>
-						<form:option value="1" label="1"/>
-						<form:option value="2" label="2"/>
-						<form:option value="3" label="3"/>
-						<form:option value="4" label="4"/>
-						<form:option value="5" label="5"/>
-						<form:option value="6" label="6"/>
-						<form:option value="7" label="7"/>
-						<form:option value="8" label="8"/>
-						<form:option value="9" label="9"/>
-						<form:option value="10" label="10"/>
+						<form:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
 					</form:select>
 				</div>
 			</c:if>
Index: lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -43,7 +43,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowCommentsVariableName}" value="1"
-		id="${allowCommentsVariableName}"/>
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
@@ -56,7 +57,8 @@
 <div class="checkbox">
 	<label>
 	<form:checkbox path="${allowAnonymousVariableName}" 
-		id="${allowAnonymousVariableName}"/>
+		styleId="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -434,4 +434,4 @@
 		</div>
 		</div>
 	</c:otherwise>
-</c:choose>
\ No newline at end of file
+</c:choose>
Index: lams_tool_wiki/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r169ce779d0f88147f00cffb353f45f595b8c1a7c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 169ce779d0f88147f00cffb353f45f595b8c1a7c)
+++ lams_tool_wiki/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r169ce779d0f88147f00cffb353f45f595b8c1a7c -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 169ce779d0f88147f00cffb353f45f595b8c1a7c)
+++ lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,6 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -285,7 +285,7 @@
 						<fmt:message key="${minimumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							class="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
 						</form:option>
@@ -305,7 +305,7 @@
 						<fmt:message key="${maximumLabel}" />
 					</label>
 					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							class="form-control form-control-inline">
+							cssClass="form-control form-control-inline">
 						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
 						</form:option>
Index: lams_www/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r4b717d41f12b0538fb1c04e86a0b389aa2eecc03 -r1abddf98cd1cef4c2bd78bedfa702e0908932ccd
--- lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 4b717d41f12b0538fb1c04e86a0b389aa2eecc03)
+++ lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 1abddf98cd1cef4c2bd78bedfa702e0908932ccd)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -54,7 +53,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -69,9 +68,8 @@
 			'select' : function(event, ui){
 				var input = $(this);
 				$.ajax({
-					'url' : '<lams:LAMSURL/>outcome.do',
+					'url' : '<lams:LAMSURL/>outcome/outcomeMap',
 					'data': $.extend({
-						'method' : 'outcomeMap',
 						'outcomeId' : ui.item.value
 					}, outcomeData${outcomeTagId}),
 					'method' : 'post',
@@ -95,10 +93,8 @@
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
 		$.ajax({
-			'url' 	   : '<lams:LAMSURL/>outcome.do',
-			'data'	   : $.extend({
-							'method' : 'outcomeGetMappings'
-						 }, outcomeData${outcomeTagId}),
+			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
+			'data'	   : outcomeData${outcomeTagId},
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -130,9 +126,8 @@
 	 */
 	function removeOutcomeMapping(button) {
 		$.ajax({
-			'url' : '<lams:LAMSURL/>outcome.do',
+			'url' : '<lams:LAMSURL/>outcome/outcomeRemoveMapping.do',
 			'data': {
-					'method' 	: 'outcomeRemoveMapping',
 					'mappingId' :  $(button).attr('mappingId')
 				}, 
 			'cache' : false,