Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r8be1632bead5d286d578fc73a79fcd662af012d5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision 8be1632bead5d286d578fc73a79fcd662af012d5)
@@ -820,6 +820,7 @@
 	    request.setAttribute(QaAppConstants.ATTR_WIZARD_ENABLED, true);
 	    request.setAttribute(QaAppConstants.ATTR_WIZARD_CATEGORIES, qaService.getWizardCategories());
 	}
+	request.setAttribute("authoringForm", newQuestionForm);
 
 	return "authoring/newQuestionBox";
     }
@@ -882,6 +883,7 @@
 	newQuestionForm.setFeedback(editableFeedback);
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
+	request.setAttribute("authoringForm", newQuestionForm);
 
 	return "authoring/newQuestionBox";
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
===================================================================
diff -u -r95793dfa0f05d3568c66c2718a88c73cf9141ae3 -r8be1632bead5d286d578fc73a79fcd662af012d5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision 95793dfa0f05d3568c66c2718a88c73cf9141ae3)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision 8be1632bead5d286d578fc73a79fcd662af012d5)
@@ -475,7 +475,7 @@
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
 	//prohibit users from submitting answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
 	if (qaQueUsr.isResponseFinalized()) {
-	    String redirectURL = "redirect:/learning/learningStarter.do";
+	    String redirectURL = "redirect:/learning/learning.do";
 	    redirectURL = WebUtil.appendParameterToURL(redirectURL, AttributeNames.PARAM_TOOL_SESSION_ID,
 		    toolSessionID.toString());
 	    redirectURL = WebUtil.appendParameterToURL(redirectURL, QaAppConstants.MODE, "learner");
@@ -567,7 +567,7 @@
 	if (errorMap.isEmpty() && qaContent.isNotifyTeachersOnResponseSubmit()) {
 	    qaService.notifyTeachersOnResponseSubmit(new Long(toolSessionID));
 	}
-
+	request.setAttribute("learningForm", qaLearningForm);
 	return "learning/AnswersContent";
     }
 
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -r658034e7f07579dd682db62112b9353b3a0d3f65 -r8be1632bead5d286d578fc73a79fcd662af012d5
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 8be1632bead5d286d578fc73a79fcd662af012d5)
@@ -24,7 +24,7 @@
 		 			</c:if>
 				</td>
 				<td align="center" style="width:5%"><i class="fa fa-pencil"	title="<fmt:message key="label.tip.editQuestion" />"
-					onclick="javascript:showMessage('<lams:WebAppURL/>authoring/newEditableQuestionBox.do?questionIndex=${status.count}&contentFolderID=${newQuestionForm.contentFolderID}&httpSessionID=${newQuestionForm.httpSessionID}&toolContentID=${newQuestionForm.toolContentID}&usernameVisible=${newQuestionForm.usernameVisible}&lockWhenFinished=${newQuestionForm.lockWhenFinished}&questionsSequenced=${newQuestionForm.questionsSequenced}')"></i>
+					onclick="javascript:showMessage('<lams:WebAppURL/>authoring/newEditableQuestionBox.do?questionIndex=${status.count}&contentFolderID=${authoringForm.contentFolderID}&httpSessionID=${authoringForm.httpSessionID}&toolContentID=${authoringForm.toolContentID}&usernameVisible=${authoringForm.usernameVisible}&lockWhenFinished=${authoringForm.lockWhenFinished}&questionsSequenced=${authoringForm.questionsSequenced}')"></i>
 				</td>
 				<td  align="center" style="width:5%"><i class="fa fa-times"	title="<fmt:message key="label.tip.deleteQuestion" />"
 					onclick="removeQuestion(${status.count})"></i>
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r7ea9b852e5fe8dc5688f983f162064d862f147de -r8be1632bead5d286d578fc73a79fcd662af012d5
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 7ea9b852e5fe8dc5688f983f162064d862f147de)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 8be1632bead5d286d578fc73a79fcd662af012d5)
@@ -48,7 +48,7 @@
 			lams: '${lams}',
 			submissionDeadline: '${submissionDeadline}',
 			submissionDateString: '${submissionDateString}',
-			setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+			setSubmissionDeadlineUrl: '<c:url value="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/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(),
+					ajaxUrl : "<c:url value='../learning/getResponses.do'/>?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 = [],