Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8)
+++ lams_tool_chat/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -4,14 +4,18 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }       
 </script>
 
 <div id="content">
 	<h1>
 		${chatDTO.title}
 	</h1>
 
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 
 		<p class="small-space-top">
 			<lams:out value="${chatDTO.reflectInstructions}" />
@@ -23,9 +27,9 @@
 		<div class="space-bottom-top align-right">
 			<html:hidden property="dispatch" value="submitReflection" />
 			<html:hidden property="chatUserUID" />
-			<html:submit styleClass="button" styleId="finishButton">
-				<fmt:message>button.finish</fmt:message>
-			</html:submit>
+			<html:link href="javascript:;" styleClass="button" styleId="finishButton"  onclick="submitForm('finish')">
+				 <span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+			</html:link>
 		</div>
 	</html:form>
 </div>
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r2495e17b412e141f3827b7edee81e43475d16d07 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -37,10 +37,14 @@
 			finishButton.disabled = true;
 		}
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <html:form action="/learning" method="post"
-	onsubmit="disableFinishButton();">
+	onsubmit="disableFinishButton();"  styleId="messageForm">
 	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
 	<div class="space-bottom-top align-right">
 		<c:choose>
@@ -54,9 +58,9 @@
 			</c:when>
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="button.finish" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton"  onclick="submitForm('finish')">
+					 <span class="nextActivity"><fmt:message key="button.finish" /></span>
+				</html:link>
 			</c:otherwise>
 		</c:choose>
 	</div>
Index: lams_tool_daco/web/includes/css/daco.css
===================================================================
diff -u -rb016b2bf672b390fa8bebfe9d7b3f3c02bb82a67 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_daco/web/includes/css/daco.css	(.../daco.css)	(revision b016b2bf672b390fa8bebfe9d7b3f3c02bb82a67)
+++ lams_tool_daco/web/includes/css/daco.css	(.../daco.css)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -139,7 +139,7 @@
 
 .nextActivity {
 	padding: 0px 20px 0px 0px; 
-	background: url('../images/css/next.png') no-repeat;
+	background: url('../images/next.png') no-repeat;
 	background-position: right;
 
 }
Index: lams_tool_daco/web/includes/images/next.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
diff -u -rf3194b0987d78841b7d01d43c2f4d2fc200a5d49 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f3194b0987d78841b7d01d43c2f4d2fc200a5d49)
+++ lams_tool_daco/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -84,9 +84,9 @@
 				</html:button>
 			</c:when>
 			<c:otherwise>
-				<html:button property="FinishButton" styleId="finishButton" onclick="javascript:finishSession()" styleClass="button">
-					<fmt:message key="label.learning.finished" />
-				</html:button>
+				<html:link href="javascript:;" property="FinishButton" styleId="finishButton" onclick="javascript:finishSession()" styleClass="button">
+					<span class="nextActivity"><fmt:message key="label.learning.finished" /></span>
+				</html:link>
 			</c:otherwise>
 		</c:choose>
 	</div>
Index: lams_tool_daco/web/pages/learning/notebook.jsp
===================================================================
diff -u -r843648563725cffa91af1dfd96dce9682d39b410 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 843648563725cffa91af1dfd96dce9682d39b410)
+++ lams_tool_daco/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -14,7 +14,13 @@
 </lams:head>
 <body class="stripes">
 
-	<html:form action="/learning/submitReflection" method="post" onsubmit="javascript:document.getElementById('finishButton').disabled = true;">
+<script type="text/javascript">
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
+</script>
+	<html:form action="/learning/submitReflection" method="post" onsubmit="javascript:document.getElementById('finishButton').disabled = true;" styleId="messageForm">
 		<html:hidden property="userId" />
 		<html:hidden property="sessionId" />
 		<html:hidden property="sessionMapID" />
@@ -34,9 +40,9 @@
 				styleClass="text-area" />
 
 			<div class="space-bottom-top align-right">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="label.learning.finished" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message key="label.learning.finished" /></span>
