Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql
===================================================================
diff -u -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d -r365254f26a6f430e051f6ff117c8f01e224320ac
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql	(.../patch20180724.sql)	(revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql	(.../patch20180724.sql)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
@@ -6,9 +6,9 @@
 -- LDEV-4440 Change tool access URLs after migration to Spring MVC
 UPDATE lams_tool SET 
 	author_url = 'tool/lamc11/authoring/authoring.do',
-	learner_url = 'tool/lamc11/learning/learner.do',
-	learner_preview_url = 'tool/lamc11/learning/author.do',
-	learner_progress_url = 'tool/lamc11/learning/teacher.do',
+	learner_url = 'tool/lamc11/learning/learning.do?mode=learner',
+	learner_preview_url = 'tool/lamc11/learning/learning.do?mode=author',
+	learner_progress_url = 'tool/lamc11/learning/learning.do?mode=teacher',
 	monitor_url = 'tool/lamc11/monitoring/monitoring.do',
 	pedagogical_planner_url = 'tool/lamc11/pedagogicalPlanner/initPedagogicalPlannerForm.do'
 WHERE tool_signature = 'lamc11';
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
===================================================================
diff -u -rd25e9265466c2a19b39850104b8db9a0332ab2f5 -r365254f26a6f430e051f6ff117c8f01e224320ac
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision d25e9265466c2a19b39850104b8db9a0332ab2f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
@@ -96,7 +96,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/learner")
+    @RequestMapping("/learning")
     public String execute(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
 
 	mcLearningForm.setMcService(mcService);
@@ -278,13 +278,13 @@
 	    nextUrl = mcService.leaveToolSession(new Long(toolSessionID), userDto.getUserID().longValue());
 	} catch (DataMissingException e) {
 	    McLearningController.logger.error("failure getting nextUrl: " + e);
-	    return "learningIndex";
+	    return "learning/AnswersContent";
 	} catch (ToolException e) {
 	    McLearningController.logger.error("failure getting nextUrl: " + e);
-	    return "learningIndex";
+	    return "learning/AnswersContent";
 	} catch (Exception e) {
 	    McLearningController.logger.error("unknown exception getting nextUrl: " + e);
-	    return "learningIndex";
+	    return "learning/AnswersContent";
 	}
 
 	response.sendRedirect(nextUrl);
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r5cc2f28c0fd508cf034496ad94d4892c373431f1 -r365254f26a6f430e051f6ff117c8f01e224320ac
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
@@ -24,7 +24,7 @@
 	};
         
     function importQTI(){
-    	window.open('<lams:LAMSURL/>questions/questionFile.jsp?limitType=mc',
+    	window.open('<lams:LAMSURL />questions/questionFile.jsp?limitType=mc',
     			    'QuestionFile','width=500,height=240,scrollbars=yes');
     }
 	
@@ -45,7 +45,7 @@
     function exportQTI() {
     	var frame = document.getElementById("downloadFileDummyIframe"),
     		title = encodeURIComponent(document.getElementsByName("title")[0].value);
-    	frame.src = '<lams:WebAppURL />authoring/exportQTI.do?sessionMapId=${sessionMapId}" />'
+    	frame.src = '<lams:WebAppURL />authoring/exportQTI.do?sessionMapId=${sessionMapId}'
     			+ '&title=' + title;
     }
 </script>
Index: lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r365254f26a6f430e051f6ff117c8f01e224320ac
--- lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
@@ -108,7 +108,7 @@
 		<input type="hidden" id="questionCount" value="${plannerForm.questionCount}" />
 		
 		<table id="questionTable" cellpadding="0" cellspacing="0">
-			<c:forEach var="questionIndex"  begin="1" end="${formBean.questionCount}">
+			<c:forEach var="questionIndex"  begin="1" end="${plannerForm.questionCount}">
 				<tr>
 					<td class="FCKcell">
 						<lams:CKEditor id="question[${questionIndex-1}]"
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -ra1ccd73a7050b1e2466b6c2d867a174696cb2bf0 -r365254f26a6f430e051f6ff117c8f01e224320ac
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision a1ccd73a7050b1e2466b6c2d867a174696cb2bf0)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
@@ -3,7 +3,6 @@
 <c:set var="lams"><lams:LAMSURL /></c:set>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" scope="request" />
 <c:set var="isUserLeader" value="${sessionMap.isUserLeader}" scope="request" />
-<c:set var="mode" value="${sessionMap.mode}" />
 <c:set var="mode" value="${sessionMap.mode}" scope="request" />
 <c:set var="isLeadershipEnabled" value="${sessionMap.content.useSelectLeaderToolOuput}" scope="request" />
 <c:set var="isPrefixAnswersWithLetters" value="${sessionMap.content.prefixAnswersWithLetters}" scope="request" />
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r365254f26a6f430e051f6ff117c8f01e224320ac
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
@@ -295,12 +295,12 @@
 
 		<!--  now really start the form -->
 		<div class="form-group">
-				<form:hidden property="toolContentID" />
-				<form:hidden property="toolSessionID" />
-				<form:hidden property="httpSessionID" />
-				<form:hidden property="userID" />
-				<form:hidden property="userOverPassMark" />
-				<form:hidden property="passMarkApplicable" />
+				<form:hidden path="toolContentID" />
+				<form:hidden path="toolSessionID" />
+				<form:hidden path="httpSessionID" />
+				<form:hidden path="userID" />
+				<form:hidden path="userOverPassMark" />
+				<form:hidden path="passMarkApplicable" />
 
 				<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight}">
 					<input type="submit" name="redoQuestions" class="btn btn-primary pull-left">
@@ -312,7 +312,7 @@
 						|| (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
 					<div class="voffset5">
 						<c:if test="${(mcGeneralLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
-							<form:hidden property="learnerFinished" value="Finished" />
+							<form:hidden path="learnerFinished" value="Finished" />
 
 							<a href="#nogo" class="btn btn-primary pull-right na" id="finishButton"
 									onclick="submitForm('finish'); return false;">
@@ -328,9 +328,7 @@
 						</c:if>
 
 						<c:if test="${(mcGeneralLearnerFlowDTO.reflection == 'true') && hasEditRight}">
-							<input type="submit" name="forwardtoReflection" class="btn btn-primary pull-right">
-								<fmt:message key="label.continue" />
-							</input>
+							<input type="submit" name="forwardtoReflection" class="btn btn-primary pull-right" value="<fmt:message key="label.continue" />"/>
 						</c:if>
 					</div>
 				</c:if>