Index: lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp	18 Jun 2013 07:51:15 -0000	1.4
+++ lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp	1 Apr 2014 17:49:23 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/export/summarylist.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_spreadsheet/web/pages/export/summarylist.jsp	23 Jul 2008 04:19:15 -0000	1.2
+++ lams_tool_spreadsheet/web/pages/export/summarylist.jsp	1 Apr 2014 17:49:23 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/learning.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp	9 Apr 2013 12:47:21 -0000	1.7
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp	1 Apr 2014 17:49:23 -0000	1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/notebook.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_spreadsheet/web/pages/learning/notebook.jsp	9 Apr 2013 12:47:21 -0000	1.5
+++ lams_tool_spreadsheet/web/pages/learning/notebook.jsp	1 Apr 2014 17:49:23 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	4 Jul 2008 07:40:25 -0000	1.1
+++ lams_tool_spreadsheet/web/pages/monitoring/editactivity.jsp	1 Apr 2014 17:49:23 -0000	1.2
@@ -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/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/summary.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	23 Jul 2008 09:03:27 -0000	1.6
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	1 Apr 2014 17:49:23 -0000	1.7
@@ -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>
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/parts/Attic/notebook.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	14 Jul 2008 04:32:53 -0000	1.2
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp	1 Apr 2014 17:49:23 -0000	1.3
@@ -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" />