Index: lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -ra52b795957248c7cb0f7006ed107eed09031d360 -rd21e7fac21ab19cb876cdf2673297d3204614828
--- lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision a52b795957248c7cb0f7006ed107eed09031d360)
+++ lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
@@ -45,11 +45,11 @@
 	<div id="content">
 
 		<h1>
-			${title}
+			<c:out value="${title}" escapeXml="true"/>
 		</h1>
 		
 		<div>
-			${instructions}
+			<c:out value="${instructions}" escapeXml="false"/>
 		</div>
 		
 		<c:if test="${spreadsheet.lockWhenFinished || spreadsheet.learnerAllowedToSave || spreadsheet.markingEnabled || spreadsheet.reflectOnActivity}">
Index: lams_tool_spreadsheet/web/pages/export/summarylist.jsp
===================================================================
diff -u -r961ab730601111c25f9d6dfc93584f685e985d54 -rd21e7fac21ab19cb876cdf2673297d3204614828
--- lams_tool_spreadsheet/web/pages/export/summarylist.jsp	(.../summarylist.jsp)	(revision 961ab730601111c25f9d6dfc93584f685e985d54)
+++ lams_tool_spreadsheet/web/pages/export/summarylist.jsp	(.../summarylist.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
@@ -103,7 +103,7 @@
 		
 	<c:forEach var="reflectDTO" items="${summary.reflectDTOList}">
 			<h4>
-				${reflectDTO.fullName}
+				<c:out value="${reflectDTO.fullName}" escapeXml="true"/>
 			</h4>
 			<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
 	</c:forEach>
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -rd21e7fac21ab19cb876cdf2673297d3204614828
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
@@ -52,11 +52,11 @@
 
 	<div id="content">
 		<h1>
-			${spreadsheet.title}
+			<c:out value="${spreadsheet.title}" escapeXml="true"/>
 		</h1>
 
 		<p>
-			${spreadsheet.instructions}
+			<c:out value="</c:out> ${spreadsheet.instructions}" escapeXml="false"/>
 		</p>
 
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
@@ -138,7 +138,7 @@
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
-					${sessionMap.reflectInstructions}
+					<lams:out escapeHtml="true" value="${sessionMap.reflectInstructions}"/>
 				</h2>
 
 				<c:choose>
@@ -150,7 +150,7 @@
 					</c:when>
 					<c:otherwise>
 						<p>
-							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}"/>
 						</p>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_spreadsheet/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -rd21e7fac21ab19cb876cdf2673297d3204614828
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
@@ -29,13 +29,13 @@
 
 		<div id="content">
 			<h1>
-				${sessionMap.title}
+				<c:out value="${sessionMap.title}" escapeXml="true"/>
 			</h1>
 
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
-				<lams:out value="${sessionMap.reflectInstructions}" />
+				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -rd21e7fac21ab19cb876cdf2673297d3204614828
--- lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
@@ -15,7 +15,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${spreadsheet.title}" escapeXml="false" />
+			<c:out value="${spreadsheet.title}" escapeXml="true" />
 		</td>
 	</tr>
 
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp
===================================================================
diff -u -r969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d -rd21e7fac21ab19cb876cdf2673297d3204614828
--- lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	(.../notebook.jsp)	(revision 969c6dbe2dfdd2f86096a05d3c59b8ab5f0ef21d)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	(.../notebook.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
@@ -13,18 +13,20 @@
 				<h1>
 					<fmt:message key="page.title.monitoring.view.reflection"/>
 				</h1>
-				${userDTO.fullName}<BR><BR>
+				<div class="space-top space-bottom">
+					<c:out value="${userDTO.fullName}" escapeXml="true"/>
+				</div>
 				<table class="alternative-color" cellspacing="0">
 					<tr>
 						<th class="first">
-							<lams:out value="${userDTO.reflectInstructions}"/>
+							<lams:out value="${userDTO.reflectInstructions}" escapeHtml="true"/>
 						</th>
 					</tr>
 					<tr>
 						<td>
 							<c:choose>
 								<c:when test="${userDTO.finishReflection}">
-									<lams:out value="${userDTO.reflect}"/>
+									<lams:out value="${userDTO.reflect}" escapeHtml="true"/>
 								</c:when>
 								<c:otherwise>
 									<fmt:message key="message.no.reflection.available" />
Index: lams_tool_spreadsheet/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r18509f879e59edff064520ffb7005566c767dc30 -rd21e7fac21ab19cb876cdf2673297d3204614828
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 18509f879e59edff064520ffb7005566c767dc30)
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d21e7fac21ab19cb876cdf2673297d3204614828)
@@ -87,7 +87,38 @@
 	}	
 </script>
 
+<h1>
+	<c:out value="${spreadsheet.title}" escapeXml="true"/>
+</h1>
 
+<div class="instructions space-top">
+	<c:out value="${spreadsheet.instructions}" escapeXml="false"/>
+</div>
+
+<%-- Summary list  --%>
+
+<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />
+<span id="messageArea"></span>
+
+<%@ include file="/common/messages.jsp"%>
+
+<div id="summariesArea">
+	<%@ include file="/pages/monitoring/parts/summarylist.jsp"%>
+</div>
+
+<c:if test="${spreadsheet.markingEnabled}">	
+	<p>
+		<iframe
+			onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
+			id="marksInputArea" name="marksInputArea"
+			style="width:0px;height:0px;border:0px;display:none" frameborder="no"
+			scrolling="no">
+		</iframe>
+	</p>
+</c:if>
+
+
+
 <h1>
 
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
@@ -168,27 +199,15 @@
 				</c:choose>	
 			</td>	
 		</tr>
+		<c:if test="${spreadsheet.reflectOnActivity}">
+		<tr>
+			<td>
+				<fmt:message key="label.monitoring.summary.notebook.reflection" />
+			</td>
+			<td>
+				<lams:out value="${spreadsheet.reflectInstructions}" escapeHtml="true"/>
+			</td>	
+		</tr>
+		</c:if>		
 	</table>
 </div>
-
-<%-- Summary list  --%>
-
-<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />
-<span id="messageArea"></span>
-
-<%@ include file="/common/messages.jsp"%>
-
-<div id="summariesArea">
-	<%@ include file="/pages/monitoring/parts/summarylist.jsp"%>
-</div>
-
-<c:if test="${spreadsheet.markingEnabled}">	
-	<p>
-		<iframe
-			onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
-			id="marksInputArea" name="marksInputArea"
-			style="width:0px;height:0px;border:0px;display:none" frameborder="no"
-			scrolling="no">
-		</iframe>
-	</p>
-</c:if>