Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
===================================================================
diff -u -r365254f26a6f430e051f6ff117c8f01e224320ac -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java	(.../McLearningController.java)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -96,8 +96,46 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
+    @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, response);
+	}
+	if (mcLearningForm.getContinueOptionsCombined() != null) {
+	    return continueOptionsCombined(mcLearningForm, request, response);
+	} else if (mcLearningForm.getNextOptions() != null) {
+	    return getNextOptions(mcLearningForm, request, response);
+	} else if (mcLearningForm.getRedoQuestions() != null) {
+	    return redoQuestions(mcLearningForm, request, response);
+	} else if (mcLearningForm.getViewAnswers() != null) {
+	    return viewAnswers(mcLearningForm, request, response);
+	} else if (mcLearningForm.getSubmitReflection() != null) {
+	    return submitReflection(mcLearningForm, request, response);
+	} else if (mcLearningForm.getForwardtoReflection() != null) {
+	    return forwardtoReflection(mcLearningForm, request, response);
+	} else if (mcLearningForm.getLearnerFinished() != null) {
+	    return endLearning(mcLearningForm, request, response);
+	}
+
+	return "learning/AnswersContent";
+    }
+
     @RequestMapping("/learning")
-    public String execute(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
+    public String execute(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 
 	mcLearningForm.setMcService(mcService);
 	mcLearningForm.setPassMarkApplicable(new Boolean(false).toString());
@@ -346,7 +384,8 @@
      * responses to learner when they answer all the questions on a single page
      */
     @RequestMapping("/continueOptionsCombined")
-    public String continueOptionsCombined(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
+    public String continueOptionsCombined(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 
 	String httpSessionID = mcLearningForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
@@ -369,7 +408,7 @@
 
 	//prohibit users from submitting answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
 	if (user.isResponseFinalised()) {
-	    return viewAnswers(mcLearningForm, request);
+	    return viewAnswers(mcLearningForm, request, response);
 	}
 
 	/* process the answers */
@@ -388,14 +427,15 @@
 	user.setResponseFinalised(true);
 	mcService.updateMcQueUsr(user);
 
-	return viewAnswers(mcLearningForm, request);
+	return viewAnswers(mcLearningForm, request, response);
     }
 
     /**
      * takes the learner to the next set of questions
      */
     @RequestMapping("/getNextOptions")
-    public String getNextOptions(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
+    public String getNextOptions(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID));
@@ -410,7 +450,7 @@
 
 	//prohibit users from submitting answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
 	if (user.isResponseFinalised()) {
-	    return viewAnswers(mcLearningForm, request);
+	    return viewAnswers(mcLearningForm, request, response);
 	}
 
 	//parse learner input
@@ -452,7 +492,8 @@
      * allows the learner to view their answer history
      */
     @RequestMapping("/viewAnswers")
-    public String viewAnswers(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
+    public String viewAnswers(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID));
@@ -590,7 +631,8 @@
     }
 
     @RequestMapping("/redoQuestions")
-    public String redoQuestions(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
+    public String redoQuestions(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID));
@@ -684,7 +726,8 @@
     }
 
     @RequestMapping("/forwardtoReflection")
-    public String forwardtoReflection(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
+    public String forwardtoReflection(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 
@@ -717,7 +760,8 @@
      * auto saves responses
      */
     @RequestMapping("/autoSaveAnswers")
-    public String autoSaveAnswers(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request) {
+    public String autoSaveAnswers(@ModelAttribute McLearningForm mcLearningForm, HttpServletRequest request,
+	    HttpServletResponse response) {
 
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	McSession mcSession = mcService.getMcSessionById(new Long(toolSessionID));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
===================================================================
diff -u -rd25e9265466c2a19b39850104b8db9a0332ab2f5 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java	(.../McMonitoringController.java)	(revision d25e9265466c2a19b39850104b8db9a0332ab2f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java	(.../McMonitoringController.java)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -99,7 +99,6 @@
     private WebApplicationContext applicationContext;
 
     @RequestMapping("/monitoring")
-    @SuppressWarnings("unchecked")
     public String execute(HttpServletRequest request) {
 
 	McGeneralMonitoringDTO mcGeneralMonitoringDTO = new McGeneralMonitoringDTO();
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r365254f26a6f430e051f6ff117c8f01e224320ac -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -144,7 +144,7 @@
 		<!-- 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="displayMc.do" enctype="multipart/form-data"
 				method="POST" target="_self">
 				<form:hidden path="toolContentID" />
 				<form:hidden path="toolSessionID" id="tool-session-id" />
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
diff -u -r5cc2f28c0fd508cf034496ad94d4892c373431f1 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
+++ lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -16,11 +16,12 @@
 		</div>
 
 		<div class="form-group">
-			<form:form action="submitReflection.do" modelAttribute="mcLearningForm" id="mcLearningForm" method="POST">
+			<form:form action="displayMc.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" />
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r365254f26a6f430e051f6ff117c8f01e224320ac -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 365254f26a6f430e051f6ff117c8f01e224320ac)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -53,7 +53,7 @@
 </lams:head>
 
 <body class="stripes">
-	<form:form action="viewAnswers.do" method="POST" target="_self" onsubmit="disableFinishButton();" modelAttribute="mcLearningForm" id="mcLearningForm">
+	<form:form action="displayMc.do" method="POST" target="_self" onsubmit="disableFinishButton();" modelAttribute="mcLearningForm" id="mcLearningForm">
 
 	<lams:Page type="learner" title="${mcGeneralLearnerFlowDTO.activityTitle}" formID="mcLearningForm">
 		<c:if test="${isLeadershipEnabled}">
Index: lams_tool_lamc/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r5cc2f28c0fd508cf034496ad94d4892c373431f1 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 5cc2f28c0fd508cf034496ad94d4892c373431f1)
+++ lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -30,7 +30,7 @@
 
 	<lams:Page type="learner" title="${title}" formID="mcLearningForm">
 
-		<form:form action="learner.do" method="POST" onsubmit="disableFinishButton();"
+		<form:form action="displayMc.do" method="POST" onsubmit="disableFinishButton();"
 			modelAttribute="mcLearningForm" id="mcLearningForm">
 			<form:hidden path="toolContentID" />
 			<form:hidden path="toolSessionID" />
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -39,7 +39,7 @@
 		function downloadMarks() {
 			var url = "<c:url value='/monitoring/downloadMarks.do'/>";
 		    var reqIDVar = new Date();
-			var param = "?validate=false&toolContentID=${mcGeneralMonitoringDTO.toolContentID}&reqID="+reqIDVar.getTime();
+			var param = "?toolContentID=${mcGeneralMonitoringDTO.toolContentID}&reqID="+reqIDVar.getTime();
 			url = url + param;
 
 			return downloadFile(url, 'message-area-busy', '<fmt:message key="label.summary.downloaded"/>', 'message-area', 'btn-disable-on-submit');
Index: lams_tool_lamc/web/monitoring/Reflections.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -19,8 +19,7 @@
 				<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
 				<tr>			
 					<td>
-						<c:url value="monitoring.do" var="openNotebook">
-							<c:param name="dispatch" value="openNotebook" />
+						<c:url value="openNotebook.do" var="openNotebook">
 							<c:param name="uid" value="${reflectionUid}" />
 							<c:param name="userId" value="${userId}" />
 							<c:param name="userName" value="${fn:escapeXml(userName)}" />
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -80,12 +80,11 @@
 			  	    		rowid=0; 
 			  	    } 
 			   		var userUid = jQuery("#group${sessionDto.sessionId}").getCell(rowid, 'userUid');
-					var userMasterDetailUrl = '<c:url value="/monitoring.do"/>';
+					var userMasterDetailUrl = '<c:url value="/monitoring/userMasterDetail.do"/>';
 		  	        jQuery("#userSummary${sessionDto.sessionId}").clearGridData().setGridParam({gridstate: "visible"}).trigger("reloadGrid");
 		  	        $("#masterDetailArea").load(
 		  	        		userMasterDetailUrl,
 		  	        		{
-		  	        			dispatch: "userMasterDetail",
 		  	        			userUid: userUid
 		  	       		}
 		  	       	);
Index: lams_tool_lamc/web/monitoring/parts/statsPart.jsp
===================================================================
diff -u -r9e395fca5d7eb4a5ac4c9768642a336723a950f7 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/monitoring/parts/statsPart.jsp	(.../statsPart.jsp)	(revision 9e395fca5d7eb4a5ac4c9768642a336723a950f7)
+++ lams_tool_lamc/web/monitoring/parts/statsPart.jsp	(.../statsPart.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -14,9 +14,8 @@
 			}
 			$(this).data('previousValue', this.value);
 			$.ajax({
-				url: '<c:url value="/monitoring.do"/>',
+				url: '<c:url value="/monitoring/setActivityEvaluation.do"/>',
 				data: {
-					dispatch: "setActivityEvaluation",
 					toolContentID: "${toolContentID}",
 					activityEvaluation: this.value
 				},
Index: lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r66b044dc18d78c8a61a15c197d0c2d6a1f989c18
--- lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp	(.../mcqStudentChoices.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp	(.../mcqStudentChoices.jsp)	(revision 66b044dc18d78c8a61a15c197d0c2d6a1f989c18)
@@ -1,7 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 <script>
 	function exportExcel(){
-		location.href = "<lams:LAMSURL/>tool/lamc11/monitoring.do?dispatch=downloadMarks&downloadTokenValue=jjj&toolContentID=${toolContentID}&reqID=" + (new Date()).getTime();
+		location.href = "<lams:LAMSURL/>tool/lamc11/monitoring/downloadMarks.do?downloadTokenValue=jjj&toolContentID=${toolContentID}&reqID=" + (new Date()).getTime();
 	};
 </script>