Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/notebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_chat/web/pages/learning/notebook.jsp	3 Dec 2006 03:31:51 -0000	1.8
+++ lams_tool_chat/web/pages/learning/notebook.jsp	1 Mar 2009 01:42:35 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/learning/parts/finishButton.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	29 Apr 2008 01:24:28 -0000	1.12
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	1 Mar 2009 01:42:36 -0000	1.13
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/includes/css/daco.css,v
diff -u -r1.6 -r1.7
--- lams_tool_daco/web/includes/css/daco.css	28 Feb 2009 11:11:47 -0000	1.6
+++ lams_tool_daco/web/includes/css/daco.css	1 Mar 2009 01:40:46 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/includes/images/next.png,v
diff -u
Binary files differ
Index: lams_tool_daco/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/learning.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_daco/web/pages/learning/learning.jsp	14 Nov 2008 05:29:46 -0000	1.7
+++ lams_tool_daco/web/pages/learning/learning.jsp	1 Mar 2009 01:40:47 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/notebook.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/learning/notebook.jsp	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/web/pages/learning/notebook.jsp	1 Mar 2009 01:40:47 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_daco/web/pages/learning/runoffline.jsp	12 Aug 2008 01:43:04 -0000	1.3
+++ lams_tool_daco/web/pages/learning/runoffline.jsp	1 Mar 2009 01:40:47 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/notebook.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/web/jsps/learning/notebook.jsp	29 Apr 2008 01:24:26 -0000	1.9
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	1 Mar 2009 01:44:28 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/Attic/runoffline.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_forum/web/jsps/learning/runoffline.jsp	3 Dec 2006 03:33:43 -0000	1.12
+++ lams_tool_forum/web/jsps/learning/runoffline.jsp	1 Mar 2009 01:44:28 -0000	1.13
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	2 Feb 2009 03:21:24 -0000	1.29
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	1 Mar 2009 01:44:28 -0000	1.30
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/learning.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_images/web/pages/learning/learning.jsp	25 Dec 2008 14:28:02 -0000	1.12
+++ lams_tool_images/web/pages/learning/learning.jsp	1 Mar 2009 01:47:06 -0000	1.13
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/notebook.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_images/web/pages/learning/notebook.jsp	11 Oct 2008 12:04:14 -0000	1.1
+++ lams_tool_images/web/pages/learning/notebook.jsp	1 Mar 2009 01:47:07 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_images/web/pages/learning/runoffline.jsp	18 Nov 2008 14:55:43 -0000	1.2
+++ lams_tool_images/web/pages/learning/runoffline.jsp	1 Mar 2009 01:47:07 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.32 -r1.33
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	1 May 2008 01:25:08 -0000	1.32
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	1 Mar 2009 01:47:51 -0000	1.33
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.36 -r1.37
--- lams_tool_laqa/web/learning/LearnerRep.jsp	30 Apr 2008 06:10:45 -0000	1.36
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	1 Mar 2009 01:47:51 -0000	1.37
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Notebook.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_laqa/web/learning/Notebook.jsp	8 Feb 2008 06:56:34 -0000	1.11
+++ lams_tool_laqa/web/learning/Notebook.jsp	1 Mar 2009 01:47:51 -0000	1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	30 Apr 2008 06:10:45 -0000	1.15
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	1 Mar 2009 01:47:51 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_laqa/web/learning/RunOffline.jsp	4 Jan 2008 01:44:13 -0000	1.15
+++ lams_tool_laqa/web/learning/RunOffline.jsp	1 Mar 2009 01:47:51 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_notebook/web/pages/learning/notebook.jsp	2 May 2008 07:00:36 -0000	1.20
+++ lams_tool_notebook/web/pages/learning/notebook.jsp	1 Mar 2009 01:45:36 -0000	1.21
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/Attic/runOffline.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_notebook/web/pages/learning/runOffline.jsp	4 Jan 2008 01:42:51 -0000	1.7
+++ lams_tool_notebook/web/pages/learning/runOffline.jsp	1 Mar 2009 01:45:36 -0000	1.8
@@ -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_sbmt/web/learner/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/notebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/learner/notebook.jsp	8 Jun 2007 01:40:14 -0000	1.8
+++ lams_tool_sbmt/web/learner/notebook.jsp	1 Mar 2009 01:46:24 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/runoffline.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_sbmt/web/learner/runoffline.jsp	29 Apr 2008 01:24:27 -0000	1.15
+++ lams_tool_sbmt/web/learner/runoffline.jsp	1 Mar 2009 01:46:24 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.25 -r1.26
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	6 May 2008 02:46:46 -0000	1.25
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	1 Mar 2009 01:46:24 -0000	1.26
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/notebook.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_scribe/web/pages/learning/notebook.jsp	3 Dec 2006 03:32:27 -0000	1.6
+++ lams_tool_scribe/web/pages/learning/notebook.jsp	1 Mar 2009 01:43:34 -0000	1.7
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/parts/finishButton.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	16 Nov 2007 07:51:56 -0000	1.10
+++ lams_tool_scribe/web/pages/learning/parts/finishButton.jsp	1 Mar 2009 01:43:34 -0000	1.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/learning.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	24 Jul 2008 01:58:30 -0000	1.3
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	1 Mar 2009 01:49:17 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/notebook.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	4 Jul 2008 07:40:28 -0000	1.1
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	1 Mar 2009 01:49:17 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/pages/learning/runoffline.jsp	4 Jul 2008 07:40:28 -0000	1.1
+++ lams_tool_spreadsheet/web/pages/learning/runoffline.jsp	1 Mar 2009 01:49:17 -0000	1.2
@@ -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_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.40 -r1.41
--- lams_tool_vote/web/learning/AllNominations.jsp	13 May 2008 07:23:20 -0000	1.40
+++ lams_tool_vote/web/learning/AllNominations.jsp	1 Mar 2009 01:50:18 -0000	1.41
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.29 -r1.30
--- lams_tool_vote/web/learning/ExitLearning.jsp	9 May 2008 06:52:21 -0000	1.29
+++ lams_tool_vote/web/learning/ExitLearning.jsp	1 Mar 2009 01:50:18 -0000	1.30
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	12 May 2008 05:19:26 -0000	1.30
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	1 Mar 2009 01:50:18 -0000	1.31
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedAllNominations.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	26 Mar 2008 04:09:09 -0000	1.10
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	1 Mar 2009 01:50:18 -0000	1.11
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/learning/RunOffline.jsp	4 Jan 2008 01:44:30 -0000	1.10
+++ lams_tool_vote/web/learning/RunOffline.jsp	1 Mar 2009 01:50:18 -0000	1.11
@@ -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>