+				</html:link>
 			</div>
 		</div>
 	</html:form>
Index: lams_tool_daco/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r3bdebf472590492a1e54e2495e1b566449e5ea4a -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_daco/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 3bdebf472590492a1e54e2495e1b566449e5ea4a)
+++ lams_tool_daco/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -71,10 +71,10 @@
 					</html:button>
 				</c:when>
 				<c:otherwise>
-					<html:button property="FinishButton" styleId="finishButton"
+					<html:link href="javascript:;" property="FinishButton" styleId="finishButton"
 						onclick="return finishSession()" styleClass="button">
-						<fmt:message key="label.learning.finished" />
-					</html:button>
+						<span class="nextActivity"><fmt:message key="label.learning.finished" /></span>
+					</html:link>
 				</c:otherwise>
 			</c:choose>
 		</div>
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -r2495e17b412e141f3827b7edee81e43475d16d07 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -6,10 +6,14 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
+	function submitForm(methodName){
+        	var f = document.getElementById('messageForm');
+	        f.submit();
+        }
 </script>
 
 <html:form action="/learning/submitReflection" method="post"
-	onsubmit="disableFinishButton();">
+	onsubmit="disableFinishButton();" styleId="messageForm">
 	<html:hidden property="userID" />
 	<html:hidden property="sessionMapID" />
 
@@ -28,9 +32,9 @@
 			styleClass="text-area" />
 
 		<div class="space-bottom-top align-right">
-			<html:submit styleClass="button" styleId="finishButton">
-				<fmt:message key="label.finish" />
-			</html:submit>
+			<html:link  href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+				<span class="nextActivity"><fmt:message key="label.finish" /></span>
+			</html:link>
 		</div>
 
 	</div>
Index: lams_tool_forum/web/jsps/learning/runoffline.jsp
===================================================================
diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8)
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -37,10 +37,10 @@
 				</html:button>
 			</c:when>
 			<c:otherwise>
-				<html:button property="finish" styleId="finish"
+				<html:link href="javascript:;"  property="finish" styleId="finish"
 					onclick="submitFinish();" styleClass="button">
-					<fmt:message key="label.finish" />
-				</html:button>
+					<span class="nextActivity"><fmt:message key="label.finish" /></span>
+				</html:link>
 			</c:otherwise>
 		</c:choose>
 
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -r59e4b8d442ec5f40e2e7a5bef1bda2059953b59a -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 59e4b8d442ec5f40e2e7a5bef1bda2059953b59a)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -134,10 +134,10 @@
 				</c:when>
 
 				<c:otherwise>
-					<html:button property="finish" styleId="finish"
+					<html:link href="javascript:;" property="finish" styleId="finish"
 						onclick="submitFinish();" styleClass="button">
-						<fmt:message key="label.finish" />
-					</html:button>
+						<span class="nextActivity"><fmt:message key="label.finish" /></span>
+					</html:link>
 				</c:otherwise>
 
 			</c:choose>
Index: lams_tool_images/web/pages/learning/learning.jsp
===================================================================
diff -u -r616336eff87580ecb6f13770899bc9af7eff4fa8 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 616336eff87580ecb6f13770899bc9af7eff4fa8)
+++ lams_tool_images/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -443,9 +443,9 @@
 						</html:button>
 					</c:when>
 					<c:otherwise>
-						<html:button property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button" >
-							<fmt:message key="label.finished" />
-						</html:button>
+						<html:link href="javascript:;" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button" >
+							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						</html:link>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_images/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8a7c47632a6a93892f015f068d12adb376c0ae2d)
+++ lams_tool_images/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -12,14 +12,18 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
+	         function submitForm(methodName){
+        	        var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
 	</script>
 </lams:head>
 <body class="stripes">
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 	
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
 
@@ -38,9 +42,9 @@
 				styleClass="text-area" />
 
 			<div class="space-bottom-top align-right">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="label.finished" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+				</html:link>
 			</div>
 		</div>
 	</html:form>
Index: lams_tool_images/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r3bc514681593b0694c54d0c77da015388362c196 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_images/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 3bc514681593b0694c54d0c77da015388362c196)
+++ lams_tool_images/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -69,9 +69,9 @@
 					</html:button>
 				</c:when>
 				<c:otherwise>
