Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
===================================================================
diff -u -r516c44cd3de0552a5aca39293035dd7326f6d8e3 -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 516c44cd3de0552a5aca39293035dd7326f6d8e3)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -106,7 +106,7 @@
     /**
      * The initial page of learner in Submission tool. This page will list all uploaded files and learn
      */
-    @RequestMapping("")
+    @RequestMapping("/learner")
     public String unspecified(@ModelAttribute LearnerForm learnerForm, HttpServletRequest request) {
 	// initial session Map
 	SessionMap sessionMap = new SessionMap();
@@ -121,14 +121,12 @@
 	    mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, LearnerController.MODE_OPTIONAL);
 	} catch (Exception e) {
 	}
-
-	String sessionIDStr = WebUtil.readStrParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-	Long sessionID = Long.valueOf(sessionIDStr);
-	request.setAttribute("toolSessionID", sessionID);
-
 	if (mode == null) {
 	    mode = ToolAccessMode.LEARNER;
 	}
+	
+	Long sessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
+	
 	// get session from shared session.
 	HttpSession ss = SessionManager.getSession();
 
@@ -404,7 +402,6 @@
 
     // validate uploaded form
     private boolean validateUploadForm(LearnerForm learnerForm, HttpServletRequest request) {
-	Locale preferredLocale = (Locale) request.getSession().getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY);
 
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	if (learnerForm.getFile() == null || StringUtils.isBlank(learnerForm.getFile().getName())) {
@@ -506,7 +503,7 @@
 	return learner;
     }
 
