Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
@@ -125,7 +125,7 @@
      *
      */
     @RequestMapping("/start")
-    protected String start(HttpServletRequest request) {
+    protected String start(@ModelAttribute("recordForm") RecordForm recordForm, HttpServletRequest request) {
 
 	// initial Session Map
 	SessionMap sessionMap = new SessionMap();
@@ -629,7 +629,7 @@
 	return dacoUser;
     }
 
-    protected MultiValueMap<String, String> validateRecordForm(Daco daco, RecordForm recordForm,
+    protected MultiValueMap<String, String> validateRecordForm(Daco daco, @ModelAttribute RecordForm recordForm,
 	    Set<DacoQuestion> questionList, int recordCount) {
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	Short maxRecords = daco.getMaxRecords();
Index: lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12
--- lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp	(.../adddropdown.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
@@ -29,7 +29,7 @@
 
 <!-- Add question form-->
 <%@ include file="/common/messages.jsp"%>
-<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" styleId="dacoQuestionForm">
+<form:form action="saveOrUpdateQuestion.do" modelAttribute="questionForm" method="post" id="dacoQuestionForm">
 	<form:hidden path="sessionMapID" />
 	<input type="hidden" id="questionType" name="questionType" value="8" />
 	<form:hidden path="questionIndex" />
Index: lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
===================================================================
diff -u -r13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12
--- lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision 13f4ef691d14ebbcc82ac4d21a60ce0a7bfcc62d)
+++ lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp	(.../addlonglat.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
@@ -2,7 +2,7 @@
 		
 
 <%@ include file="/common/taglibs.jsp"%>
-<%@page import="org.lamsfoundation.lams.tool.daco.DacoConstants;"%>
+<%@page import="org.lamsfoundation.lams.tool.daco.DacoConstants"%>
 
 <lams:html>
 <lams:head>
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
@@ -69,7 +69,7 @@
 	</div>
 
 	<!-- Form to add/edit a record -->
-	<form:form action="learning/saveOrUpdateRecord.do" modelAttribute="recordForm" method="post" id="recordForm" enctype="multipart/form-data">
+	<form:form action="saveOrUpdateRecord.do" modelAttribute="recordForm" method="post" id="recordForm" enctype="multipart/form-data" >
 	
 	<c:set var="fileNumber" value="0" />
 	<c:set var="answerIndex" value="0" />
@@ -182,7 +182,7 @@
 							<c:forEach var="answerOption" items="${question.answerOptions}" varStatus="status">
 							<%-- It displays for example A) instead of 1) --%>
 							${fn:substring(ordinal,status.index,status.index+1)}) 
-							<form:radiobutton path="answer[${answerIndex}]" value="${status.index+1}"><label>&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></label></form:radiobutton><br />
+							<form:radiobutton path="answer[${answerIndex}]" value="${status.index+1}" /><label>&nbsp;<c:out value="${answerOption.answerOption}" escapeXml="true"/></label><br />
 							</c:forEach>
 							<c:set var="answerIndex" value="${answerIndex+1}" />
 						</c:when>
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
@@ -102,7 +102,7 @@
 				</button>
 			</c:when>
 			<c:otherwise>
-				<button type="submit" property="FinishButton" id="finishButton" onclick="javascript:finishSession()" class="btn btn-primary btn-disable-on-submit voffset5 pull-right na">
+				<button type="submit" name="FinishButton" id="finishButton" onclick="javascript:finishSession()" class="btn btn-primary btn-disable-on-submit voffset5 pull-right na">
 					<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
 		 						<fmt:message key="label.learning.submit" />
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
diff -u -r5d60e2334cf6775f4e4afe5755a0e56ef78540c0 -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12
--- lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 5d60e2334cf6775f4e4afe5755a0e56ef78540c0)
+++ lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
@@ -23,7 +23,7 @@
 
 	<lams:Page type="learner" title="${daco.title}">
 
-	<form:form action="learning/submitReflection.do" modelAttribute="messageForm" method="post" onsubmit="javascript:document.getElementById('finishButton').disabled = true;" id="messageForm">
+	<form:form action="submitReflection.do" modelAttribute="messageForm" method="post" onsubmit="javascript:document.getElementById('finishButton').disabled = true;" id="messageForm">
 		<form:hidden path="userId" />
 		<form:hidden path="sessionId" />
 		<form:hidden path="sessionMapID" />
Index: lams_tool_daco/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc7f58bf04c3ca0557a3d52e0ec23ae7b65423e12
--- lams_tool_daco/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_daco/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision c7f58bf04c3ca0557a3d52e0ec23ae7b65423e12)
@@ -33,7 +33,7 @@
 	<c:if test="${sessionMap.isPageEditable}">
 		<tr>
 			<td colspan="2">
-				<c:url var="authoringUrl" value="/definelater.do">
+				<c:url var="authoringUrl" value="../authoring/definelater.do">
 					<c:param name="toolContentID" value="${sessionMap.toolContentID}" />
 					<c:param name="contentFolderID" value="${sessionMap.contentFolderID}" />
 				</c:url>