Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -rcdb76dbb596251251a6b98f692775396ecc675f3
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision cdb76dbb596251251a6b98f692775396ecc675f3)
@@ -19,7 +19,7 @@
 <div id="content">
 
 	<h1>
-		<c:out value="${NbLearnerForm.title}" escapeXml="false" />
+		<c:out value="${NbLearnerForm.title}" escapeXml="true" />
 	</h1>
 
 	<p>
@@ -42,7 +42,7 @@
 		<c:if test="${userFinished and reflectOnActivity}">
 			<div class="small-space-top">
 				<h2>
-					${reflectInstructions}
+					<lams:out value="${reflectInstructions}"/>
 				</h2>
 
 				<c:choose>
Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp
===================================================================
diff -u -r0e74773075ee5caec97c424a716df82265e1ba48 -rcdb76dbb596251251a6b98f692775396ecc675f3
--- lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
+++ lams_tool_nb/web/monitoring/m_EditActivity.jsp	(.../m_EditActivity.jsp)	(revision cdb76dbb596251251a6b98f692775396ecc675f3)
@@ -12,7 +12,7 @@
 					<fmt:message key="basic.title" />
 				</td>
 				<td>
-					<c:out value="${formBean.title}" escapeXml="false" />
+					<c:out value="${formBean.title}" escapeXml="true" />
 				</td>
 			</tr>
 			<tr>
Index: lams_tool_nb/web/monitoring/m_Summary.jsp
===================================================================
diff -u -r0e74773075ee5caec97c424a716df82265e1ba48 -rcdb76dbb596251251a6b98f692775396ecc675f3
--- lams_tool_nb/web/monitoring/m_Summary.jsp	(.../m_Summary.jsp)	(revision 0e74773075ee5caec97c424a716df82265e1ba48)
+++ lams_tool_nb/web/monitoring/m_Summary.jsp	(.../m_Summary.jsp)	(revision cdb76dbb596251251a6b98f692775396ecc675f3)
@@ -1,62 +1,15 @@
 <%@ include file="/includes/taglibs.jsp"%>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 	
-<h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+	<H2><c:out value="${formBean.title}" escapeXml="true" /></H2>
+	<div class="space-top"><c:out value="${formBean.basicContent}" escapeXml="false" /></div>
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-	
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${reflectOnActivity}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<c:choose>
-		<c:when test="${reflectOnActivity}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					${reflectInstructions}	
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
-</div>	
-	
-	
-	<p>&nbsp;</p>
-
-	<H2><c:out value="${formBean.title}" escapeXml="false" /></H2>
-	<p><c:out value="${formBean.basicContent}" escapeXml="false" /></p>
-
 	<H2><fmt:message key="titleHeading.statistics"/></H2>
 	<%@ include file="m_Statistics.jsp"%>
 
 	<c:if test="${reflectOnActivity}" >
 		<H2><fmt:message key="titleHeading.reflections"/></H2>
-		<table>
+		<table class="alternative-color">
 		<c:forEach var="reflection" items="${reflections}">
 			<logic:empty name="reflections">
 				<tr>
@@ -83,4 +36,45 @@
 		</table>
 		
 	</c:if>
-	
\ No newline at end of file
+	
+<h1>
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.th.advancedSettings" />
+	</a>
+</h1>
+<br />
+
+<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+<table class="alternative-color">
+	
+	<tr>
+		<td>
+			<fmt:message key="monitor.summary.td.addNotebook" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${reflectOnActivity}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<c:if test="${reflectOnActivity}">
+		<tr>
+			<td>
+				<fmt:message key="monitor.summary.td.notebookInstructions" />
+			</td>
+			<td>
+				<lams:out value="${reflectInstructions}" escapeHtml="true"/>
+			</td>
+		</tr>
+	</c:if>
+</table>
+</div>	
Index: lams_tool_nb/web/monitoring/monitoring.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rcdb76dbb596251251a6b98f692775396ecc675f3
--- lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_nb/web/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision cdb76dbb596251251a6b98f692775396ecc675f3)
@@ -66,7 +66,7 @@
 			<div id="content">
 				<lams:help toolSignature="<%= NoticeboardConstants.TOOL_SIGNATURE %>" module="monitoring"/>
 				
-				<lams:TabBody id="1" titleKey="titleHeading.summary" page="m_Summary.jsp" />
+				<lams:TabBody id="1" titleKey="titleHeading.summary" page="m_Summary.jsp" /> 
 				<lams:TabBody id="2" titleKey="titleHeading.editActivity" page="m_EditActivity.jsp" />
 				<lams:TabBody id="3" titleKey="titleHeading.statistics" page="m_Statistics.jsp" />
 			</div>
Index: lams_tool_nb/web/monitoring/reflection.jsp
===================================================================
diff -u -r93aa85a72fd9f1ae7500829c8371d4b90765a1b1 -rcdb76dbb596251251a6b98f692775396ecc675f3
--- lams_tool_nb/web/monitoring/reflection.jsp	(.../reflection.jsp)	(revision 93aa85a72fd9f1ae7500829c8371d4b90765a1b1)
+++ lams_tool_nb/web/monitoring/reflection.jsp	(.../reflection.jsp)	(revision cdb76dbb596251251a6b98f692775396ecc675f3)
@@ -25,18 +25,18 @@
 		</h1>
 		
 		<!-- if nbEntry is empty, display 'has not reflected' message -->
-		<table>
+		<table class="alternative-color">
 			<tr>
-				<td>
-					<h2>
+				<th>
+					<b>
 						<c:out value="${name}" />
-					</h2>
-				</td>
+					</b>
+				</th>
 			</tr>
 			<tr>
 				<td>
 					<p>
-						<lams:out value="${nbEntry}" />
+						<lams:out value="${nbEntry}" escapeHtml="true" />
 					</p>
 				</td>
 			</tr>
Index: lams_tool_nb/web/reflect.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -rcdb76dbb596251251a6b98f692775396ecc675f3
--- lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_nb/web/reflect.jsp	(.../reflect.jsp)	(revision cdb76dbb596251251a6b98f692775396ecc675f3)
@@ -13,12 +13,12 @@
 
 <div id="content">
 <h1>
-	<c:out value="${title}" escapeXml="false" />
+	<c:out value="${title}" escapeXml="true" />
 </h1>
 
 	<html:form action="/learner" method="post" onsubmit="disableFinishButton();" styleId="learnerForm">
 	 
-		<p><lams:out value="${reflectInstructions}" /></p>				
+		<p><lams:out value="${reflectInstructions}" escapeHtml="true"/></p>				
 			 
 		<html:textarea cols="60" rows="8" property="reflectionText" value="${reflectEntry}" styleClass="text-area"></html:textarea>