-					<html:button property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button">
-						<fmt:message key="label.finished" />
-					</html:button>
+					<html:link href="javascript:;" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button">
+						<span class="nextActivity"><fmt:message key="label.finished" /></span>
+					</html:link>
 				</c:otherwise>
 			</c:choose>
 		</div>
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -rea7d6cda8f074703c5ec5c7c11d9fee013673a1c -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision ea7d6cda8f074703c5ec5c7c11d9fee013673a1c)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -153,11 +153,11 @@
 
 			<c:if test="${generalLearnerFlowDTO.showOtherAnswers != 'true'}">
 				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
-					<html:button property="endLearning" styleId="finishButton"
+					<html:link href="javascript:;" property="endLearning" styleId="finishButton"
 						onclick="javascript:submitMethod('storeAllResults');"
 						styleClass="button">
-						<fmt:message key="button.endLearning" />
-					</html:button>
+						<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+					</html:link>
 				</c:if>
 
 				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -rbdc34fafe00498fac147e8e9bad7d897ccaa3fc0 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision bdc34fafe00498fac147e8e9bad7d897ccaa3fc0)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -195,11 +195,11 @@
 
 						<div class="space-bottom-top" align="right">
 							<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
-								<html:button property="endLearning" styleId="finishButton"
+								<html:link href="javascript:;" property="endLearning" styleId="finishButton"
 									onclick="javascript:submitMethod('endLearning');"
 									styleClass="button">
-									<fmt:message key="button.endLearning" />
-								</html:button>
+									<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+								</html:link>
 							</c:if>
 
 							<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r0b11fde95e5fc5820969dd4f7f664dd5a3ae8617 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 0b11fde95e5fc5820969dd4f7f664dd5a3ae8617)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -79,11 +79,11 @@
 				styleClass="text-area"></html:textarea>
 
 			<div class="space-bottom-top align-right">
-				<html:button property="submitReflection" styleId="finishButton"
+				<html:link href="javascript:;" property="submitReflection" styleId="finishButton"
 					onclick="javascript:submitMethod('submitReflection');"
 					styleClass="button">
-					<fmt:message key="button.endLearning" />
-				</html:button>
+					<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+				</html:link>
 			</div>
 		</div>
 	</html:form>
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -rbdc34fafe00498fac147e8e9bad7d897ccaa3fc0 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision bdc34fafe00498fac147e8e9bad7d897ccaa3fc0)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -202,11 +202,11 @@
 						</c:if>						
 
 						<div class="space-bottom-top" align="right">
-								<html:button property="endLearning" styleId="finishButton"
+								<html:link href="javascript:;" property="endLearning" styleId="finishButton"
 									onclick="javascript:submitMethod('endLearning');"
 									styleClass="button">
-									<fmt:message key="button.endLearning" />
-								</html:button>
+									<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+								</html:link>
 						</div>
 					</c:if>
 				</c:if>
Index: lams_tool_laqa/web/learning/RunOffline.jsp
===================================================================
diff -u -r0a2c5eab4581d401b0543a77b6c62c7c883bb7a2 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 0a2c5eab4581d401b0543a77b6c62c7c883bb7a2)
+++ lams_tool_laqa/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -76,11 +76,11 @@
 			<div class="space-bottom-top align-right">
 
 				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
-					<html:button property="endLearning" styleId="finishButton"
+					<html:link href="javascript:;" property="endLearning" styleId="finishButton"
 						onclick="javascript:submitMethod('endLearning');"
 						styleClass="button">
