Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
===================================================================
diff -u -r424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d -r5cc2f28c0fd508cf034496ad94d4892c373431f1
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 424f8d213bbff9badfb9b913fd7c68d5cc1d5c3d)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
@@ -65,6 +65,7 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -118,7 +119,7 @@
 	 */
 	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID));
 	if (mcSession == null) {
-	    return "McErrorBox";
+	    return "error";
 	}
 
 	/*
@@ -130,7 +131,7 @@
 	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	    errorMap.add("GLOBAL", messageService.getMessage("error.content.doesNotExist"));
 	    request.setAttribute("errorMap", errorMap);
-	    return "McErrorBox";
+	    return "error";
 	}
 
 	String mode = request.getParameter(McAppConstants.MODE);
@@ -248,58 +249,8 @@
 	return "learning/AnswersContent";
     }
 
+   
     /**
-     * main content/question content management and workflow logic
-     *
-     * if the passed toolContentId exists in the db, we need to get the relevant data into the Map if not, create the
-     * default Map
-     */
-    public String unspecified(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
-	LearningUtil.saveFormRequestData(request, mcLearningForm);
-	return null;
-    }
-
-    /**
-     * responds to learner activity in learner mode.
-     */
-    @RequestMapping("/displayMc")
-    public String displayMc(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException {
-
-	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
-	mcLearningForm.setToolSessionID(toolSessionID);
-
-	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID));
-
-	String toolContentId = mcSession.getMcContent().getMcContentId().toString();
-	mcLearningForm.setToolContentID(toolContentId);
-
-	LearningUtil.saveFormRequestData(request, mcLearningForm);
-
-	if (mcLearningForm.getNextQuestionSelected() != null && !mcLearningForm.getNextQuestionSelected().equals("")) {
-	    mcLearningForm.resetParameters();
-	    return getNextOptions(mcLearningForm, request);
-	}
-	if (mcLearningForm.getContinueOptionsCombined() != null) {
-	    return continueOptionsCombined(mcLearningForm, request);
-	} else if (mcLearningForm.getNextOptions() != null) {
-	    return getNextOptions(mcLearningForm, request);
-	} else if (mcLearningForm.getRedoQuestions() != null) {
-	    return redoQuestions(mcLearningForm, request);
-	} else if (mcLearningForm.getViewAnswers() != null) {
-	    return viewAnswers(mcLearningForm, request);
-	} else if (mcLearningForm.getSubmitReflection() != null) {
-	    return submitReflection(mcLearningForm, request, response);
-	} else if (mcLearningForm.getForwardtoReflection() != null) {
-	    return forwardtoReflection(mcLearningForm, request);
-	} else if (mcLearningForm.getLearnerFinished() != null) {
-	    return endLearning(mcLearningForm, request, response);
-	}
-
-	return "learning/AnswersContent";
-    }
-
-    /**
      * ActionForward endLearning(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse
      * response)
      */
@@ -689,7 +640,7 @@
     /**
      * checks Leader Progress
      */
