Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11)
@@ -85,6 +85,9 @@
 
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_CONTENT_ID));
+		
+		String contentFolderID = WebUtil.readStrParam(request,
+				AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
 		// set up chatService
 		if (chatService == null) {
@@ -145,6 +148,8 @@
 			chatDTO.getSessionDTOs().add(sessionDTO);
 		}
 		request.setAttribute("monitoringDTO", chatDTO);
+		request.setAttribute("contentFolderID", contentFolderID);
+		
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_chat/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r8ef674acd7e6b431329e246ee76ae9d8d689bcd4 -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11
--- lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 8ef674acd7e6b431329e246ee76ae9d8d689bcd4)
+++ lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11)
@@ -28,6 +28,7 @@
 		<c:url value="/authoring.do" var="authoringUrl">
 			<c:param name="toolContentID" value="${dto.toolContentId}" />
 			<c:param name="mode" value="teacher" />
+			<c:param name="contentFolderID" value="${contentFolderID}"></c:param>
 		</c:url>
 		<html:link href="${fn:escapeXml(authoringUrl)}"
 			styleClass="button right-buttons" target="_blank">
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11)
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.tool.notebook.model.NotebookUser;
 import org.lamsfoundation.lams.tool.notebook.service.INotebookService;
 import org.lamsfoundation.lams.tool.notebook.service.NotebookServiceProxy;
+import org.lamsfoundation.lams.tool.notebook.web.forms.MonitoringForm;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -68,6 +69,9 @@
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_CONTENT_ID));
 		
+		String contentFolderID = WebUtil.readStrParam(request,
+				AttributeNames.PARAM_CONTENT_FOLDER_ID);
+				
 		Notebook notebook = notebookService
 				.getNotebookByContentId(toolContentID);
 
@@ -78,6 +82,7 @@
 		NotebookDTO notebookDT0 = new NotebookDTO(notebook);
 
 		request.setAttribute("notebookDTO", notebookDT0);
+		request.setAttribute("contentFolderID", contentFolderID);
 		return mapping.findForward("success");
 	}
 
Index: lams_tool_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r58cfe8c94ee9878fc43820e4f0ae4d1f8a1df35a -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 58cfe8c94ee9878fc43820e4f0ae4d1f8a1df35a)
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11)
@@ -29,6 +29,7 @@
 			<c:url value="/authoring.do" var="authoringUrl">
 				<c:param name="toolContentID" value="${dto.toolContentId}" />
 				<c:param name="mode" value="teacher" />
+				<c:param name="contentFolderID" value="${contentFolderID}" />
 			</c:url>
 			<html:link href="${authoringUrl}" styleClass="button" target="_blank">
 				<fmt:message key="button.editActivity" />
Index: lams_tool_notebook/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r56af73875ad9b4f953d2951479e49dbc1f2715f9 -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11
--- lams_tool_notebook/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 56af73875ad9b4f953d2951479e49dbc1f2715f9)
+++ lams_tool_notebook/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11)
@@ -3,9 +3,15 @@
 <c:set var="dto" value="${notebookDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
-	<h2>
-		${session.sessionName}
-	</h2>
+	<table>
+		<tr>
+			<td>
+				<h2>
+					${session.sessionName}
+				</h2>
+			</td>
+		</tr>
+	</table>
 
 	<table cellpadding="0">
 		<tr>
Index: lams_tool_notebook/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r56af73875ad9b4f953d2951479e49dbc1f2715f9 -r15e9d26c38d7f65fa9a6a465e068255e5d44cd11
--- lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 56af73875ad9b4f953d2951479e49dbc1f2715f9)
+++ lams_tool_notebook/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 15e9d26c38d7f65fa9a6a465e068255e5d44cd11)
@@ -3,9 +3,15 @@
 <c:set var="dto" value="${notebookDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
-	<h2>
-		${session.sessionName}
-	</h2>
+	<table>
+		<tr>
+			<td>
+				<h2>
+					${session.sessionName}
+				</h2>
+			</td>
+		</tr>
+	</table>
 
 	<table cellpadding="0">
 		<tr>