-						<fmt:message key="button.endLearning" />
-					</html:button>
+						<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+					</html:link>
 				</c:if>
 
 				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
Index: lams_tool_notebook/web/pages/learning/notebook.jsp
===================================================================
diff -u -rb0dcb38987a64f7df435ccf3e2beabe7ac54d8fb -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision b0dcb38987a64f7df435ccf3e2beabe7ac54d8fb)
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -36,7 +36,10 @@
 			}
 		}
 	}
-
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 -->
 </script>
 
@@ -65,7 +68,7 @@
 	&nbsp;
 
 	<html:form action="/learning" method="post"
-		onsubmit="return validateForm();">
+		onsubmit="return validateForm();" styleId="messageForm">
 		<html:hidden property="dispatch" value="finishActivity" />
 		<html:hidden property="toolSessionID" />
 
@@ -89,9 +92,9 @@
 				</c:choose>
 
 				<div class="space-bottom-top align-right">
-					<html:submit styleClass="button" styleId="finishButton">
-						<fmt:message>button.finish</fmt:message>
-					</html:submit>
+					<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					</html:link>
 				</div>
 
 			</c:when>
Index: lams_tool_notebook/web/pages/learning/runOffline.jsp
===================================================================
diff -u -r51039ed503555a34ca6d07b04d4611ebb118c188 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_notebook/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 51039ed503555a34ca6d07b04d4611ebb118c188)
+++ lams_tool_notebook/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -4,6 +4,10 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <div id="content">
@@ -16,14 +20,14 @@
 	</p>
 
 	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 			<html:hidden property="dispatch" value="finishActivity" />
 			<html:hidden property="toolSessionID" />
 
 			<div align="right" class="space-bottom-top">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message>button.finish</fmt:message>
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+				</html:link>
 			</div>
 		</html:form>
 	</c:if>
Index: lams_tool_pixlr/web/pages/learning/notebook.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -30,7 +30,11 @@
 			function disableFinishButton() {
 				document.getElementById("finishButton").disabled = true;
 			}
-		</script>
+		         function submitForm(methodName){
+		                var f = document.getElementById('messageForm');
+		                f.submit();
+		        }
+	</script>
 	
 	<body class="stripes">
 	
@@ -40,7 +44,7 @@
 				${pixlrDTO.title}
 			</h1>
 		
-			<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 				<html:hidden property="mode" value="${mode}" />
 				
@@ -53,9 +57,9 @@
 		
 				<div class="space-bottom-top align-right">
 					<html:hidden property="dispatch" value="submitReflection" />
-					<html:submit styleClass="button" styleId="finishButton">
-						<fmt:message>button.finish</fmt:message>
-					</html:submit>
+					<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+						<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+					</html:link>
 				</div>
 			</html:form>
 				
Index: lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -6,10 +6,14 @@
 			finishButton.disabled = true;
 		}
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <c:if test="${pixlrUserDTO.finishedActivity and pixlrDTO.reflectOnActivity and pixlrUserDTO.finishedReflection}">
-<html:form action="/learning" method="post" styleId="reflectEditForm">
+<html:form action="/learning" method="post" styleId="reflectEditForm" styleId="messageForm">
 	<html:hidden property="dispatch" value="openNotebook" />
 	<html:hidden property="mode" value="${mode}" />	
 	<html:hidden property="toolSessionID" styleId="toolSessionID"/>
@@ -58,9 +62,9 @@
 					</c:when>
 					<c:otherwise>
 						<html:hidden property="dispatch" value="finishActivity" />
-						<html:submit styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity'; ;">
-							<fmt:message key="button.finish" />
-						</html:submit>
+						<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity'; ;">
+							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+						</html:link>
 					</c:otherwise>
 				</c:choose>
 			</c:otherwise>
