Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java
===================================================================
diff -u -r84283f3449a27ed45130e07c53d2cefc451ba537 -r893a9fc55bf32709c48cc4c1e235d1191beaf085
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java	(.../ScribeDTO.java)	(revision 84283f3449a27ed45130e07c53d2cefc451ba537)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeDTO.java	(.../ScribeDTO.java)	(revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
@@ -63,6 +63,12 @@
 
 	public Set<ScribeSessionDTO> sessionDTOs = new TreeSet<ScribeSessionDTO>();
 	
+	public Set<ScribeHeadingDTO> headingDTOs = new TreeSet<ScribeHeadingDTO>();
+	
+	public boolean autoSelectScribe;
+	
+	
+	
 	public ScribeDTO(Scribe scribe) {
 		toolContentId = scribe.getToolContentId();
 		title = scribe.getTitle();
@@ -90,9 +96,6 @@
 			}
 		}
 		
-		logger.debug("Scribe contains " + scribe.getScribeHeadings().size() + " headings");
-		
-		logger.debug("Scribe uid = " + scribe.getUid());
 	}
 
 	public Set<ScribeSessionDTO> getSessionDTOs() {
@@ -192,4 +195,12 @@
 	public void setReflectOnActivity(boolean reflectOnActivity) {
 		this.reflectOnActivity = reflectOnActivity;
 	}
+
+	public boolean isAutoSelectScribe() {
+		return autoSelectScribe;
+	}
+
+	public void setAutoSelectScribe(boolean autoSelectScribe) {
+		this.autoSelectScribe = autoSelectScribe;
+	}
 }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
===================================================================
diff -u -r84283f3449a27ed45130e07c53d2cefc451ba537 -r893a9fc55bf32709c48cc4c1e235d1191beaf085
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java	(.../ScribeSessionDTO.java)	(revision 84283f3449a27ed45130e07c53d2cefc451ba537)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java	(.../ScribeSessionDTO.java)	(revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
@@ -31,6 +31,7 @@
 
 import org.lamsfoundation.lams.tool.scribe.model.ScribeReportEntry;
 import org.lamsfoundation.lams.tool.scribe.model.ScribeSession;
+import org.lamsfoundation.lams.tool.scribe.model.ScribeUser;
 
 public class ScribeSessionDTO implements Comparable {
 	
@@ -44,12 +45,21 @@
 	
 	int numberOfLearners;
 	
+	String appointedScribe;
+	
 	Set<ScribeReportEntryDTO> reportDTOs;
 	
 	public ScribeSessionDTO(ScribeSession session) {
 		this.sessionID = session.getSessionId();
 		this.sessionName = session.getSessionName();
 		
+		ScribeUser appointedScribe = session.getAppointedScribe();
+		if (appointedScribe == null) {
+			this.appointedScribe = null;
+		} else {
+			this.appointedScribe = appointedScribe.getFirstName() + " " + appointedScribe.getLastName();
+		}
+				
 		userDTOs = new TreeSet<ScribeUserDTO>();
 		reportDTOs = new TreeSet<ScribeReportEntryDTO>();
 		
@@ -121,4 +131,12 @@
 	public void setReportDTOs(Set<ScribeReportEntryDTO> reportDTOs) {
 		this.reportDTOs = reportDTOs;
 	}
+
+	public String getAppointedScribe() {
+		return appointedScribe;
+	}
+
+	public void setAppointedScribe(String appointedScribe) {
+		this.appointedScribe = appointedScribe;
+	}
 }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r893a9fc55bf32709c48cc4c1e235d1191beaf085
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
@@ -25,7 +25,6 @@
 package org.lamsfoundation.lams.tool.scribe.web.actions;
 
 import java.util.Iterator;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +44,7 @@
 import org.lamsfoundation.lams.tool.scribe.service.IScribeService;
 import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy;
 import org.lamsfoundation.lams.tool.scribe.util.ScribeConstants;
+import org.lamsfoundation.lams.tool.scribe.web.forms.MonitoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -59,10 +59,6 @@
  *                name="monitoringForm" validate="false"
  * 
  * @struts.action-forward name="success" path="tiles:/monitoring/main"
- * @struts.action-forward name="scribe_client"
- *                        path="tiles:/monitoring/scribe_client"
- * @struts.action-forward name="scribe_history"
- *                        path="tiles:/monitoring/scribe_history"
  * 
  * @struts.action-forward name="notebook" path="tiles:/monitoring/notebook"
  * 
@@ -86,6 +82,49 @@
 					.getServletContext());
 		}
 		Scribe scribe = scribeService.getScribeByContentId(toolContentID);
