Index: lams_tool_daco/web/includes/javascript/dacoLearning.js
===================================================================
diff -u -rfdaea6cb56bd4856ee1c9061927927c617d1b3fd -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6
--- lams_tool_daco/web/includes/javascript/dacoLearning.js	(.../dacoLearning.js)	(revision fdaea6cb56bd4856ee1c9061927927c617d1b3fd)
+++ lams_tool_daco/web/includes/javascript/dacoLearning.js	(.../dacoLearning.js)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
@@ -9,16 +9,18 @@
     }
         
 	function finishSession(){
-		document.getElementById("finishButton").disabled = true;
+		$('.btn-disable-on-submit').prop('disabled', true);
 		document.location.href = finishUrl;
 		return false;
 	}
 		
 	function continueReflect(){
+		$('.btn-disable-on-submit').prop('disabled', true);
 		document.location.href=continueReflectUrl;
 	}
 	
 	function saveOrUpdateRecord()	{
+		$('.btn-disable-on-submit').prop('disabled', true);
 		setHiddenFormValues();
 		document.getElementById("recordForm").submit();
 	}
Index: lams_tool_daco/web/pages/learning/addRecord.jsp
===================================================================
diff -u -ra0937eb383f425ec51e2e6bfb90f58eb92af720e -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6
--- lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision a0937eb383f425ec51e2e6bfb90f58eb92af720e)
+++ lams_tool_daco/web/pages/learning/addRecord.jsp	(.../addRecord.jsp)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
@@ -245,7 +245,9 @@
 			</c:forEach>
 		</table>
 
-		<a href="#" onclick="javascript:saveOrUpdateRecord()" class="btn btn-sm btn-default voffset5 pull-left"><i class="fa fa-plus"></i> <fmt:message key="label.learning.add" /></a>
+		<c:if test="${mode != 'teacher'}">
+			<button onclick="javascript:saveOrUpdateRecord()" class="btn btn-sm btn-default btn-disable-on-submit voffset5 pull-left"><i class="fa fa-plus"></i> <fmt:message key="label.learning.add" /></button>
+		</c:if>
 	</html:form>
 </div>
 <!--  end record panel -->
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -r6f31bae1f3fcdb235e761adcf3acb7ae897b1c8e -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 6f31bae1f3fcdb235e761adcf3acb7ae897b1c8e)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
@@ -59,6 +59,9 @@
 </c:choose>
 </c:set> 
 
+<%-- push mode into request so it is available in the tab pages --%>
+<c:set var="mode" scope="request">${mode}</c:set>
+
 <lams:Tabs control="true" title="${daco.title}" helpToolSignature="<%= DacoConstants.TOOL_SIGNATURE %>" helpModule="learning" extraControl="${ellipsisControl}">
  	<lams:Tab id="1" key="label.learning.heading.add" />
  	<lams:Tab id="2" key="label.learning.heading.list" />
@@ -76,23 +79,21 @@
 <c:if test="${mode != 'teacher'}">
 		<c:choose>
 			<c:when test="${daco.reflectOnActivity && (not sessionMap.userFinished)}">
-				<html:button property="FinishButton" onclick="javascript:continueReflect()" styleClass="btn btn-default voffset5 pull-right">
+				<html:button property="FinishButton" onclick="javascript:continueReflect()" styleClass="btn btn-default btn-disable-on-submit voffset5 pull-right">
 					<fmt:message key="label.learning.continue" />
 				</html:button>
 			</c:when>
 			<c:otherwise>
-				<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="javascript:finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
-					<span class="nextActivity">
-						<c:choose>
+				<button type="submit" property="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" />
 		 					</c:when>
 		 					<c:otherwise>
 		 		 				<fmt:message key="label.learning.finished" />
 		 					</c:otherwise>
 		 				</c:choose>
-		 			</span>
-				</html:link>
+				</button>
 			</c:otherwise>
 		</c:choose>
 </c:if>
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6
--- lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f)
+++ lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
@@ -37,7 +37,7 @@
 			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
 
 			<div class="space-bottom-top align-right">
-				<html:link href="#nogo" styleClass="btn btn-primary voffset5 pull-right na" styleId="finishButton" onclick="submitForm('finish')">
+				<button type="submit" class="btn btn-primary voffset5 pull-right na" id="finishButton" onclick="submitForm('finish')">
 					<span class="nextActivity">
 						<c:choose>
 		 					<c:when test="${sessionMap.activityPosition.last}">
@@ -48,7 +48,7 @@
 		 					</c:otherwise>
 		 				</c:choose>
 					</span>
-				</html:link>
+				</button>
 			</div>
 		</div>
 	</html:form>
Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -rf0769c3a0dcf5d87ba30a8026c27271d88fdd7a6
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f)
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	(.../questionSummaries.jsp)	(revision f0769c3a0dcf5d87ba30a8026c27271d88fdd7a6)
@@ -227,8 +227,6 @@
 </div> <!--  end summary panel -->
 
 <c:if test='${includeMode=="learning"}'>
-	<p>
-		<a href="#" class="btn btn-default" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')"><fmt:message key="label.common.summary.refresh" /></a>
-	</p>
+	<button class="btn btn-default btn-disable-on-submit" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')"><fmt:message key="label.common.summary.refresh" /></a>
 </c:if>
 </div>