Index: lams_tool_pixlr/web/pages/learning/runOffline.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_pixlr/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -4,6 +4,10 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <div id="content">
@@ -16,14 +20,14 @@
 	</p>
 
 	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 			<html:hidden property="dispatch" value="finishActivity" />
 			<html:hidden property="toolSessionID" />
 
 			<div align="right" class="space-bottom-top">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message>button.finish</fmt:message>
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+				</html:link>
 			</div>
 		</html:form>
 	</c:if>
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -30,6 +30,10 @@
 			}
 			popupWindow = window.open(url,'popupWindow','resizable,width=' +width+ ',height=' +height+ ',scrollbars');
 		}
+	         function submitForm(methodName){
+	                var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
 	</script>
 	
 	<body class="stripes">
@@ -40,7 +44,7 @@
 				${pixlrDTO.title}
 			</h1>
 		
-			<html:form action="/learning" method="post">
+			<html:form action="/learning" method="post" styleId="messageForm">
 				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 				<html:hidden property="mode" value="${mode}" />
 				<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
@@ -109,9 +113,9 @@
 						</html:submit>
 					</c:when>
 					<c:otherwise>
-						<html:submit styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity';">
-							<fmt:message key="button.finish" />
-						</html:submit>
+						<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity';">
+							<span class="nextActivity"><fmt:message key="button.finish" /></span>
+						</html:link>
 					</c:otherwise>
 				</c:choose>
 				
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -11,14 +11,18 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
+	         function submitForm(methodName){
+	                var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
 	</script>	
 </lams:head>
 
 <body class="stripes">
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
 		<div id="content">
@@ -36,9 +40,9 @@
 				styleClass="text-area" />
 
 			<div class="space-bottom-top align-right">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="button.finish" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message key="button.finish" /></span
+				</html:link>
 			</div>
 	</html:form>
 	<div id="footer"></div>
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
diff -u -r2495e17b412e141f3827b7edee81e43475d16d07 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
+++ lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -71,10 +71,10 @@
 					</html:button>
 				</c:when>
 				<c:otherwise>
-					<html:button property="finishButton" onclick="javascript:finish();"
+					<html:link href="javascript:;" property="finishButton" onclick="javascript:finish();"
 						styleClass="button" styleId="finishButton">
-						<fmt:message key="button.finish" />
-					</html:button>
+						<span class="nextActivity"><fmt:message key="button.finish" /></span>
+					</html:link>
 				</c:otherwise>
 			</c:choose>
 		</div>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r14f8df14c8263fc52c5d3d33dc16ac4e586d8ae4 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 14f8df14c8263fc52c5d3d33dc16ac4e586d8ae4)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -254,11 +254,11 @@
 							</html:button>
 						</c:when>
 						<c:otherwise>
-							<html:button property="finishButton"
+							<html:link href="javascript:;" property="finishButton"
 								onclick="javascript:finish();" styleClass="button"
 								styleId="finishButton">
-								<fmt:message key="button.finish" />
-							</html:button>
+								<span class="nextActivity"><fmt:message key="button.finish" /></span>
+							</html:link>
 						</c:otherwise>
 					</c:choose>
 				</div>
Index: lams_tool_scribe/web/pages/learning/notebook.jsp
===================================================================
diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8)
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -4,6 +4,10 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <div id="content">
@@ -12,7 +16,7 @@
 		${scribeDTO.title}
 	</h1>
 
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="dispatch" value="submitReflection" />
 		<html:hidden property="scribeUserUID" />
 
@@ -24,9 +28,9 @@
 			styleClass="text-area"></html:textarea>
 
 		<div class="space-bottom-top align-right">
-			<html:submit styleClass="button" styleId="finishButton">
-				<fmt:message>button.finish</fmt:message>
-			</html:submit>
+			<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+				<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+			</html:link>
 		</div>
 
 	</html:form>
