Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -rd97c65ef73ed925593e730db5e72f24f2d092890 -rd2211def89f93b05a695009b1c8be46205f17f70
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision d97c65ef73ed925593e730db5e72f24f2d092890)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision d2211def89f93b05a695009b1c8be46205f17f70)
@@ -92,6 +92,7 @@
 		}
 		
 		function doSubmit(actionMethod) {
+			$('.btn').prop('disabled', true);
 			document.QaLearningForm.method.value=actionMethod; 
 			document.QaLearningForm.submit();
 		}
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -ra1e4f1c8cd378514548ca6efc7b8739910dafe91 -rd2211def89f93b05a695009b1c8be46205f17f70
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision d2211def89f93b05a695009b1c8be46205f17f70)
@@ -11,17 +11,11 @@
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 
 	<script language="JavaScript" type="text/JavaScript">
-		function submitLearningMethod(actionMethod) {
-			if (actionMethod == 'endLearning') {
-				document.getElementById("finishButton").disabled = true;
-			}
+		function submitMethod(actionMethod) {
+			$('.btn').prop('disabled', true);
 			document.QaLearningForm.method.value = actionMethod;
 			document.QaLearningForm.submit();
 		}
-
-		function submitMethod(actionMethod) {
-			submitLearningMethod(actionMethod);
-		}
 	</script>
 </lams:head>
 
@@ -145,8 +139,8 @@
 				<c:if test="${!generalLearnerFlowDTO.showOtherAnswers}">
 					<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
 						<div class="space-bottom-top align-right">
-							<html:link href="#nogo" property="endLearning" styleId="finishButton"
-								onclick="javascript:submitMethod('storeAllResults');return false" styleClass="btn btn-primary pull-right na">
+							<button type="submit" id="finishButton" 
+								onclick="javascript:submitMethod('storeAllResults');return false" class="btn btn-primary pull-right na">
 								<c:choose>
 									<c:when test="${sessionMap.activityPosition.last}">
 										<fmt:message key="button.submit" />
@@ -156,7 +150,7 @@
 									</c:otherwise>
 								</c:choose>
 
-							</html:link>
+							</button>
 						</div>
 					</c:if>
 
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -ra1e4f1c8cd378514548ca6efc7b8739910dafe91 -rd2211def89f93b05a695009b1c8be46205f17f70
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision a1e4f1c8cd378514548ca6efc7b8739910dafe91)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision d2211def89f93b05a695009b1c8be46205f17f70)
@@ -238,17 +238,11 @@
 			});
 		 });
 	
-		function submitLearningMethod(actionMethod) {	
-			if (actionMethod == 'endLearning') {
-				$("#finishButton").attr("disabled", true);
-			}
+		function submitMethod(actionMethod) {
+			$('.btn').prop('disabled', true);
 			document.QaLearningForm.method.value=actionMethod; 
 			document.QaLearningForm.submit();
 		}
-		
-		function submitMethod(actionMethod) {
-			submitLearningMethod(actionMethod);
-		}
 	</script>
 </lams:head>
 
@@ -467,8 +461,8 @@
 
 
 						<c:if test="${(generalLearnerFlowDTO.reflection != 'true') || !hasEditRight}">
-							<html:link href="#nogo" property="endLearning" styleId="finishButton"
-								onclick="javascript:submitMethod('endLearning'); return false;" styleClass="btn btn-primary pull-right na">
+							<button type="submit" id="finishButton"
+								onclick="javascript:submitMethod('endLearning'); return false;" class="btn btn-primary pull-right na">
 								<c:choose>
 									<c:when test="${sessionMap.activityPosition.last}">
 										<fmt:message key="button.submit" />
@@ -477,7 +471,7 @@
 										<fmt:message key="button.endLearning" />
 									</c:otherwise>
 								</c:choose>
-							</html:link>
+							</button>
 						</c:if>
 
 						<c:if test="${(generalLearnerFlowDTO.reflection == 'true') && hasEditRight}">
@@ -490,12 +484,8 @@
 				</c:if>
 			</c:if>
 
-
-
 		<div id="footer"></div>
 
-
-
 	</lams:Page>
 
 	</html:form>
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc -rd2211def89f93b05a695009b1c8be46205f17f70
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 677769eb66f1a9f9daa6ca1e7196fca8aa6f5abc)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision d2211def89f93b05a695009b1c8be46205f17f70)
@@ -7,25 +7,17 @@
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 
 	<script language="JavaScript" type="text/JavaScript">
