Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
diff -u -ra8324ce68a8de301097e84ef4919751ecd0b8fe8 -rcd91e8c512cb9f4e299672e839e5a949cfe349df
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision a8324ce68a8de301097e84ef4919751ecd0b8fe8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	(.../LearningAction.java)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
@@ -66,7 +66,7 @@
  * @struts.action-forward name="gmap" path="tiles:/learning/main"
  * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
- * @struts.action-forward name="notebook" path="tiles:/learning/notebook"
+ * @struts.action-forward name="notebook" path="/pages/learning/notebook.jsp"
  */
 public class LearningAction extends LamsDispatchAction {
 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
===================================================================
diff -u -ra8324ce68a8de301097e84ef4919751ecd0b8fe8 -rcd91e8c512cb9f4e299672e839e5a949cfe349df
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision a8324ce68a8de301097e84ef4919751ecd0b8fe8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
@@ -62,7 +62,7 @@
  * @struts.action-forward name="success" path="tiles:/monitoring/main"
  * @struts.action-forward name="gmap_display"
  *                        path="tiles:/monitoring/gmap_display"
- * @struts.action-forward name="notebook" path="tiles:/monitoring/notebook"             
+ * @struts.action-forward name="notebook" path="/pages/monitoring/notebook.jsp"             
  * 
  */
 public class MonitoringAction extends LamsDispatchAction {
Index: lams_tool_gmap/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rf2868221badcd51a57e5c5ef3d249b9072b35b74 -rcd91e8c512cb9f4e299672e839e5a949cfe349df
--- lams_tool_gmap/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision f2868221badcd51a57e5c5ef3d249b9072b35b74)
+++ lams_tool_gmap/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
@@ -106,7 +106,7 @@
       />
       <forward
         name="notebook"
-        path="tiles:/learning/notebook"
+        path="/pages/learning/notebook.jsp"
         redirect="false"
       />
     </action>
@@ -131,7 +131,7 @@
       />
       <forward
         name="notebook"
-        path="tiles:/monitoring/notebook"
+        path="/pages/monitoring/notebook.jsp"
         redirect="false"
       />
     </action>
Index: lams_tool_gmap/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r910b2ac5592ed40624543c6e5d22f5a80547d588 -rcd91e8c512cb9f4e299672e839e5a949cfe349df
--- lams_tool_gmap/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 910b2ac5592ed40624543c6e5d22f5a80547d588)
+++ lams_tool_gmap/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
@@ -95,9 +95,6 @@
 		<put name="body" value="/pages/learning/defineLater.jsp" />
 	</definition>
 	
-	<definition name="tiles:/learning/notebook" extends="tiles:/layout:learning">
-		<put name="body" value="/pages/learning/notebook.jsp" />
-	</definition>	
 	<!-- End: Learning -->
 
 
@@ -113,12 +110,6 @@
 		<put name="header" value="tiles:/header:monitoring/main" type="definition" />
 		<!--  put name="body" value="/pages/monitoring/gmapDisplay.jsp" />	-->
 	</definition>
-	
-	<definition name="tiles:/monitoring/notebook" extends="tiles:/layout:default">
-		<put name="pageTitleKey" value="pageTitle.monitoring.notebook"></put>
-		<put name="header" value="tiles:/header:learner"></put>
-		<put name="body" value="/pages/monitoring/notebook.jsp"></put>
-	</definition>
 
 	<definition name="tiles:/header:monitoring/main" extends="tiles:/header:default">
 		<put name="headItems" value="/pages/monitoring/headItems.jsp" />
Index: lams_tool_gmap/web/WEB-INF/web.xml
===================================================================
diff -u -re851ecbb7a28dba597688df7f4466b2ab603405c -rcd91e8c512cb9f4e299672e839e5a949cfe349df
--- lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision e851ecbb7a28dba597688df7f4466b2ab603405c)
+++ lams_tool_gmap/web/WEB-INF/web.xml	(.../web.xml)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
@@ -17,6 +17,7 @@
 				classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
 				classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml
 				classpath:/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml			
+				classpath:/org/lamsfoundation/lams/tool/gmap/dbupdates/autopatchContext.xml	
 	</param-value>
 </context-param>
 
@@ -63,8 +64,8 @@
 </listener>	
 <listener>
 	<listener-class>
- 		org.lamsfoundation.lams.web.SessionListener
- 	</listener-class>
+		org.lamsfoundation.lams.web.session.SetMaxTimeoutListener
+	</listener-class>
 </listener>
 
  <servlet>