Index: lams_tool_scribe/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r0edacde89fb315c54ed60643a06ef7d3e7b5bb89 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 0edacde89fb315c54ed60643a06ef7d3e7b5bb89)
+++ lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -7,10 +7,14 @@
 			finishButton.disabled = true;
 		}
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <div class="space-bottom">
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton()">
+	<html:form action="/learning" method="post" onsubmit="disableFinishButton()" styleId="messageForm">
 		<html:hidden property="scribeUserUID" value="${scribeUserDTO.uid}" />
 		<c:choose>
 			<c:when
@@ -24,9 +28,9 @@
 			</c:when>
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
-				<html:submit styleClass="button right-buttons" styleId="finishButton">
-					<fmt:message key="button.finish" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button right-buttons" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message key="button.finish" /></span>
+				</html:link>
 			</c:otherwise>
 		</c:choose>
 	</html:form>
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -r7ad2323d78099d17d6df1936bd1bdabd89483db5 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7ad2323d78099d17d6df1936bd1bdabd89483db5)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -172,9 +172,9 @@
 						</html:button>
 					</c:when>
 					<c:otherwise>
-						<html:button property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button">
-							<fmt:message key="label.finished" />
-						</html:button>
+						<html:link href="javascript:;" property="FinishButton" styleId="finishButton"	onclick="return finishSession()" styleClass="button">
+							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						</html:link>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_spreadsheet/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -12,14 +12,18 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
+	         function submitForm(methodName){
+	                var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
 	</script>
 </lams:head>
 <body class="stripes">
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 	
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
 
@@ -38,9 +42,9 @@
 				styleClass="text-area" />
 
 			<div class="space-bottom-top align-right">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="label.finished" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+				</html:link>
 			</div>
 		</div>
 	</html:form>
Index: lams_tool_spreadsheet/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_spreadsheet/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -52,10 +52,10 @@
 					</c:otherwise>
 				</c:choose>
 
-				<html:button property="FinishButton"
+				<html:link href="javascript:;" property="FinishButton"
 					onclick="return continueReflect()" styleClass="button">
-					<fmt:message key="label.edit" />
-				</html:button>
+					<span class="nextActivity"><fmt:message key="label.edit" /></span>
+				</html:link>
 			</div>
 		</c:if>
 
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -10,14 +10,18 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
+	         function submitForm(methodName){
+	                var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
 	</script>	
 </lams:head>
 <body class="stripes">
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
 
@@ -36,9 +40,9 @@
 				styleClass="text-area" />
 
 			<div class="space-bottom-top align-right">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="label.finish" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton">
+					<span class="nextActivity"><fmt:message key="label.finish" /></span>
+				</html:link>
 			</div>
 
 		</div>
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -rbab78ccaadaf218f40eb0d1c134f6e3276afcb6e -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision bab78ccaadaf218f40eb0d1c134f6e3276afcb6e)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -152,10 +152,10 @@
 									</html:button>
 								</c:when>
 								<c:otherwise>
-									<html:button property="FinishButton" styleId="finishButton"
+									<html:link href="javascript:;" property="FinishButton" styleId="finishButton"
 										onclick="return finishSession()" styleClass="button">
-										<fmt:message key="label.finished" />
-									</html:button>
+										<span class="nextActivity"><fmt:message key="label.finished" /></span>
+									</html:link>
 								</c:otherwise>
 							</c:choose> </span>
 					</td>
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r2495e17b412e141f3827b7edee81e43475d16d07 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -65,10 +65,10 @@
 			<c:choose>
 				<c:when
 					test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-					<html:button property="FinishButton"
+					<html:link href="javascript:;" property="FinishButton"
 						onclick="return continueReflect()" styleClass="button">
-						<fmt:message key="label.continue" />
-					</html:button>
+						<span class="nextActivity"><fmt:message key="label.continue" /></span>
+					</html:link>
 				</c:when>
 				<c:otherwise>
 					<html:button property="FinishButton" styleId="finishButton"
Index: lams_tool_task/web/pages/learning/learning.jsp
===================================================================
diff -u -ra3077b21311eada2fc8f2a67ce86e3326e0e367a -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision a3077b21311eada2fc8f2a67ce86e3326e0e367a)
+++ lams_tool_task/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -200,10 +200,10 @@
 					</c:when>
 					
 					<c:otherwise>