-    @RequestMapping("/checkLeaderProgress")
+    @RequestMapping(path = "/checkLeaderProgress", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ResponseBody
     public String checkLeaderProgress(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
@@ -702,9 +653,7 @@
 
 	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
 	ObjectNode.put("isLeaderResponseFinalized", isLeaderResponseFinalized);
-	response.setContentType("application/x-json;charset=utf-8");
-	response.getWriter().print(ObjectNode);
-	return null;
+	return ObjectNode.toString();
     }
 
     @RequestMapping("/submitReflection")
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -rc1bde51a17e35ed781d2bb7f4123b2012f30f5a3 -r5cc2f28c0fd508cf034496ad94d4892c373431f1
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision c1bde51a17e35ed781d2bb7f4123b2012f30f5a3)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
@@ -21,14 +21,14 @@
 		});
 
 		function submitMethod(actionMethod) {
-			document.forms.McAuthoringForm.action=actionMethod+".do"; 
-			document.forms.McAuthoringForm.submit();
+			document.forms.mcAuthoringForm.action=actionMethod+".do"; 
+			document.forms.mcAuthoringForm.submit();
 		}
 
 		
 		function submitModifyAuthoringQuestion(questionIndexValue, actionMethod) {
-			document.forms.McAuthoringForm.questionIndex.value=questionIndexValue; 
-			document.forms.McAuthoringForm.action=actionMethod+".do";
+			document.forms.mcAuthoringForm.questionIndex.value=questionIndexValue; 
+			document.forms.mcAuthoringForm.action=actionMethod+".do";
 			
 			$('#mcAuthoringForm').ajaxSubmit({ 
 				data: { 
@@ -37,7 +37,7 @@
 				target:  $('#resourceListArea'),
 	    		iframe: true,
 	    		success:    function() { 
-	    			document.forms.McAuthoringForm.action="submitAllContent.do";
+	    			document.forms.mcAuthoringForm.action="submitAllContent.do";
 	    			refreshThickbox();
 	    	    }
 		    });
@@ -68,8 +68,8 @@
         } 
         
         function doSubmit(method) {
-        	document.forms.McAuthoringForm.action=method+".do";
-        	document.forms.McAuthoringForm.submit();
+        	document.forms.mcAuthoringForm.action=method+".do";
+        	document.forms.mcAuthoringForm.submit();
         }
 	</script>
 	
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -rc1bde51a17e35ed781d2bb7f4123b2012f30f5a3 -r5cc2f28c0fd508cf034496ad94d4892c373431f1
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision c1bde51a17e35ed781d2bb7f4123b2012f30f5a3)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
@@ -3,8 +3,8 @@
 
 <script type="text/javascript">
 	function removeQuestion(questionIndex) {
-		document.forms.McAuthoringForm.questionIndex.value=questionIndex;
-		document.forms.McAuthoringForm.action='removeQuestion.do'; 
+		document.forms.mcAuthoringForm.questionIndex.value=questionIndex;
+		document.forms.mcAuthoringForm.action='removeQuestion.do'; 
 		
 		$('#mcAuthoringForm').ajaxSubmit({ 
     		target:  $('#resourceListArea'),
@@ -13,7 +13,7 @@
 			},
     		iframe: true,
     		success:    function() { 
-    			document.forms.McAuthoringForm.action="submitAllContent.do";
+    			document.forms.mcAuthoringForm.action="submitAllContent.do";
     			refreshThickbox();
     	    }
 	    });
@@ -35,7 +35,7 @@
     		target:  $('#resourceListArea'),
     		iframe: true,
     		success:    function() { 
-    			document.forms.McAuthoringForm.action="submitAllContent.do";
+    			document.forms.mcAuthoringForm.action="submitAllContent.do";
     			refreshThickbox();
     	    	form.remove();
     	    }
Index: lams_tool_lamc/web/authoring/editQuestionBox.jsp
===================================================================
diff -u -rc1bde51a17e35ed781d2bb7f4123b2012f30f5a3 -r5cc2f28c0fd508cf034496ad94d4892c373431f1
--- lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision c1bde51a17e35ed781d2bb7f4123b2012f30f5a3)
+++ lams_tool_lamc/web/authoring/editQuestionBox.jsp	(.../editQuestionBox.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
@@ -54,13 +54,13 @@
 			}
 				
 			function submitModifyCandidate(candidateIndexValue, actionMethod) {
-				document.forms.McAuthoringForm.candidateIndex.value=candidateIndexValue;
-				submitForm(actionMethod);
+				document.forms.mcAuthoringForm.candidateIndex.value=candidateIndexValue;
+				submitMethod(actionMethod);
 			}
 
 			function removeCandidate(candidateIndexValue) {
 				if (validateMinumumCandidateCount()) {
-					document.forms.McAuthoringForm.candidateIndex.value=candidateIndexValue;
+					document.forms.mcAuthoringForm.candidateIndex.value=candidateIndexValue;
 					submitMethod("removeCandidate");
 				}
 			}
@@ -75,7 +75,7 @@
 				}
 				
 				var singleCorrectEntry = 0;