-		function submitLearningMethod(actionMethod) {
-			if (actionMethod == 'submitReflection') {
-				document.getElementById("finishButton").disabled = true;
-			}		
-			document.QaLearningForm.method.value=actionMethod; 
-			document.QaLearningForm.submit();
+		function disableFinishButton() {
+			document.getElementById("finishButton").disabled = true;
 		}
 		
-		function submitMethod(actionMethod) {
-			submitLearningMethod(actionMethod);
-		}
-		
 	</script>
 </lams:head>
 
 <body class="stripes">
 
 <!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-<html:form action="/learning?validate=false" styleId="reflectionForm">
+<html:form action="/learning?validate=false" styleId="reflectionForm" onsubmit="disableFinishButton()">
 
 <lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
@@ -35,17 +27,15 @@
 		<html:hidden property="httpSessionID" />
 		<html:hidden property="totalQuestionCount" />
 
-
 			<p>
 				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</p>
 
 			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
 
 			
-				<html:link href="#nogo" property="submitReflection" styleId="finishButton"
-					onclick="javascript:submitMethod('submitReflection');return false" styleClass="btn btn-primary voffset5 pull-right">
-					<div class="na">					
+				<button id="finishButton" class="btn btn-primary voffset5 pull-right na">
+					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
 		 						<fmt:message key="button.submit" />
@@ -54,11 +44,9 @@
 		 		 				<fmt:message key="button.endLearning" />
 		 					</c:otherwise>
 		 				</c:choose>
-		 			</div>
-				</html:link>
+		 			</span>
+				</button>
 		
-		</div>
-
 	<div id="footer"></div>
 </lams:Page>
 
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r667d1faf66fd77b1eda9448aa9626a35dddcb89e -rd2211def89f93b05a695009b1c8be46205f17f70
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 667d1faf66fd77b1eda9448aa9626a35dddcb89e)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision d2211def89f93b05a695009b1c8be46205f17f70)
@@ -232,17 +232,11 @@
 			});
 		 });	
 	
-		function submitLearningMethod(actionMethod) {
-			if (actionMethod == 'endLearning') {
-				$("#finishButton").attr("disabled", true);
-			}
+		function submitMethod(actionMethod) {
+			$('.btn').prop('disabled', true);
 			document.QaLearningForm.method.value=actionMethod; 
 			document.QaLearningForm.submit();
 		}
-		
-		function submitMethod(actionMethod) {
-			submitLearningMethod(actionMethod);
-		}
 	</script>
 </lams:head>
 
@@ -455,8 +449,8 @@
 		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 			<div class="row no-gutter">
 				<div class="col-xs-12">
-					<html:button property="endLearning" styleId="finishButton" onclick="javascript:submitMethod('endLearning');"
-						styleClass="btn btn-primary pull-right na">
+					<button type="submit" id="finishButton" onclick="javascript:submitMethod('endLearning');"
+						class="btn btn-primary pull-right na">
 						<c:choose>
 							<c:when test="${sessionMap.activityPosition.last}">
 								<fmt:message key="button.submit" />
@@ -465,7 +459,7 @@
 								<fmt:message key="button.endLearning" />
 							</c:otherwise>
 						</c:choose>
-					</html:button>
+					</button>
 
 				</div>
 			</div>