-						<html:button property="FinishButton" styleId="finishButton"
+						<html:link href="javascript:;" property="FinishButton" styleId="finishButton"
 							onclick="return finishSession()" styleClass="button">
-							<fmt:message key="label.finished" />
-						</html:button>
+							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						</html:link>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_task/web/pages/learning/parts/notebook.jsp
===================================================================
diff -u -r341a816804f6b2b61a5f180479b56d8fd0d1ea29 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision 341a816804f6b2b61a5f180479b56d8fd0d1ea29)
+++ lams_tool_task/web/pages/learning/parts/notebook.jsp	(.../notebook.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -12,14 +12,18 @@
 		function disableFinishButton() {
 			document.getElementById("finishButton").disabled = true;
 		}
+	         function submitForm(methodName){
+	                var f = document.getElementById('messageForm');
+	                f.submit();
+	        }
 	</script>
 </lams:head>
 <body class="stripes">
 
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 	
-	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();">
+	<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="userID" />
 		<html:hidden property="sessionMapID" />
 
@@ -38,9 +42,9 @@
 				styleClass="text-area" />
 
 			<div class="space-bottom-top align-right">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="label.finish" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')>
+					<span class="nextActivity"><fmt:message key="label.finish" /></span>
+				</html:link>
 			</div>
 		</div>
 	</html:form>
Index: lams_tool_task/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rbf2a34df874b866f597400a381ac8dbe692355d8 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision bf2a34df874b866f597400a381ac8dbe692355d8)
+++ lams_tool_task/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -60,10 +60,10 @@
 			<c:choose>
 				<c:when
 					test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
-					<html:button property="FinishButton"
+					<html:link href="javascript:;" property="FinishButton"
 						onclick="return continueReflect()" styleClass="button">
-						<fmt:message key="label.continue" />
-					</html:button>
+						<span class="nextActivity"><fmt:message key="label.continue" /></span>
+					</html:link>
 				</c:when>
 				<c:otherwise>
 					<html:button property="FinishButton" styleId="finishButton"
Index: lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -re1dcf9367f649f3377f37e93da076cb6956cce30 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision e1dcf9367f649f3377f37e93da076cb6956cce30)
+++ lams_tool_videorecorder/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -37,10 +37,14 @@
 			finishButton.disabled = true;
 		}
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <html:form action="/learning" method="post"
-	onsubmit="disableFinishButton();">
+	onsubmit="disableFinishButton();"  styleId="messageForm">
 	<html:hidden property="videoRecorderUserUID" value="${videoRecorderUserDTO.uid}" />
 	<html:hidden property="toolSessionID" value="${toolSessionId}" />
 	<div class="space-bottom-top align-right">
@@ -55,9 +59,9 @@
 			</c:when>
 			<c:otherwise>
 				<html:hidden property="dispatch" value="finishActivity" />
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message key="button.finish" />
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message key="button.finish" /></span>
+				</html:link>
 			</c:otherwise>
 		</c:choose>
 	</div>