+			
+		ScribeDTO scribeDTO = setupScribeDTO(scribe);
+		
+		request.setAttribute("monitoringDTO", scribeDTO);
+		return mapping.findForward("success");
+	}
+	
+	public ActionForward openNotebook(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) {
+		
+		Long uid = WebUtil.readLongParam(request, "uid", false);
+		
+		ScribeUser scribeUser = scribeService.getUserByUID(uid);
+		NotebookEntry notebookEntry = scribeService.getEntry(scribeUser.getScribeSession().getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, ScribeConstants.TOOL_SIGNATURE, scribeUser.getUserId().intValue());
+		
+		ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
+		scribeUserDTO.setNotebookEntry(notebookEntry.getEntry());
+		
+		request.setAttribute("scribeUserDTO", scribeUserDTO);
+		
+		return mapping.findForward("notebook");
+	}
+
+	public ActionForward appointScribe(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		
+		MonitoringForm monForm = (MonitoringForm)form;
+		
+		ScribeSession session = scribeService.getSessionBySessionId(monForm.getToolSessionID());
+		ScribeUser user = scribeService.getUserByUID(monForm.getAppointedScribeUID());
+		
+		session.setAppointedScribe(user);
+		scribeService.saveOrUpdateScribeSession(session);
+		
+		ScribeDTO scribeDTO = setupScribeDTO(session.getScribe());
+		
+		request.setAttribute("monitoringDTO", scribeDTO);
+		return mapping.findForward("success");
+	}
+	
+	/* Private Methods */
+
+	private ScribeDTO setupScribeDTO(Scribe scribe) {
 		ScribeDTO scribeDTO = new ScribeDTO(scribe);
 
 		for (Iterator sessIter = scribe.getScribeSessions().iterator(); sessIter
@@ -115,29 +154,11 @@
 
 			scribeDTO.getSessionDTOs().add(sessionDTO);
 		}
-		request.setAttribute("monitoringDTO", scribeDTO);
-		return mapping.findForward("success");
-	}
-	
-	public ActionForward openNotebook(ActionMapping mapping,
-			ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
 		
-		Long uid = WebUtil.readLongParam(request, "uid", false);
+		return scribeDTO;
 		
-		ScribeUser scribeUser = scribeService.getUserByUID(uid);
-		NotebookEntry notebookEntry = scribeService.getEntry(scribeUser.getScribeSession().getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, ScribeConstants.TOOL_SIGNATURE, scribeUser.getUserId().intValue());
-		
-		ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
-		scribeUserDTO.setNotebookEntry(notebookEntry.getEntry());
-		
-		request.setAttribute("scribeUserDTO", scribeUserDTO);
-		
-		return mapping.findForward("notebook");
 	}