@@ -144,6 +145,10 @@
 	<url-pattern>/exportPortfolio</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_tool_gmap/web/pages/learning/notebook.jsp
===================================================================
diff -u -r3813117828096a5d4063e220506bbc6357be2683 -rcd91e8c512cb9f4e299672e839e5a949cfe349df
--- lams_tool_gmap/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 3813117828096a5d4063e220506bbc6357be2683)
+++ lams_tool_gmap/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
@@ -1,38 +1,66 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
 <%@ include file="/common/taglibs.jsp"%>
-<%
-	//String EMPTYMARKERS = "&lt;?xml version=\"1.0\"?&gt;&lt;markers&gt;&lt;/markers&gt;";
-	String EMPTYMARKERS = "<?xml version=\"1.0\"?><markers></markers>";
-	
-%>
-<script type="text/javascript">
-	function disableFinishButton() {
-		document.getElementById("finishButton").disabled = true;
-	}
-</script>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
-<div id="content">
-	<h1>
-		${gmapDTO.title}
-	</h1>
+<lams:html>
 
-	<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
-		<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-		<html:hidden property="markersXML" />
-		<html:hidden property="mode" value="${mode}" />
+	<lams:head>  
+	
+		<title>
+			<fmt:message>pageTitle.monitoring.notebook</fmt:message>
+		</title>
 		
-		<p class="small-space-top">
-			<lams:out value="${gmapDTO.reflectInstructions}" />
-		</p>
-
-		<html:textarea cols="60" rows="8" property="entryText"
-			styleClass="text-area"></html:textarea>
-
-		<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>
-		</div>
-	</html:form>
-</div>
-
+		<link href="${tool}pages/learning/gmap_style.css" rel="stylesheet" type="text/css">
+		<lams:css/>
+		
+		<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+		<script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+		
+	</lams:head>
+	
+	<script type="text/javascript">
+			function disableFinishButton() {
+				document.getElementById("finishButton").disabled = true;
+			}
+		</script>
+	
+	<body class="stripes">
+	
+			<div id="content">
+			
+			<h1>
+				${gmapDTO.title}
+			</h1>
+		
+			<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+				<html:hidden property="markersXML" />
+				<html:hidden property="mode" value="${mode}" />
+				
+				<p class="small-space-top">
+					<lams:out value="${gmapDTO.reflectInstructions}" />
+				</p>
+		
+				<html:textarea cols="60" rows="8" property="entryText"
+					styleClass="text-area"></html:textarea>
+		
+				<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>
+				</div>
+			</html:form>
+				
+			</div>
+			<div class="footer"></div>
+	</body>
+</lams:html>
Index: lams_tool_gmap/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r910b2ac5592ed40624543c6e5d22f5a80547d588 -rcd91e8c512cb9f4e299672e839e5a949cfe349df
--- lams_tool_gmap/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 910b2ac5592ed40624543c6e5d22f5a80547d588)
+++ lams_tool_gmap/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision cd91e8c512cb9f4e299672e839e5a949cfe349df)
@@ -1,19 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+            "http://www.w3.org/TR/html4/loose.dtd">
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
 
-<table>
-	<tr>
-		<td>
-			<h2>
-				${gmapUserDTO.firstName} ${gmapUserDTO.lastName}
-			</h2>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<p>
-				<lams:out value="${gmapUserDTO.notebookEntry}" />
-			</p>
-		</td>
-	</tr>
-</table>
+<lams:html>
 
+	<lams:head>  
+		<title>
+			<fmt:message>pageTitle.monitoring.notebook</fmt:message>
+		</title>
+		
+		<link href="${tool}pages/learning/gmap_style.css" rel="stylesheet" type="text/css">
+		<lams:css/>
+		<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+		<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+
+		
+	</lams:head>
+	
+	
+	<body class="stripes">
+	
+			<div id="content">
+			
+				<h1>
+					<fmt:message>pageTitle.monitoring.notebook</fmt:message>
+				</h1>
+				
+				<table>
+					<tr>
+						<td>
+							<h2>
+								${gmapUserDTO.firstName} ${gmapUserDTO.lastName}
+							</h2>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<p>
+								<lams:out value="${gmapUserDTO.notebookEntry}" />
+							</p>
+						</td>
+					</tr>
+				</table>
+				
+			</div>
+			<div class="footer"></div>
+	</body>
+</lams:html>
+
+
+