Index: lams_tool_videorecorder/web/pages/learning/runOffline.jsp
===================================================================
diff -u -r3d081de4a45da632ee6029251318fac795d41813 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_videorecorder/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision 3d081de4a45da632ee6029251318fac795d41813)
+++ lams_tool_videorecorder/web/pages/learning/runOffline.jsp	(.../runOffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -4,6 +4,10 @@
 	function disableFinishButton() {
 		document.getElementById("finishButton").disabled = true;
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
 </script>
 
 <div id="content">
@@ -16,14 +20,14 @@
 	</p>
 
 	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 			<html:hidden property="dispatch" value="finishActivity" />
 			<html:hidden property="toolSessionID" />
 
 			<div align="right" class="space-bottom-top">
-				<html:submit styleClass="button" styleId="finishButton">
-					<fmt:message>button.finish</fmt:message>
-				</html:submit>
+				<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message>button.finish</fmt:message></span>
+				</html:link>
 			</div>
 		</html:form>
 	</c:if>
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r9c4cf38aadd15baa1d9729353a2b76221334bb44 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -236,11 +236,11 @@
 
 					<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 					<span class="right-buttons">
-						<html:submit property="learnerFinished" styleId="finishButton"
+						<html:link href="javascript:;" property="learnerFinished" styleId="finishButton"
 							onclick="javascript:submitMethod('learnerFinished');"
 							styleClass="button">
-							<fmt:message key="label.finished" />
-						</html:submit>
+							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						</html:link>
 						</span>
 					</c:if>
 
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -rc9cf81413fcc6033ba55bab1277d4106ad57983f -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision c9cf81413fcc6033ba55bab1277d4106ad57983f)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -107,10 +107,10 @@
 					</c:if>
 
 					<div class="space-bottom-top align-right">
-						<html:submit property="learnerFinished" styleClass="button" styleId="finishButton"
+						<html:link href="javascript:;" property="learnerFinished" styleClass="button" styleId="finishButton"
 							onclick="submitMethod('learnerFinished');">
-							<fmt:message key="label.finished" />
-						</html:submit>
+							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						</html:link>
 					</div>
 				</c:if>
 
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r246649a2a628b0948ffe86b10bde311e551841c5 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 246649a2a628b0948ffe86b10bde311e551841c5)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -117,11 +117,11 @@
 				
 				<c:when test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 					<span class="right-buttons">
-						<html:submit property="learnerFinished" styleId="finishButton"
+						<html:link href="javascript:;" property="learnerFinished" styleId="finishButton"
 							onclick="javascript:submitMethod('learnerFinished');"
 							styleClass="button">
-							<fmt:message key="label.finished" />
-						</html:submit>
+							<span class="nextActivity"><fmt:message key="label.finished" /></span>
+						</html:link>
 					</span>
 				</c:when>
 
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -r2e9dc3798ab786dc455c429b78330b253ce8fe49 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 2e9dc3798ab786dc455c429b78330b253ce8fe49)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -104,11 +104,11 @@
 					<fmt:message key="label.retake" />
 				</html:submit>
 
-				<html:submit property="learnerFinished" styleId="finishButton"
+				<html:link href="javascript:;" property="learnerFinished" styleId="finishButton"
 					onclick="javascript:submitMethod('learnerFinished');"
 					styleClass="button">
-					<fmt:message key="label.finished" />
-				</html:submit>
+					<span class="nextActivity"><fmt:message key="label.finished" /></span>
+				</html:link>
 			</div>
 		</html:form>
 
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
diff -u -r0a2c5eab4581d401b0543a77b6c62c7c883bb7a2 -rffa933cf31351c773cee8dba243d7f7fcd269f1e
--- lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision 0a2c5eab4581d401b0543a77b6c62c7c883bb7a2)
+++ lams_tool_vote/web/learning/RunOffline.jsp	(.../RunOffline.jsp)	(revision ffa933cf31351c773cee8dba243d7f7fcd269f1e)
@@ -77,11 +77,11 @@
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection == 'true'}">
-					<html:submit property="forwardtoReflection"
+					<html:link href="javascript:;" property="forwardtoReflection"
 						onclick="javascript:submitMethod('forwardtoReflection');"
 						styleClass="button">
-						<fmt:message key="label.continue" />
-					</html:submit>
+						<span class="nextActivity"><fmt:message key="label.continue" /></span>
+					</html:link>
 				</c:if>
 
 			</div>