Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -r6a00a381d27bc31726597217200978ae4423be7e
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 209087915bc219f430c282ad00e5d1e6462f9b5f)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
@@ -47,6 +47,7 @@
 	<!--  used for updating the the progress bar -->
 	<form-property name="version" type="java.lang.Integer" />
 	<form-property name="progressSummary" type="java.lang.String"/>
+	<form-property name="monitorCanOpenGate" type="java.lang.Boolean"/>
 </form-bean>
 
 <form-bean name="NotebookForm" type="org.apache.struts.action.DynaActionForm">
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -r6a00a381d27bc31726597217200978ae4423be7e
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
@@ -21,6 +21,11 @@
 		org.springframework.web.context.ContextLoaderListener
 	</listener-class>
 </listener>	
+<listener>
+	<listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
+</listener>
 
   <filter>
 	<filter-name>HibernateFilter</filter-name>
@@ -130,7 +135,11 @@
       <servlet-name>groupingExportPortfolio</servlet-name>
       <url-pattern>/groupingExportPortfolio</url-pattern>
    </servlet-mapping>
-   
+
+   <session-config>
+      <session-timeout>120</session-timeout>
+   </session-config>
+
    <!--
    To specify mime mappings, create a file named mime-mappings.xml, put it in your project's mergedir.
    Organize mime-mappings.xml following this DTD slice:
Index: lams_learning/web/branching/preview.jsp
===================================================================
diff -u -r62884e015ef56d80945e9c0007c039c05c1db68a -r6a00a381d27bc31726597217200978ae4423be7e
--- lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 62884e015ef56d80945e9c0007c039c05c1db68a)
+++ lams_learning/web/branching/preview.jsp	(.../preview.jsp)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
@@ -43,6 +43,11 @@
 			return true;
 		}
 	}
+        function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
+
 	//-->
 </script>
 
@@ -131,7 +136,7 @@
 	</div>
 
 	<c:if test="${BranchingForm.map.showFinishButton}">
-		<html:form action="/CompleteActivity" method="post">
+		<html:form action="/CompleteActivity" method="post" styleId="messageForm">
 			<input type="hidden" name="activityID"
 				value="<c:out value='${BranchingForm.map.activityID}' />">
 			<input type="hidden" name="lessonID"
@@ -140,9 +145,9 @@
 				value="<c:out value='${BranchingForm.map.progressID}' />">
 
 			<div class="align-right space-bottom-top">
-				<html:submit styleClass="button">
-					<fmt:message key="label.finish.button" />
-				</html:submit>
+			        <html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					<span class="nextActivity"><fmt:message key="label.finish.button" /></span>
+				</html:link>
 			</div>
 
 		</html:form>
Index: lams_learning/web/grouping/show.jsp
===================================================================
diff -u -r77b8d15134dd7e863fad465642a785f336fa211d -r6a00a381d27bc31726597217200978ae4423be7e
--- lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 77b8d15134dd7e863fad465642a785f336fa211d)
+++ lams_learning/web/grouping/show.jsp	(.../show.jsp)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
@@ -25,7 +25,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>		
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
-	<html:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityID=${activityID}" target="_self">
+	<html:form action="/grouping.do?method=completeActivity&userId=${user.userId}&lessonId=${lesson.lessonId}&activityID=${activityID}" target="_self" styleId="messageForm">
 
 	<div id="content">
 
@@ -56,8 +56,17 @@
 		</table>
 
 	<c:if test="${finishedButton}">
+	      <script type="text/javascript">
+	        function submitForm(methodName){
+                	 var f = document.getElementById('messageForm');
+                	 f.submit();
+		}
+	      </script>
+
 			<table><tr><td><div id="right" class="right-buttons">
-					<html:submit styleClass="button"><fmt:message key="label.finish.button"/></html:submit>
+					<html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+					  <span class="nextActivity"><fmt:message key="label.finish.button"/></span>
+					 </html:link>
 			</div></td></tr></table>
 	</c:if>
 
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r96fe21d3195f7b3ea8932e17caf8dba065cd12bd -r6a00a381d27bc31726597217200978ae4423be7e
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 96fe21d3195f7b3ea8932e17caf8dba065cd12bd)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 6a00a381d27bc31726597217200978ae4423be7e)
@@ -36,6 +36,11 @@
 			return true;
 		}
 	}
+         function submitForm(methodName){
+                var f = document.getElementById('messageForm');
+                f.submit();
+        }
+
 	//-->
 </script>
 
@@ -168,7 +173,15 @@
 	</p>
 
 	<c:if test="${optionsActivityForm.finished}">
-		<html:form action="/CompleteActivity" method="post">
+	      <script language="JavaScript" type="text/JavaScript"><!--
+	           function submitForm(methodName){
+              	       var f = document.getElementById('messageForm');
+                       f.submit();
+        	   }
+		//-->
+	      </script>
+
+		<html:form action="/CompleteActivity" method="post" styleId="messageForm">
 			<input type="hidden" name="lams_token"
 				value="<c:out value='${lams_token}' />">
 			<input type="hidden" name="activityID"
@@ -179,9 +192,9 @@
 				value="<c:out value='${optionsActivityForm.progressID}' />">
 
 			<div class="align-right space-bottom-top">
-				<html:submit styleClass="button">
-					<fmt:message key="label.finish.button" />
-				</html:submit>
+                               <html:link href="javascript:;" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+                                     <span class="nextActivity"><fmt:message key="label.finish.button"/></span>
+                               </html:link>
 			</div>
 
 		</html:form>