Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180729.sql
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180729.sql	(.../patch20180729.sql)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20180729.sql	(.../patch20180729.sql)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -10,7 +10,8 @@
 	learner_preview_url = 'tool/laqa11/learning/learning.do?mode=author',
 	learner_progress_url = 'tool/laqa11/learning/learning.do?mode=teacher',
 	monitor_url = 'tool/laqa11/monitoring/monitoring.do',
-	pedagogical_planner_url = 'tool/laqa11/pedagogicalPlanner/initPedagogicalPlannerForm.do'
+	pedagogical_planner_url = 'tool/laqa11/pedagogicalPlanner/initPedagogicalPlannerForm.do',
+	admin_url= 'tool/laqa11/admin/admin.do' 
 WHERE tool_signature = 'laqa11';
 
 ----------------------Put all sql statements above here-------------------------
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java	(.../QaAdminController.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java	(.../QaAdminController.java)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -65,7 +65,7 @@
  *
  */
 @Controller
-@RequestMapping("/laqa11admin")
+@RequestMapping("/admin")
 public class QaAdminController {
 
     private static Logger logger = Logger.getLogger(QaAdminController.class.getName());
@@ -85,7 +85,7 @@
     /**
      * Sets up the admin page
      */
-    @RequestMapping("/")
+    @RequestMapping("/admin")
     public String unspecified(QaAdminForm adminForm, HttpServletRequest request) {
 
 	QaConfigItem enableQaWizard = qaService.getConfigItem(QaConfigItem.KEY_ENABLE_QAWIZARD);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java	(.../QaMonitoringController.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java	(.../QaMonitoringController.java)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -68,6 +68,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
@@ -98,8 +99,8 @@
     }
 
     @RequestMapping("/monitoring")
-    private String execute(QaMonitoringForm qaMonitoringForm, HttpServletRequest request)
-	    throws IOException, ServletException, QaApplicationException {
+    private String execute(@ModelAttribute("qaMonitoringForm") QaMonitoringForm qaMonitoringForm,
+	    HttpServletRequest request) throws IOException, ServletException, QaApplicationException {
 	QaUtils.cleanUpSessionAbsolute(request);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
@@ -220,8 +221,8 @@
      * @return ActionForward
      * @throws ServletException
      */
-    protected String validateParameters(HttpServletRequest request, QaMonitoringForm qaMonitoringForm)
-	    throws ServletException {
+    protected String validateParameters(HttpServletRequest request,
+	    @ModelAttribute("qaMonitoringForm") QaMonitoringForm qaMonitoringForm) throws ServletException {
 
 	String strToolContentId = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -7,16 +7,16 @@
 	$(document).ready(function() {
 		
 		$("#useSelectLeaderToolOuput").click(function() {
-			if (document.forms.QaAuthoringForm.useSelectLeaderToolOuput.checked) {
+			if (document.forms.authoringForm.useSelectLeaderToolOuput.checked) {
 				//uncheck checkboxes
-				document.forms.QaAuthoringForm.showOtherAnswers.checked = false;
+				document.forms.authoringForm.showOtherAnswers.checked = false;
 				//disable checkboxes
-				document.forms.QaAuthoringForm.showOtherAnswers.disabled = true;
+				document.forms.authoringForm.showOtherAnswers.disabled = true;
 				
 				$("#show-other-answers-options").hide('slow');
 			} else {
 				//enable checkboxes
-				document.forms.QaAuthoringForm.showOtherAnswers.disabled = false;
+				document.forms.authoringForm.showOtherAnswers.disabled = false;
 			}	
 		});
 		
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -24,10 +24,7 @@
 	<script type="text/JavaScript">
 	  function submitMethod(actionMethod) {
 		   var form = document.forms.authoringForm;
-		   if (!form.dispatch) {
-		    form = form[0];
-		   }
-		   form.dispatch.value=actionMethod; 
+		   form.action=actionMethod+".do"; 
 		   form.submit();
 		  }
 		  
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
diff -u -r280d5dec6be0fb026eb13b77a507e454ac0219ba -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 280d5dec6be0fb026eb13b77a507e454ac0219ba)
+++ lams_tool_laqa/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -19,7 +19,7 @@
 	}
 	
 	function removeQuestion(questionIndex){
-		document.forms.QaAuthoringForm.questionIndex.value=questionIndex;
+		document.forms.authoringForm.questionIndex.value=questionIndex;
         submitMethod('removeQuestion');
 	}
 
Index: lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -36,7 +36,7 @@
   		function createQuestion(){
   			prepareFormData();
   			$('#pedagogicalPlannerForm').ajaxSubmit({
-  				url: "<c:url value='/pedagogicalPlanner.do?dispatch=createPedagogicalPlannerQuestion' />",
+  				url: "<c:url value='createPedagogicalPlannerQuestion.do' />",
   				success: function(responseText){
  	  				var bodyTag = '<body';
  	  				var selectedBody = responseText.substring(responseText.search(bodyTag) + 1);
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -93,8 +93,8 @@
 		
 		function doSubmit(actionMethod) {
 			$('.btn').prop('disabled', true);
-			document.forms.QaLearningForm.method.value=actionMethod; 
-			document.forms.QaLearningForm.submit();
+			document.forms.learningForm.action=actionMethod+".do"; 
+			document.forms.learningForm.submit();
 		}
 		
 		if (${!hasEditRight && mode != "teacher"}) {
@@ -105,8 +105,8 @@
 			
 	        $.ajax({
 	        	async: false,
-	            url: '<c:url value="../learning.do"/>',
-	            data: 'method=checkLeaderProgress&toolSessionID=' + $("#tool-session-id").val(),
+	            url: '<c:url value="checkLeaderProgress.do"/>',
+	            data: 'toolSessionID=' + $("#tool-session-id").val(),
 	            dataType: 'json',
 	            type: 'post',
 	            success: function (json) {
@@ -134,7 +134,7 @@
 					
 					//ajax form submit
 					$('#learningForm').ajaxSubmit({
-						url: "<c:url value='learning.do?method=autoSaveAnswers&date='/>" + new Date().getTime(),
+						url: "<c:url value='autoSaveAnswers.do?date='/>" + new Date().getTime(),
 			               success: function() {
 			               	$.growlUI('<i class="fa fa-lg fa-floppy-o"></i> <fmt:message key="label.learning.draft.autosaved" />');
 			               }
@@ -199,8 +199,8 @@
 <body class="stripes">
 
 	<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-	<form:form action="learning.do" enctype="multipart/form-data" method="POST" target="_self"
-		id="learningForm" modelAttribute="learningForm">
+	<form:form action="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential' ? 'getNextQuestion.do' : 'submitAnswersContent.do'}"
+	 method="POST" target="_self" id="learningForm" modelAttribute="learningForm">
 
 	<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
@@ -229,15 +229,6 @@
 		<!-- End advanced settings and notices -->
 
 
-			<c:choose>
-				<c:when test="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}">
-					<form:hidden path="method" value="getNextQuestion" />
-				</c:when>
-				<c:otherwise>
-					<form:hidden path="method" value="submitAnswersContent" />
-				</c:otherwise>
-			</c:choose>
-
 			<form:hidden path="toolSessionID" id="tool-session-id" />
 			<form:hidden path="userID" />
 			<form:hidden path="httpSessionID" />
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -82,6 +82,7 @@
 <c:if test="${hasEditRight}">
 	<div class="right-buttons">
 		<button name="btnCombined"
+			type="button"
 			onclick="javascript:submitMethod('submitAnswersContent');"
 			class="btn btn-default pull-right voffset5">
 			<fmt:message key="button.submitAllContent" />
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -13,16 +13,16 @@
 	<script language="JavaScript" type="text/JavaScript">
 		function submitMethod(actionMethod) {
 			$('.btn').prop('disabled', true);
-			document.forms.QaLearningForm.method.value = actionMethod;
-			document.forms.QaLearningForm.submit();
+			document.forms.qaLearningForm.action = actionMethod=".do";
+			document.forms.qaLearningForm.submit();
 		}
 	</script>
 </lams:head>
 
 <body class="stripes">
 
 	<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-	<form:form action="learning.do?validate=false" enmethod="POST" target="_self">
+	<form:form action="learning.do" method="POST" target="_self">
 
 		<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
@@ -123,14 +123,14 @@
 
 			<div class="voffset10">
 				<c:if test="${!generalLearnerFlowDTO.noReeditAllowed}">
-					<button name="redoQuestions" class="btn btn-default pull-left"
+					<button type="button" name="redoQuestions" class="btn btn-default pull-left"
 						onclick="submitMethod('redoQuestions');">
 						<fmt:message key="label.redo" />
 					</button>
 				</c:if>
 
 				<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
-					<button name="viewAllResults" onclick="submitMethod('storeAllResults');"
+					<button name="viewAllResults" type="button" onclick="submitMethod('storeAllResults');"
 						class="btn btn-default pull-right">
 						<fmt:message key="label.allResponses" />
 					</button>
@@ -139,7 +139,7 @@
 				<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
 					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 						<div class="space-bottom-top align-right">
-							<button type="submit" id="finishButton" 
+							<button type="button" id="finishButton" 
 								onclick="javascript:submitMethod('storeAllResults');return false" class="btn btn-primary pull-right na">
 								<c:choose>
 									<c:when test="${sessionMap.activityPosition.last}">
@@ -155,7 +155,7 @@
 					</c:if>
 
 					<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
-						<button name="forwardtoReflection" onclick="javascript:submitMethod('storeAllResults');"
+						<button name="forwardtoReflection" type="button" onclick="javascript:submitMethod('storeAllResults');"
 							class="btn btn-primary pull-right">
 							<fmt:message key="label.continue" />
 						</button>
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -48,7 +48,7 @@
 	<script src="${lams}includes/javascript/rating.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/bootstrap.min.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.tablesorter-widgets.js" type="text/javascript"></script>
-	<c:set var="localeLanguage"><lams:upatherty="localeLanguage" /></c:set>
+	<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 	<script src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/portrait.js" type="text/javascript" ></script>
 
@@ -83,7 +83,7 @@
 				      // {sortList:col} adds the sortList to the url into a "col" array, and {filterList:fcol} adds
 				      // the filterList to the url into an "fcol" array.
 				      // So a sortList = [[2,0],[3,0]] becomes "&col[2]=0&col[3]=0" in the url
-					ajaxUrl : "<c:url value='/learning.do'/>?method=getResponses&page={page}&size={size}&{sortList:column}&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $("#toolSessionID").val() + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
+					ajaxUrl : "<c:url value='getResponses.do'/>?page={page}&size={size}&{sortList:column}&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $("#toolSessionID").val() + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
 					ajaxProcessing: function (data) {
 				    	if (data && data.hasOwnProperty('rows')) {
 				    		var rows = [],
@@ -240,252 +240,236 @@
 	
 		function submitMethod(actionMethod) {
 			$('.btn').prop('disabled', true);
-			document.forms.QaLearningForm.method.value=actionMethod; 
-			document.forms.QaLearningForm.submit();
+			document.forms.qaLearningForm.action=actionMethod+".do"; 
+			document.forms.qaLearningForm.submit();
 		}
 	</script>
 </lams:head>
 
 <body class="stripes">
 
 	<!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-	<form:form action="learning.do" modelAttribute="qaLearningForm" method="POST" target="_self">
+	<form:form action="(${generalLearnerFlowDTO.requestLearningReportProgress != 'true'} ? (${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight} ? endLearning.do : forwardtoReflection) : learning.do" modelAttribute="qaLearningForm" method="POST" target="_self">
 
-	<lams:Page type="learner" title="${qaContent.title}">
-
-		<!-- Announcements and advanced settings -->
-
-		<c:if test="${not empty sessionMap.submissionDeadline}">
-			<lams:Alert id="submission-deadline" type="danger" close="false">
-				<fmt:message key="authoring.info.teacher.set.restriction">
-					<fmt:param>
-						<lams:Date value="${sessionMap.submissionDeadline}" />
-					</fmt:param>
-				</fmt:message>
-			</lams:Alert>
-		</c:if>
-
-		<!-- Rating limits info -->
-		<c:if test="${generalLearnerFlowDTO.allowRateAnswers && (qaContent.minimumRates ne 0 || qaContent.maximumRates ne 0)}">
-
-			<lams:Alert id="rating-info" type="info" close="true">
-				<c:choose>
-					<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder">
-							<fmt:param value="${qaContent.minimumRates}" />
-							<fmt:param value="${qaContent.maximumRates}" />
-						</fmt:message>
-					</c:when>
-
-					<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates eq 0}">
-						<fmt:message key="label.rate.limits.reminder.min">
-							<fmt:param value="${qaContent.minimumRates}" />
-						</fmt:message>
-					</c:when>
-
-					<c:when test="${qaContent.minimumRates eq 0 and qaContent.maximumRates ne 0}">
-						<fmt:message key="label.rate.limits.reminder.max">
-							<fmt:param value="${qaContent.maximumRates}" />
-						</fmt:message>
-					</c:when>
-				</c:choose>
-				<br>
-
-				<fmt:message key="label.rate.limits.topic.reminder">
-					<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>" />
-				</fmt:message>
-			</lams:Alert>
-		</c:if>
-		<!-- End Announcements and advanced settings -->
-
-		<c:if test="${isLeadershipEnabled}">
-			<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
-		</c:if>
-
-		<h4>
-			<fmt:message key="label.learnerReport" />
-		</h4>
-
-		<!-- Questions and answers -->
-		<c:forEach var="userResponse" items="${generalLearnerFlowDTO.userResponses}" varStatus="status">
-			<div class="row no-gutter">
-				<div class="col-xs-12">
-					<div class="panel panel-default">
-						<div class="panel-heading panel-title">
-							<fmt:message key="label.question" />
-							${status.count}:
-						</div>
-						<div class="panel-body">
-							<div class="panel">
-								<c:out value="${userResponse.qaQuestion.question}" escapeXml="false" />
+		<lams:Page type="learner" title="${qaContent.title}">
+	
+			<!-- Announcements and advanced settings -->
+	
+			<c:if test="${not empty sessionMap.submissionDeadline}">
+				<lams:Alert id="submission-deadline" type="danger" close="false">
+					<fmt:message key="authoring.info.teacher.set.restriction">
+						<fmt:param>
+							<lams:Date value="${sessionMap.submissionDeadline}" />
+						</fmt:param>
+					</fmt:message>
+				</lams:Alert>
+			</c:if>
+	
+			<!-- Rating limits info -->
+			<c:if test="${generalLearnerFlowDTO.allowRateAnswers && (qaContent.minimumRates ne 0 || qaContent.maximumRates ne 0)}">
+	
+				<lams:Alert id="rating-info" type="info" close="true">
+					<c:choose>
+						<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates ne 0}">
+							<fmt:message key="label.rate.limits.reminder">
+								<fmt:param value="${qaContent.minimumRates}" />
+								<fmt:param value="${qaContent.maximumRates}" />
+							</fmt:message>
+						</c:when>
+	
+						<c:when test="${qaContent.minimumRates ne 0 and qaContent.maximumRates eq 0}">
+							<fmt:message key="label.rate.limits.reminder.min">
+								<fmt:param value="${qaContent.minimumRates}" />
+							</fmt:message>
+						</c:when>
+	
+						<c:when test="${qaContent.minimumRates eq 0 and qaContent.maximumRates ne 0}">
+							<fmt:message key="label.rate.limits.reminder.max">
+								<fmt:param value="${qaContent.maximumRates}" />
+							</fmt:message>
+						</c:when>
+					</c:choose>
+					<br>
+	
+					<fmt:message key="label.rate.limits.topic.reminder">
+						<fmt:param value="<span id='count-rated-items'>${sessionMap.countRatedItems}</span>" />
+					</fmt:message>
+				</lams:Alert>
+			</c:if>
+			<!-- End Announcements and advanced settings -->
+	
+			<c:if test="${isLeadershipEnabled}">
+				<lams:LeaderDisplay idName="leader-enabled" username="${sessionMap.groupLeader.fullname}" userId="${sessionMap.groupLeader.queUsrId}"/>
+			</c:if>
+	
+			<h4>
+				<fmt:message key="label.learnerReport" />
+			</h4>
+	
+			<!-- Questions and answers -->
+			<c:forEach var="userResponse" items="${generalLearnerFlowDTO.userResponses}" varStatus="status">
+				<div class="row no-gutter">
+					<div class="col-xs-12">
+						<div class="panel panel-default">
+							<div class="panel-heading panel-title">
+								<fmt:message key="label.question" />
+								${status.count}:
 							</div>
-
-							<div class="row no-gutter">
-								<!-- split if ratings are on -->
-								<c:set var="splitRow" value="col-xs-12" />
-								<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
-									<c:set var="splitRow" value="col-xs-12 col-sm-9 col-md-10 col-lg-10" />
-								</c:if>
-								<div class="${splitRow}">
-									<div class="sbox">
-										<div class="sbox-heading bg-warning">
-											<div class="pull-left roffset5"><lams:Portrait userId="${userResponse.qaQueUser.queUsrId}"/></div>
-												<span><c:out value="${userResponse.qaQueUser.fullname}" /></span>
-												<br><span style="font-size: smaller"><lams:Date value="${userResponse.attemptTime}" timeago="true"/></span>
+							<div class="panel-body">
+								<div class="panel">
+									<c:out value="${userResponse.qaQuestion.question}" escapeXml="false" />
+								</div>
+	
+								<div class="row no-gutter">
+									<!-- split if ratings are on -->
+									<c:set var="splitRow" value="col-xs-12" />
+									<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
+										<c:set var="splitRow" value="col-xs-12 col-sm-9 col-md-10 col-lg-10" />
+									</c:if>
+									<div class="${splitRow}">
+										<div class="sbox">
+											<div class="sbox-heading bg-warning">
+												<div class="pull-left roffset5"><lams:Portrait userId="${userResponse.qaQueUser.queUsrId}"/></div>
+													<span><c:out value="${userResponse.qaQueUser.fullname}" /></span>
+													<br><span style="font-size: smaller"><lams:Date value="${userResponse.attemptTime}" timeago="true"/></span>
+											</div>
+											<div class="sbox-body">
+												<c:out value="${userResponse.answer}" escapeXml="false" />
+											</div>
 										</div>
-										<div class="sbox-body">
-											<c:out value="${userResponse.answer}" escapeXml="false" />
-										</div>
+	
 									</div>
-
+									<%--Rating area---------------------------------------%>
+									<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
+										<div class="col-xs-12 col-sm-3 col-md-2 col-lg-2">
+											<h4 class="text-center">
+												<fmt:message key="label.learning.rating" />
+											</h4>
+											<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
+												maxRates="${qaContent.maximumRates}" />
+										</div>
+									</c:if>
 								</div>
-								<%--Rating area---------------------------------------%>
-								<c:if test="${generalLearnerFlowDTO.allowRateAnswers}">
-									<div class="col-xs-12 col-sm-3 col-md-2 col-lg-2">
-										<h4 class="text-center">
-											<fmt:message key="label.learning.rating" />
-										</h4>
-										<lams:Rating itemRatingDto="${userResponse.itemRatingDto}" disabled="true" isItemAuthoredByUser="true"
-											maxRates="${qaContent.maximumRates}" />
-									</div>
-								</c:if>
 							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-		</c:forEach>
-		<!-- End questions and answers -->
-
-		<!-- Others questions -->
-
-		<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
-			<h4>
-				<fmt:message key="label.other.answers" />
-			</h4>
-
-			<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
-				<p>
-					<strong> <fmt:message key="label.question" /> ${status.count}:
-					</strong>
-					<c:out value="${question.question}" escapeXml="false" />
-				</p>
-
-				<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
-					<lams:Alert id="rating-info" type="info" close="false">
-						<fmt:message key="label.comment.minimum.number.words">
-							<fmt:param>: ${sessionMap.commentsMinWordsLimit}</fmt:param>
-						</fmt:message>
-					</lams:Alert>
-				</c:if>
-
-				<c:choose>
-					<c:when test="${isCommentsEnabled}">
-						<c:set var="numColumns" value="3" />
-					</c:when>
-					<c:when test="${!isCommentsEnabled and generalLearnerFlowDTO.allowRateAnswers}">
-						<c:set var="numColumns" value="2" />
-					</c:when>
-					<c:otherwise>
-						<c:set var="numColumns" value="1" />
-					</c:otherwise>
-				</c:choose>
-
-				<lams:TSTable numColumns="${numColumns}" dataId='data-question-uid="${question.uid}"'>
-					<thead>
-						<tr>
-							<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.learning.answer" /></th>
-							<c:choose>
-							<c:when test="${generalLearnerFlowDTO.allowRateAnswers}">
-								<th title="<fmt:message key='label.sort.by.rating'/>"><fmt:message key="label.learning.rating" /></th>
-							</c:when>
-							<c:otherwise>
-								<th style="display:none;"></th>
-							</c:otherwise>
-							</c:choose>
-							<c:if test="${isCommentsEnabled}">
-								<th><fmt:message key="label.comment" /></th>
-							</c:if>
-						</tr>
-					</thead>
-					<tbody>
-
-					</tbody>
-				</lams:TSTable>
-
 			</c:forEach>
-		</c:if>
-
-		<!-- End of others questions -->
-
-		<!-- buttons -->
-			<form:hidden path="toolSessionID" id="toolSessionID" />
-			<form:hidden path="userID" id="userID" />
-			<form:hidden path="httpSessionID" />
-			<form:hidden path="totalQuestionCount" />
-
-			<c:choose>
-				<c:when test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
+			<!-- End questions and answers -->
+	
+			<!-- Others questions -->
+	
+			<c:if test="${generalLearnerFlowDTO.showOtherAnswers}">
+				<h4>
+					<fmt:message key="label.other.answers" />
+				</h4>
+	
+				<c:forEach var="question" items="${generalLearnerFlowDTO.questions}" varStatus="status">
+					<p>
+						<strong> <fmt:message key="label.question" /> ${status.count}:
+						</strong>
+						<c:out value="${question.question}" escapeXml="false" />
+					</p>
+	
+					<c:if test="${isCommentsEnabled && sessionMap.commentsMinWordsLimit != 0}">
+						<lams:Alert id="rating-info" type="info" close="false">
+							<fmt:message key="label.comment.minimum.number.words">
+								<fmt:param>: ${sessionMap.commentsMinWordsLimit}</fmt:param>
+							</fmt:message>
+						</lams:Alert>
+					</c:if>
+	
 					<c:choose>
-						<c:when test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
-							<form:hidden path="method" value="endLearning" />
+						<c:when test="${isCommentsEnabled}">
+							<c:set var="numColumns" value="3" />
 						</c:when>
+						<c:when test="${!isCommentsEnabled and generalLearnerFlowDTO.allowRateAnswers}">
+							<c:set var="numColumns" value="2" />
+						</c:when>
 						<c:otherwise>
-							<form:hidden path="method" value="forwardtoReflection" />
+							<c:set var="numColumns" value="1" />
 						</c:otherwise>
 					</c:choose>
-				</c:when>
-
-				<c:otherwise>
-					<form:hidden path="method" />
-				</c:otherwise>
-			</c:choose>
-
-			<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
-				<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-
-					<div class="right-buttons voffset5" align="right" id="learner-submit">
-						<button name="refreshAnswers" class="btn btn-default voffset5 roffset5 pull-left"
-							onclick="submitMethod('refreshAllResults');">
-							<fmt:message key="label.refresh" />
-						</button>
-
-						<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
-							<button name="redoQuestions" class="btn btn-default voffset5  pull-left"
-								onclick="submitMethod('redoQuestions');">
-								<fmt:message key="label.redo" />
-							</button>
-						</c:if>
-
-
-						<c:if test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
-							<button type="submit" id="finishButton"
-								onclick="javascript:submitMethod('endLearning'); return false;" class="btn btn-primary pull-right na">
+	
+					<lams:TSTable numColumns="${numColumns}" dataId='data-question-uid="${question.uid}"'>
+						<thead>
+							<tr>
+								<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.learning.answer" /></th>
 								<c:choose>
-									<c:when test="${sessionMap.activityPosition.last}">
-										<fmt:message key="button.submit" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="button.endLearning" />
-									</c:otherwise>
+								<c:when test="${generalLearnerFlowDTO.allowRateAnswers}">
+									<th title="<fmt:message key='label.sort.by.rating'/>"><fmt:message key="label.learning.rating" /></th>
+								</c:when>
+								<c:otherwise>
+									<th style="display:none;"></th>
+								</c:otherwise>
 								</c:choose>
+								<c:if test="${isCommentsEnabled}">
+									<th><fmt:message key="label.comment" /></th>
+								</c:if>
+							</tr>
+						</thead>
+						<tbody>
+	
+						</tbody>
+					</lams:TSTable>
+	
+				</c:forEach>
+			</c:if>
+	
+			<!-- End of others questions -->
+	
+			<!-- buttons -->
+				<form:hidden path="toolSessionID" id="toolSessionID" />
+				<form:hidden path="userID" id="userID" />
+				<form:hidden path="httpSessionID" />
+				<form:hidden path="totalQuestionCount" />
+	
+	
+				<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
+					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
+	
+						<div class="right-buttons voffset5" align="right" id="learner-submit">
+							<button name="refreshAnswers" type="button" class="btn btn-default voffset5 roffset5 pull-left"
+								onclick="submitMethod('refreshAllResults');">
+								<fmt:message key="label.refresh" />
 							</button>
-						</c:if>
-
-						<c:if test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight}">
-							<button name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
-								class="btn btn-default">
-								<fmt:message key="label.continue" />
-							</button>
-						</c:if>
-					</div>
+	
+							<c:if test="${(generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
+								<button name="redoQuestions" type="button" class="btn btn-default voffset5  pull-left"
+									onclick="submitMethod('redoQuestions');">
+									<fmt:message key="label.redo" />
+								</button>
+							</c:if>
+	
+	
+							<c:if test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
+								<button type="button" id="finishButton"
+									onclick="javascript:submitMethod('endLearning'); return false;" class="btn btn-primary pull-right na">
+									<c:choose>
+										<c:when test="${sessionMap.activityPosition.last}">
+											<fmt:message key="button.submit" />
+										</c:when>
+										<c:otherwise>
+											<fmt:message key="button.endLearning" />
+										</c:otherwise>
+									</c:choose>
+								</button>
+							</c:if>
+	
+							<c:if test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight}">
+								<button type="button" name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
+									class="btn btn-default">
+									<fmt:message key="label.continue" />
+								</button>
+							</c:if>
+						</div>
+					</c:if>
 				</c:if>
-			</c:if>
+	
+			<div id="footer"></div>
+	
+		</lams:Page>
 
-		<div id="footer"></div>
-
-	</lams:Page>
-
 	</form:form>
 
 </body>
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -17,11 +17,10 @@
 <body class="stripes">
 
 <!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-<form:form action="/learning.do" modelAttribute="reflectionForm" id="dreflectionForm" onsubmit="disableFinishButton()">
+<form:form action="learning/submitReflection.do" modelAttribute="reflectionForm" id="dreflectionForm" onsubmit="disableFinishButton()">
 
 <lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
-		<form:hidden path="method" value="submitReflection"/>
 		<form:hidden path="toolSessionID" />
 		<form:hidden path="userID" />
 		<form:hidden path="httpSessionID" />
@@ -34,7 +33,7 @@
 			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control"></form:textarea>
 
 			
-				<button id="finishButton" class="btn btn-primary voffset5 pull-right na">
+				<button id="finishButton" type="button" class="btn btn-primary voffset5 pull-right na">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -76,7 +76,7 @@
 			$(".tablesorter").each(function() {
 				$(this).tablesorterPager({	
 					savePages: false,
-					ajaxUrl : "<c:url value='/learning.do'/>?method=getResponses&page={page}&size={size}&{sortList:column}&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $("#toolSessionID").val() + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
+					ajaxUrl : "<c:url value='getResponses.do'/>?{page}&size={size}&{sortList:column}&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $("#toolSessionID").val() + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
 					ajaxProcessing: function (data) {
 				    	if (data && data.hasOwnProperty('rows')) {
 				    		var rows = [],
@@ -234,8 +234,8 @@
 	
 		function submitMethod(actionMethod) {
 			$('.btn').prop('disabled', true);
-			document.QaLearningForm.method.value=actionMethod; 
-			document.QaLearningForm.submit();
+			document.learningForm.action=actionMethod+".do"; 
+			document.learningForm.submit();
 		}
 	</script>
 </lams:head>
@@ -351,7 +351,7 @@
 		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' 
 				&& (generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
 			<div style="overflow: hidden;">
-				<button name="redoQuestions" class="btn btn-default pull-left"
+				<button name="redoQuestions" type="button" class="btn btn-default pull-left"
 					onclick="submitMethod('redoQuestions');">
 					<fmt:message key="label.redo" />
 				</button>
@@ -427,14 +427,14 @@
 						</div>
 						<div class="panel-body">
 							<div class="reflectionInstructions">
-								<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
+								<lams:out value="${learningForm.reflectionSubject}" escapeHtml="true" />
 							</div>
 							<div class="panel">
-								<lams:out value="${QaLearningForm.entryText}" escapeHtml="true" />
+								<lams:out value="${learningForm.entryText}" escapeHtml="true" />
 							</div>
 
 							<c:if test="${hasEditRight}">
-								<button name="forwardtoReflection" class="btn btn-default pull-left"
+								<button name="forwardtoReflection" type="button" class="btn btn-default pull-left"
 									onclick="submitMethod('forwardtoReflection');">
 									<fmt:message key="label.edit" />
 								</button>
@@ -465,8 +465,7 @@
 			</div>
 		</c:if>
 
-		<form:form action="/learning.do" method="POST" target="_self">
-			<form:hidden path="method" />
+		<form:form action="learning.do" method="POST" target="_self">
 			<form:hidden path="toolSessionID" id="toolSessionID" />
 			<form:hidden path="userID" id="userID" />
 			<form:hidden path="httpSessionID" />
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -65,14 +65,14 @@
 			test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
 				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }">
 
-			<button id="btnGetPrevious" onclick="javascript:submitMethod('getPreviousQuestion');"
+			<button id="btnGetPrevious" type="button" onclick="javascript:submitMethod('getPreviousQuestion');"
 				class="btn btn-sm btn-default voffset10">
 				<i class="fa fa-arrow-left"></i>
 				<fmt:message key="button.getPreviousQuestion" />
 			</button>
 
 			<div align="right-buttons">
-				<button id="btnDone" onclick="javascript:submitMethod('submitAnswersContent');"
+				<button id="btnDone" type="button" onclick="javascript:submitMethod('submitAnswersContent');"
 					class="btn btn-primary voffset10 pull-right">
 					<fmt:message key="button.done" />
 				</button>
@@ -84,7 +84,7 @@
 			test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
 				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }">
 			<div align="right-buttons">
-				<button id="btnDone" onclick="javascript:submitMethod('submitAnswersContent');"
+				<button id="btnDone" type="button" onclick="javascript:submitMethod('submitAnswersContent');"
 					class="btn btn-primary pull-right voffset10">
 					<fmt:message key="button.done" />
 				</button>
@@ -96,12 +96,12 @@
 			test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
 				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}">
 
-			<button id="btnGetPrevious" onclick="javascript:submitMethod('getPreviousQuestion');"
+			<button id="btnGetPrevious" type="button" onclick="javascript:submitMethod('getPreviousQuestion');"
 				class="btn btn-sm btn-default voffset10">
 				<i class="fa fa-arrow-left"></i>&nbsp;
 				<fmt:message key="button.getPreviousQuestion" />
 			</button>
-			<button id="btnGetNext" onclick="javascript:submitMethod('getNextQuestion');"
+			<button id="btnGetNext" type="button" onclick="javascript:submitMethod('getNextQuestion');"
 				class="btn btn-sm btn-default voffset10 pull-right">
 				<fmt:message key="button.getNextQuestion" />
 				&nbsp; <i class="fa fa-arrow-right"></i>
@@ -110,7 +110,7 @@
 		</c:when>
 
 		<c:otherwise>
-			<button id="btnGetNext" onclick="javascript:submitMethod('getNextQuestion');"
+			<button id="btnGetNext" type="button" onclick="javascript:submitMethod('getNextQuestion');"
 				class="btn btn-sm btn-default voffset10 pull-right">
 				<fmt:message key="button.getNextQuestion" />
 				&nbsp; <i class="fa fa-arrow-right"></i>
Index: lams_tool_laqa/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -15,8 +15,8 @@
 			if (actionMethod == 'endLearning') {
 				document.getElementById("finishButton").disabled = true;
 			}
-			document.QaLearningForm.method.value = actionMethod;
-			document.QaLearningForm.submit();
+			document.forms.form.action = actionMethod+".do";
+			document.forms.form.submit();
 		}
 
 		function submitMethod(actionMethod) {
@@ -32,8 +32,7 @@
 
 	<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
-		<form:form action="/learning.do" method="POST" modelAttribute="form" id="form">
-			<form:hidden property="method" />
+		<form:form action="learning.do" method="POST" modelAttribute="form" id="form">
 			<form:hidden property="toolSessionID" />
 			<form:hidden property="userID" />
 			<form:hidden property="httpSessionID" />
@@ -66,7 +65,7 @@
 				</c:if>
 
 				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
-					<button name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
+					<button name="forwardtoReflection" type="button" onclick="javascript:submitMethod('forwardtoReflection');"
 						class="btn btn-primary pull-right">
 						<fmt:message key="label.continue" />
 					</button>
Index: lams_tool_laqa/web/monitoring/Edit.jsp
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -23,8 +23,8 @@
 
 <c:url value="/authoring/authoring.do" var="authoringUrl">
 	<c:param name="mode" value="teacher" />
-	<c:param name="toolContentID" value="${authoringForm.toolContentID}" />
-	<c:param name="contentFolderID" value="${authoringForm.contentFolderID}" />
+	<c:param name="toolContentID" value="${qaMonitoringForm.toolContentID}" />
+	<c:param name="contentFolderID" value="${qaMonitoringForm.contentFolderID}" />
 </c:url>
 <a href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" class="btn btn-default pull-right">
 	<fmt:message key="label.edit" />
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -11,7 +11,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-<c:set var="localeLanguage"><lams:user name="localeLanguage" /></c:set>
+<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
 
 <lams:html>
 	<lams:head>
@@ -48,7 +48,7 @@
 			lams: '${lams}',
 			submissionDeadline: '${submissionDeadline}',
 			submissionDateString: '${submissionDateString}',
-			setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+			setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
 			toolContentID: '${content.qaContentId}',
 			messageNotification: '<fmt:message key="monitor.summary.notification" />',
 			messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
@@ -117,7 +117,7 @@
 	                cssPageDisplay: '.pagedisplay',
 	                cssPageSize: '.pagesize',
 	                cssDisabled: 'disabled',
-					ajaxUrl : "<c:url value='/learning.do'/>?method=getResponses&page={page}&size={size}&{sortList:column}&{filterList:fcol}&isMonitoring=true&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&isOnlyLeadersIncluded=${qaContent.useSelectLeaderToolOuput}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $(this).attr('data-session-id') + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
+					ajaxUrl : "<c:url value='learning/learning.do'/>?getResponses&page={page}&size={size}&{sortList:column}&{filterList:fcol}&isMonitoring=true&isAllowRateAnswers=${qaContent.allowRateAnswers}&isAllowRichEditor=${qaContent.allowRichEditor}&isOnlyLeadersIncluded=${qaContent.useSelectLeaderToolOuput}&qaContentId=${qaContent.qaContentId}&qaSessionId=" + $(this).attr('data-session-id') + "&questionUid=" + $(this).attr('data-question-uid') + "&userId=" + $("#userID").val() + "&reqID=" + (new Date()).getTime(),
 					ajaxProcessing: function (data) {
 				    	if (data && data.hasOwnProperty('rows')) {
 				    		var rows = [],
@@ -268,9 +268,8 @@
 						
 				        $.ajax({
 				        	async: false,
-				            url: '<c:url value="/monitoring.do"/>',
+				            url: '<c:url value="updateResponse.do"/>',
 				            data: {
-				            	dispatch: "updateResponse",
 				            	responseUid: responseUid,
 				            	updatedResponse: updatedResponse
 				            },
@@ -291,8 +290,7 @@
 	  	
 		function changeResponseVisibility(linkObject, responseUid, isHideItem) {
 	        $.ajax({
-	            url: '<c:url value="/monitoring.do"/>',
-	            data: 'dispatch=updateResponseVisibility&responseUid=' + responseUid + '&isHideItem=' + isHideItem,
+	            url: '<c:url value="monitoring.do"/>?updateResponseVisibility&responseUid=' + responseUid + '&isHideItem=' + isHideItem,
 	            dataType: 'json',
 	            type: 'post',
 	            success: function (json) {
@@ -327,16 +325,16 @@
 		}
 	  	
 		function submitMonitoringMethod(actionMethod) {
-			document.QaMonitoringForm.dispatch.value=actionMethod; 
-			document.QaMonitoringForm.submit();
+			document.forms.qaMonitoringForm.action=actionMethod+".do"; 
+			document.forms.qaMonitoringForm.submit();
 		}
 		
 		function submitMethod(actionMethod) {
 			submitMonitoringMethod(actionMethod);
 		}
 
 		function submitModifyMonitoringQuestion(questionIndexValue, actionMethod) {
-			document.QaMonitoringForm.questionIndex.value=questionIndexValue; 
+			document.forms.qaMonitoringForm.questionIndex.value=questionIndexValue; 
 			submitMethod(actionMethod);
 		}
 
@@ -349,7 +347,7 @@
 </lams:head>
 <body class="stripes">
 
-<form:form action="/monitoring.do" method="POST" >
+<form:form action="monitoring.do" method="POST" modelAttribute="qaMonitoringForm" >
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	
 	<form:hidden path="currentUid"/>
Index: lams_tool_laqa/web/monitoring/Reflections.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -56,7 +56,7 @@
 		                cssPageDisplay: '.pagedisplay',
 		                cssPageSize: '.pagesize',
 		                cssDisabled: 'disabled',
-						ajaxUrl : "<lams:WebAppURL/>monitoring.do?dispatch=getReflectionsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolSessionID=" + $(this).attr('data-session-id'),
+						ajaxUrl : "<lams:WebAppURL/>monitoring/getReflectionsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolSessionID=" + $(this).attr('data-session-id'),
 						ajaxProcessing: function (data, table) {
 							if (data && data.hasOwnProperty('rows')) {
 					    		var rows = [],
Index: lams_tool_laqa/web/monitoring/dateRestriction.jsp
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r7ea9b852e5fe8dc5688f983f162064d862f147de
--- lams_tool_laqa/web/monitoring/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/monitoring/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
@@ -25,7 +25,7 @@
 		}
 		
 		$.ajax({
-			url : '<c:url value="/monitoring.do?dispatch=setShowOtherAnswersAfterDeadline"/>',
+			url : '<c:url value="setShowOtherAnswersAfterDeadline.do"/>',
 			async: false,
 			data: {
 				toolContentID:'${content.qaContentId}',