-				var radioCorrect=document.forms.McAuthoringForm.correct;
+				var radioCorrect=document.forms.mcAuthoringForm.correct;
 				if ((radioCorrect == 'null') || (radioCorrect == 'undefined')) {
 					var msg = "<fmt:message key="candidates.groupSize.warning"/>";
 					alert(msg);
@@ -124,7 +124,7 @@
 			}
 
 			function validateMinumumCandidateCount() {
-				var radioCorrect=document.forms.McAuthoringForm.correct;
+				var radioCorrect=document.forms.mcAuthoringForm.correct;
 				if ((radioCorrect == 'undefined') || (radioCorrect == null)) {
 					var msg = "<fmt:message key="candidates.unremovable.groupSize"/>";
 					alert(msg);
@@ -164,7 +164,7 @@
 			</div>
 			
 			<div class="form-group">
-				<button name="newCandidate" onclick="javascript:submitMethod('newCandidateBox');" class="btn btn-default btn-sm">
+				<button name="newCandidate" onclick="javascript:submitMethod('newCandidateBox');" type="button" class="btn btn-default btn-sm">
 					<fmt:message key="label.add.candidates" />
 				</button>
 			</div>
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -re1e8890bd7a972827bd9449eeb7f76a9b42c5913 -r5cc2f28c0fd508cf034496ad94d4892c373431f1
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision e1e8890bd7a972827bd9449eeb7f76a9b42c5913)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
@@ -40,7 +40,7 @@
           window.setInterval(
             function(){
               //ajax form submit
-              $('#learningForm').ajaxSubmit({
+              $('#mcLearningForm').ajaxSubmit({
                 url: "<c:url value='/learning/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" />');
@@ -52,22 +52,22 @@
 
         function submitNextQuestionSelected() {
           if (verifyAllQuestionsAnswered()) {
-            ++document.forms.McLearningForm.questionIndex.value;
-            document.forms.McLearningForm.nextQuestionSelected.value = 1;
+            ++document.forms.mcLearningForm.questionIndex.value;
+            document.forms.mcLearningForm.nextQuestionSelected.value = 1;
             disableContinueButton();
-            document.forms.McLearningForm.submit();
+            document.forms.mcLearningForm.submit();
           }
         }
 
         function submitAllAnswers() {
-          document.forms.McLearningForm.continueOptionsCombined.value = 1;			
+          document.forms.mcLearningForm.continueOptionsCombined.value = 1;			
           doSubmit();
         }
 
         function doSubmit() {
           if (verifyAllQuestionsAnswered()) {
             disableContinueButton();
-            document.forms.McLearningForm.submit();
+            document.forms.mcLearningForm.submit();
           }
         }
 
@@ -144,10 +144,10 @@
 		<!-- End announcements and advanced settings -->
 
 		<div class="form-group">
-			<form:form id="mcLearningForm" modelAttribute="mcLearningForm" action="viewAnswers.do" enctype="multipart/form-data"
+			<form:form id="mcLearningForm" modelAttribute="mcLearningForm" action="learner.do" enctype="multipart/form-data"
 				method="POST" target="_self">
 				<form:hidden path="toolContentID" />
-				<form:hidden path="toolSessionID" styleId="tool-session-id" />
+				<form:hidden path="toolSessionID" id="tool-session-id" />
 				<form:hidden path="httpSessionID" />
 				<form:hidden path="userID" />
 				<form:hidden path="userOverPassMark" />
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r5cc2f28c0fd508cf034496ad94d4892c373431f1
--- lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
@@ -16,12 +16,11 @@
 		</div>
 
 		<div class="form-group">
-			<form:form action="submitReflection.do" modelAttribute="mcLearningForm" id="reflectionForm" method="POST">
+			<form:form action="submitReflection.do" modelAttribute="mcLearningForm" id="mcLearningForm" method="POST">
 				<form:hidden path="toolContentID" />
 				<form:hidden path="toolSessionID" />
 				<form:hidden path="httpSessionID" />
 				<form:hidden path="userID" />
-				<form:hidden path="submitReflection" />
 				<textarea rows="4" name="entryText" class="form-control" id="focusedInput">
 					<c:if test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
 						<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
@@ -30,7 +29,7 @@
 
 
 				<a href="#" name="submitReflection" class="btn btn-primary pull-right voffset10 na"
-					onclick="javascript:document.McLearningForm.submit();return false">
+					onclick="javascript:document.mcLearningForm.submit();return false">
 					<fmt:message key="button.endLearning" />
 				</a>
 
Index: lams_tool_lamc/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r5cc2f28c0fd508cf034496ad94d4892c373431f1
--- lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
@@ -16,7 +16,7 @@
 		}
 
 		function submitForm(methodName) {
-			var f = document.getElementById('messageForm');
+			var f = document.getElementById('mcLearningForm');
 			f.submit();
 		}
 	</script>
@@ -28,10 +28,10 @@
 		<fmt:message key="activity.title" />
 	</c:set>
 
-	<lams:Page type="learner" title="${title}">
+	<lams:Page type="learner" title="${title}" formID="mcLearningForm">
 
 		<form:form action="learner.do" method="POST" onsubmit="disableFinishButton();"
-			modelAttribute="mcLearningForm" id="messageForm">
+			modelAttribute="mcLearningForm" id="mcLearningForm">
 			<form:hidden path="toolContentID" />
 			<form:hidden path="toolSessionID" />
 			<form:hidden path="httpSessionID" />