Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r99ab61277d430fb532c14c217f14fa763aa4def9 -r52b9e7960ddce8e644d0e4f9a77603df1465600d
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 99ab61277d430fb532c14c217f14fa763aa4def9)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 52b9e7960ddce8e644d0e4f9a77603df1465600d)
@@ -22,19 +22,24 @@
 			finishButton.disabled = true;
 		}
 	}
-	function submitForm(methodName) {
-		var f = document.getElementById('nbLearnerForm');
-		f.action += methodName + ".do";
-		f.submit();
+	
+	function reflect() {
+		var submitUrl = "<lams:WebAppURL />"+${mode}+"/reflect.do?sessionMapID=${sessionMapID}";
+		return submitCount(submitUrl);
 	}
+	
+	function finish() {
+		var finishUrl = "<lams:WebAppURL />"+${mode}+"/finish.do?sessionMapID=${sessionMapID}";
+		return submitCount(finishUrl);
+	}
 </script>
 
-<lams:Page type="learner" title="${nbLearnerForm.title}">
+<lams:Page type="learner" title="${nbLearnerForm.title}" formID="nbLearnerForm">
 	<div class="panel">
 		<c:out value="${nbLearnerForm.basicContent}" escapeXml="false" />
 	</div>
 
-	<form:form action="/learning/" modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
+	<form:form action="${mode}.do" modelAttribute="nbLearnerForm" target="_self" onsubmit="disableFinishButton();" id="nbLearnerForm">
 		<form:hidden path="mode" />
 		<form:hidden path="toolSessionID" />
 
@@ -67,15 +72,15 @@
 				<c:when test="${reflectOnActivity}">
 
 					<button  name="continueButton" class="btn btn-sm btn-primary pull-right"
-						onclick="submitForm('reflect')">
+						onclick="javascript:reflect();">
 						<fmt:message key="button.continue" />
 					</button>
 				</c:when>
 				<c:otherwise>
 
 
 					<a href="#nogo" name="finishButton" class="btn btn-primary pull-right voffset10 na"
-						onclick="submitForm('finish')">
+						onclick="javascript:finish();">
 						<c:choose>
 							<c:when test="${activityPosition.last}">
 								<fmt:message key="button.submit" />