-
-	/* Private Methods */
-
+	
 	private ScribeUser getCurrentUser(Long toolSessionId) {
 		UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(
 				AttributeNames.USER);
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r893a9fc55bf32709c48cc4c1e235d1191beaf085
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java	(.../MonitoringForm.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java	(.../MonitoringForm.java)	(revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
@@ -36,6 +36,7 @@
 	
 	String dispatch;
 	Long toolSessionID;
+	Long appointedScribeUID;
 
 	public String getDispatch() {
 		return dispatch;
@@ -49,4 +50,10 @@
 	public void setToolSessionID(Long toolSessionID) {
 		this.toolSessionID = toolSessionID;
 	}
+	public Long getAppointedScribeUID() {
+		return appointedScribeUID;
+	}
+	public void setAppointedScribeUID(Long appointedScribeUID) {
+		this.appointedScribeUID = appointedScribeUID;
+	}
 }
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
diff -u -r84283f3449a27ed45130e07c53d2cefc451ba537 -r893a9fc55bf32709c48cc4c1e235d1191beaf085
--- lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 84283f3449a27ed45130e07c53d2cefc451ba537)
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
@@ -16,9 +16,9 @@
 		<html:hidden property="mode"></html:hidden>
 
 		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-			<h2>
+			<h3>
 				${reportDTO.headingDTO.headingText}
-			</h2>
+			</h3>
 
 			<p>
 				<lams:out value="${reportDTO.entryText}" />
Index: lams_tool_scribe/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r893a9fc55bf32709c48cc4c1e235d1191beaf085
--- lams_tool_scribe/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
@@ -9,44 +9,6 @@
 					<h2>${session.sessionName}</h2>
 				</td>
 			</tr>
-
-			<tr>
-				<td class="field-name" style="width: 30%;">
-					<fmt:message>heading.totalLearners</fmt:message>
-				</td>
-				<td>
-					${session.numberOfLearners}
-				</td>
-			</tr>
-
-			<tr>
-				<td class="field-name" style="width: 30%;">
-					<fmt:message>heading.totalMessages</fmt:message>
-				</td>
-				<td>
-					${session.numberOfPosts}
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					<fmt:message>heading.learner</fmt:message>
-				</th>
-				<th>
-					<fmt:message>heading.numPosts</fmt:message>
-				</th>
-			</tr>
-
-			<c:forEach var="user" items="${session.userDTOs}">
-				<tr>
-					<td>
-						${user.jabberNickname}
-					</td>
-					<td>
-						${user.postCount}
-					</td>
-				</tr>
-			</c:forEach>
 		</tbody>
 	</table>
 	<hr/>
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r893a9fc55bf32709c48cc4c1e235d1191beaf085
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
@@ -12,45 +12,66 @@
 		</tr>
 
 		<tr>
-			<td class="field-name" style="width: 30%;">
-				<fmt:message>heading.totalLearners</fmt:message>
-			</td>
-			<td colspan="2">
-				${session.numberOfLearners}
-			</td>
-		</tr>
+			<td>
+				<c:choose>
+					<c:when
+						test="${(not dto.autoSelectScribe) and  session.appointedScribe eq null}">
 
-		<tr>
-			<td class="field-name" style="width: 30%;">
-				<fmt:message>heading.totalMessages</fmt:message>
-			</td>
-			<td colspan="2">
-				${session.numberOfPosts}
-			</td>
-		</tr>
+						<c:choose>
+							<c:when test="${not empty session.userDTOs}">
+								<html:form action="/monitoring">
+								
+									<html:hidden property="toolSessionID"
+										value="${session.sessionID}" />
+									<html:hidden property="dispatch" value="appointScribe" />
+								
+									?Please select a scribe:?
 
-		<tr>
-			<td colspan="3">
-				<h4>
-					<fmt:message>heading.recentMessages</fmt:message>
-				</h4>
-			</td>
-		</tr>
+									<html:select property="appointedScribeUID" style="min-width: 150px;">
+										<c:forEach var="user" items="${session.userDTOs}">
+											<html:option value="${user.uid}">
+												${user.firstName} ${user.lastName}
+											</html:option>
+										</c:forEach>
+									</html:select>
 
-		<tr>
-			<td colspan="3">
-				<c:choose>
-					<c:when test="${empty session.messageDTOs}">
-						<fmt:message>message.noScribeMessages</fmt:message>
+									<div>
+										<input type="submit" value="?submit?" class="button" />
+									</div>
+
+								</html:form>
+							</c:when>
+
+							<c:otherwise>
+								?No users available?
+							</c:otherwise>
+
+						</c:choose>
+
 					</c:when>
+
 					<c:otherwise>
-						<c:forEach var="message" items="${session.messageDTOs}">
-							<div class="message">
-								<div class="messageFrom"> ${message.from} </div>
-								<lams:out value="${message.body}"></lams:out>
-							</div>
-						</c:forEach>
+						<div class="field-name" style="text-align: left">
+							?Appointed Scribe?
+						</div>
 
+						<p>
+							${session.appointedScribe}
+						</p>
+
+						<div class="field-name" style="text-align: left">
+							?Report?
+						</div>
+						<hr />
+						<c:forEach var="report" items="${session.reportDTOs}">
+							<p>
+								<lams:out value="${report.headingDTO.headingText}" />
+							</p>
+							<p>
+								<lams:out value="${report.entryText}" />
+							</p>
+							<hr />
+						</c:forEach>
 					</c:otherwise>
 				</c:choose>
 			</td>
@@ -79,8 +100,8 @@
 							<fmt:message key="heading.reflection" />
 						</c:when>
 						<c:otherwise>
-						&nbsp;
-					</c:otherwise>
+							&nbsp;
+						</c:otherwise>
 					</c:choose>
 				</th>
 			</tr>
@@ -110,34 +131,5 @@
 				</tr>
 			</c:forEach>
 		</c:if>
-		<tr>
-			<td colspan="3">
-				<div>
-					<html:form action="/monitoring" method="get" target="_blank"
-						style="float:left; margin-right: 4px">
-						<div>
-							<html:hidden property="dispatch" value="openScribeHistory" />
-							<html:hidden property="toolSessionID"
-								value="${session.sessionID}" />
-							<html:submit styleClass="button">
-								<fmt:message>summary.editMessages</fmt:message>
-							</html:submit>
-						</div>
-					</html:form>
-
-					<html:form action="/learning" method="get" target="_blank">
-						<div>
-							<html:hidden property="toolSessionID"
-								value="${session.sessionID}" />
-							<html:hidden property="mode" value="teacher" />
-							<html:submit styleClass="button">
-								<fmt:message>summary.openScribe</fmt:message>
-							</html:submit>
-						</div>
-					</html:form>
-				</div>
-			</td>
-		</tr>
 	</table>
-	<hr />
 </c:forEach>