Index: lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r23d3a9ebc582896d8379f662e312c6d3b383c226 -rb8a1ab746ef08520a4167fa35d3532e8a5c3a73a
--- lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 23d3a9ebc582896d8379f662e312c6d3b383c226)
+++ lams_tool_wiki/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision b8a1ab746ef08520a4167fa35d3532e8a5c3a73a)
@@ -6,8 +6,15 @@
 			finishButton.disabled = true;
 		}
 	}
+	
+	function continueOrFinish(dispatch) {
+		document.getElementById("dispatch2").value = dispatch;
+		document.getElementById("learningButtonForm").submit();
+	}
 </script>
 
+Reflect: ${wikiDTO.reflectOnActivity} <br />
+User:${userDTO.finishedActivity} <br />	
 <c:if test="${userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
 <html:form action="/learning" method="get" styleId="reflectEditForm">
 	<html:hidden property="dispatch" value="openNotebook" />
@@ -38,22 +45,31 @@
 </html:form>
 </c:if>
 
-<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningForm">
-	<html:hidden property="dispatch" styleId = "dispatch" value="finishActivity" />
+${!userDTO.finishedActivity and wikiDTO.reflectOnActivity}
+
+<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="learningButtonForm">
+	<html:hidden property="dispatch" styleId = "dispatch2" value="finishActivity" />
 	<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-	<html:hidden property="markersXML" value="" styleId="markersXML" />
 	<html:hidden property="mode" value="${mode}" />	
 	<div class="space-bottom-top align-right" id="finishButtonDiv">
 		<c:choose>
 			<c:when test="${!userDTO.finishedActivity and wikiDTO.reflectOnActivity}">
+				
+				<a href="javascript:continueOrFinish('openNotebook');" class="button"><fmt:message key="button.continue" /></a>
+				<!--  
 				<html:submit styleClass="button" onclick="javascript:document.getElementById('dispatch').value = 'openNotebook';">
 					<fmt:message key="button.continue" />
 				</html:submit>
+				-->
 			</c:when>
 			<c:otherwise>
+				<a href="javascript:continueOrFinish('finishActivity');" class="button"><fmt:message key="button.finish" /></a>
+				
+				<!-- 
 				<html:submit styleClass="button" styleId="finishButton" onclick="javascript:document.getElementById('dispatch').value = 'finishActivity';">
 					<fmt:message key="button.finish" />
 				</html:submit>
+				-->
 			</c:otherwise>
 		</c:choose>
 	</div>
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -r98272e08314f1487800201921390914652849147 -rb8a1ab746ef08520a4167fa35d3532e8a5c3a73a
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 98272e08314f1487800201921390914652849147)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision b8a1ab746ef08520a4167fa35d3532e8a5c3a73a)
@@ -344,7 +344,7 @@
 		</div>
 		-->
 	</html:form>
-		
+			
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<%@ include file="parts/finishButton.jsp"%>
 	</c:if>