-    @RequestMapping("/delete")
+    @RequestMapping("/deleteLearnerFile")
     public void deleteLearnerFile(HttpServletRequest request, HttpServletResponse response)
 	    throws ServletException, IOException {
 	HttpSession ss = SessionManager.getSession();
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -120,7 +120,7 @@
     /**
      * Default ActionForward for Monitor
      */
-    @RequestMapping("")
+    @RequestMapping("/monitoring")
     public String unspecified(HttpServletRequest request) {
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 	Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java	(.../SubmitFilesPedagogicalPlannerController.java)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/SubmitFilesPedagogicalPlannerController.java	(.../SubmitFilesPedagogicalPlannerController.java)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -64,6 +64,7 @@
 	return initPedagogicalPlannerForm(plannerForm, request);
     }
 
+    @RequestMapping("/initPedagogicalPlannerForm")
     public String initPedagogicalPlannerForm(@ModelAttribute SubmitFilesPedagogicalPlannerForm plannerForm,
 	    HttpServletRequest request) {
 	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
@@ -74,6 +75,7 @@
 	return "authoring/pedagogicalPlannerForm";
     }
 
+    @RequestMapping("/saveOrUpdatePedagogicalPlannerForm")
     public String saveOrUpdatePedagogicalPlannerForm(@ModelAttribute SubmitFilesPedagogicalPlannerForm plannerForm,
 	    HttpServletRequest request) {
 	List<String> messages = (List<String>) plannerForm.validate();
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -58,13 +58,6 @@
 	</label>
 </div>
 
-<div class="checkbox">
-	<label for="notifyLearnersOnMarkRelease">
-		<form:checkbox path="notifyLearnersOnMarkRelease" id="notifyLearnersOnMarkRelease" />
-		<fmt:message key="label.authoring.advanced.notify.mark.release" />
-	</label>
-</div>
-
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.activity.completion">
Index: lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -15,7 +15,7 @@
 </lams:head>
 <body style="width: 550px">
 	<h4 class="space-left"><fmt:message key="label.authoring.basic.instruction" /></h4>
-	<form:form action="/pedagogicalPlanner.do?dispatch=saveOrUpdatePedagogicalPlannerForm" modelAttribute="plannerForm" id="pedagogicalPlannerForm" method="post">
+	<form:form action="saveOrUpdatePedagogicalPlannerForm.do" modelAttribute="plannerForm" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" id="toolContentID" />
 		<form:hidden path="valid" id="valid" />
 		<form:hidden path="callID" id="callID" />
Index: lams_tool_sbmt/web/common/messages.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/common/messages.jsp	(.../messages.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/common/messages.jsp	(.../messages.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -1,11 +1,11 @@
 <%@include file="/common/taglibs.jsp"%>
 
 <%-- Error Messages --%>
-<c:set var="hasErrors">
-<form:errors path='*'/>
-</c:set>
-<c:if test="${not empty hasErrors}">
-	<lams:Alert id="error" type="danger" close="false">
-		<form:errors path="*"/>
-	</lams:Alert>
-</c:if>
\ No newline at end of file
+ <c:set var="errorKey" value="GLOBAL" />
+        <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
+            <lams:Alert id="error" type="danger" close="false">
+                <c:forEach var="error" items="${errorMap[errorKey]}">
+                    <c:out value="${error}" />
+                </c:forEach>
+            </lams:Alert>
+        </c:if>
\ No newline at end of file
Index: lams_tool_sbmt/web/learner/definelater.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/learner/definelater.jsp	(.../definelater.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -13,7 +13,7 @@
 		<fmt:message key="activity.title"></fmt:message>
 	</c:set>
 
-	<lams:Page type="learner" title="${title}" formID="learnerForm">
+	<lams:Page type="learner" title="${title}">
 		<lams:DefineLater />
 		<div id="footer"></div>
 	</lams:Page>
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -17,7 +17,7 @@
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<lams:Page type="learner" title="${sessionMap.title}" formID="learnerForm">
+	<lams:Page type="learner" title="${sessionMap.title}" formID="refForm">
 
 		<%@ include file="/common/messages.jsp"%>
 
Index: lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp	(.../redirectAfterSubmit.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -14,7 +14,7 @@
 </lams:head>
 
 <body class="stripes">
-<lams:Page type="admin" formID="learnerForm">
+<lams:Page type="admin">
 	<div class="text-center" style="margin-top: 10px; margin-bottom: 15px;">
 		<i class="fa fa-2x fa-refresh fa-spin text-primary"></i>
 	</div>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -105,10 +105,9 @@
 			var answer = confirm(msg);
 			if (answer) {	
 				 $.ajax({
-			            url: '<c:url value="/learner/delete.do"/>',
 			            data: 'detailId=' + detailId,
 			            success: function () {
-			            	document.location.href = "<c:url value='/learner.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}'/>";
+			            	document.location.href = "<lams:WebAppURL />learner/"+${sessionMap.mode}+".do?toolSessionID=+"${sessionMap.toolSessionID};
 			            },
 			            error: function(error){
 			                alert("readyState: "+xhr.readyState+"\nstatus: "+xhr.status);
@@ -286,7 +285,7 @@
 
 			<c:if test="${!displayForm && hasEditRight}">
 
-				<form:form action="learner/uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
+				<form:form action="uploadFile.do" modelAttribute="learnerForm" id="learnerForm" method="post" enctype="multipart/form-data" onsubmit="return validate();" >
 					<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
 
 					<!-- Hidden fields -->
Index: lams_tool_sbmt/web/learner/submissionDeadline.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/learner/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -27,7 +27,7 @@
 		<fmt:message key="activity.title"></fmt:message>
 	</c:set>
 
-	<lams:Page type="learner" title="${title}" formID="learnerForm">
+	<lams:Page type="learner" title="${title}">
 
 		<lams:Alert id="submissionDeadline" close="false" type="danger">
 			<fmt:message key="authoring.info.teacher.set.restriction">
Index: lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/learner/waitForLeaderTimeLimit.jsp	(.../waitForLeaderTimeLimit.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -19,7 +19,7 @@
 </lams:head>
 <body class="stripes">
 
-	<lams:Page type="learner" title="${content.title}" formID="learnerForm">
+	<lams:Page type="learner" title="${content.title}">
 				
 		<c:if test="${isLeadershipEnabled}">
 			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
Index: lams_tool_sbmt/web/learner/waitforleader.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/learner/waitforleader.jsp	(.../waitforleader.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -19,7 +19,7 @@
 </lams:head>
 <body class="stripes">
 
-	<lams:Page type="learner" title="${content.title}" formID="learnerForm">
+	<lams:Page type="learner" title="${content.title}">
 	
 				
 		<c:if test="${isLeadershipEnabled}">
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -ra8328bd7083a98162fe2ea19193a08ca16de51d4 -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision a8328bd7083a98162fe2ea19193a08ca16de51d4)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -27,8 +27,7 @@
 	</tr>
 </table>
 
-<c:url value="/authoring.do" var="authoringUrl">
-	<c:param name="mode" value="teacher" />
+<c:url value="/teacher.do" var="authoringUrl">
 	<c:param name="contentFolderID" value="${contentFolderID}" />
 	<c:param name="toolContentID" value="${toolContentID}" />
 </c:url>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -r9bd48180632126e711896a486782d581e2e78750
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 0846a8d71b94a193280999c0576aa7512c2fca9d)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
@@ -196,7 +196,7 @@
 					 class="btn btn-default loffset5 voffset10" >
 			<fmt:message key="label.monitoring.releaseMarks.button" />
 		</button>
-		<form action="monitoring/downloadMarks.do" method="post" style="display:inline">
+		<form action="downloadMarks.do" method="post" style="display:inline">
 			<input type="hidden" name="toolSessionID" value="${sessionDto.sessionID}" />
 			<input type="submit" name="downloadMarks" value="<fmt:message key="label.monitoring.downloadMarks.button" />" class="btn btn-default loffset5 voffset10" />
 		</form>