Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java
===================================================================
diff -u -r52b9e7960ddce8e644d0e4f9a77603df1465600d -r7dfa3f6f33c221c4293ce029f0dff9a059b28eb3
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbLearnerController.java	(.../NbLearnerController.java)	(revision 7dfa3f6f33c221c4293ce029f0dff9a059b28eb3)
@@ -371,7 +371,7 @@
 	request.setAttribute("allowComments", nbContent.isAllowComments());
 	request.setAttribute("likeAndDislike", nbContent.isCommentsLikeAndDislike());
 	request.setAttribute("anonymous", nbContent.isAllowAnonymous());
-
+	request.setAttribute("toolSessionID", toolSessionID);
 	// get the existing reflection entry
 	NotebookEntry entry = nbService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
 		NoticeboardConstants.TOOL_SIGNATURE, getUserID(request).intValue());
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -rec1390884180d267f85d5acc4f84fc2b3a990b5c -r7dfa3f6f33c221c4293ce029f0dff9a059b28eb3
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision ec1390884180d267f85d5acc4f84fc2b3a990b5c)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 7dfa3f6f33c221c4293ce029f0dff9a059b28eb3)
@@ -22,25 +22,19 @@
 			finishButton.disabled = true;
 		}
 	}
-	
-	function finish() {
-		var finishUrl = "<lams:WebAppURL />learning/finish.do?sessionMapID=${sessionMapID}";
-		return submitCount(finishUrl);
+	function submitForm(methodName) {
+		var f = document.getElementById('nbLearnerForm');
+		f.action = methodName + ".do";
+		f.submit();
 	}
-
-	function reflect() {
-		var reflectUrl = "<lams:WebAppURL />learning/reflect.do?sessionMapID=${sessionMapID}";
-		return submitCount(reflectUrl);
-	}
-	
 </script>
 
-<lams:Page type="learner" title="${nbLearnerForm.title}" formID="nbLearnerForm">
+<lams:Page type="learner" title="${nbLearnerForm.title}">
 	<div class="panel">
 		<c:out value="${nbLearnerForm.basicContent}" escapeXml="false" />
 	</div>
 
-	<form:form action="learner.do" modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
+	<form:form modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
 		<form:hidden path="mode" />
 		<form:hidden path="toolSessionID" />
 
@@ -73,22 +67,25 @@
 				<c:when test="${reflectOnActivity}">
 
 					<button  name="continueButton" class="btn btn-sm btn-primary pull-right"
-						id="continueButton" onclick="javascript:reflect();">
+						onclick="submitForm('reflect')">
 						<fmt:message key="button.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
 
-					<button type="submit" onclick="javascript:finish();" class="btn btn-primary pull-right voffset10 na" name="finishButton" id="finishButton">
-					<c:choose>
-						<c:when test="${activityPosition.last}">
-							<fmt:message key="button.submit" />
-						</c:when>
-						<c:otherwise>
-							<fmt:message key="button.finish" />
-						</c:otherwise>
-					</c:choose>
-					</button>
+
+					<a href="#nogo" name="finishButton" class="btn btn-primary pull-right voffset10 na"
+						onclick="submitForm('finish')">
+						<c:choose>
+							<c:when test="${activityPosition.last}">
+								<fmt:message key="button.submit" />
+							</c:when>
+							<c:otherwise>
+								<fmt:message key="button.finish" />
+							</c:otherwise>
+						</c:choose>
+
+					</a>
 				</c:otherwise>
 			</c:choose>
 		</c:if>
@@ -97,4 +94,4 @@
 
 </lams:Page>
 	
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -rec1390884180d267f85d5acc4f84fc2b3a990b5c -r7dfa3f6f33c221c4293ce029f0dff9a059b28eb3
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision ec1390884180d267f85d5acc4f84fc2b3a990b5c)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 7dfa3f6f33c221c4293ce029f0dff9a059b28eb3)
@@ -21,13 +21,14 @@
 	}
 	function submitForm(methodName) {
 		var f = document.getElementById('nbLearnerForm');
+		f.action = methodName + ".do";
 		f.submit();
 	}
 </script>
 
 <lams:Page type="learner" title="${title}" formID="nbLearnerForm">
 
-	<form:form action="reflect.do" method="post" onsubmit="disableFinishButton();" modelAttribute="nbLearnerForm" id="nbLearnerForm">
+	<form:form method="post" onsubmit="disableFinishButton();" modelAttribute="nbLearnerForm" id="nbLearnerForm">
 		<div class="form-group">
 			<div class="panel">
 				<lams:out value="${reflectInstructions}" escapeHtml="true" />
@@ -56,7 +57,7 @@
 	<!-- Comments: the extra div counteracts the float -->
 	<c:if test="${allowComments}">
 		<div class="row no-gutter"><div class="col-xs-12"></div></div>
-		<lams:Comments toolSessionId="${NbLearnerForm.toolSessionID}"
+		<lams:Comments toolSessionId="${nbLearnerForm.toolSessionID}"
 			toolSignature="<%=NoticeboardConstants.TOOL_SIGNATURE%>" likeAndDislike="${likeAndDislike}" readOnly="true"
 			pageSize="10" sortBy="1" />
 	</c:if>