Index: lams_tool_pixlr/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r63ab4413a66861635ecc8d57de6256e4aefed77b
--- lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
+++ lams_tool_pixlr/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
@@ -56,7 +56,7 @@
 
 <div id="content">
 
-<h1><c:out value="${pixlrDTO.title}" escapeXml="false" /></h1>
+<h1><c:out value="${pixlrDTO.title}" escapeXml="true" /></h1>
 
 <p><c:out value="${pixlrDTO.instructions}" escapeXml="false" /></p>
 
@@ -124,7 +124,7 @@
 						<c:if test="${pixlrDTO.reflectOnActivity}">
 							<td><c:choose>
 								<c:when test="${user.finishedReflection}">
-															${user.notebookEntry}
+															<lams:out value="${user.notebookEntry}" escapeHtml="true"/>
 														</c:when>
 								<c:otherwise>
 									<fmt:message key="label.notAvailable" />
@@ -141,7 +141,7 @@
 	<c:otherwise>
 		<br />
 		<h2>
-			${userDTO.firstName} ${userDTO.lastName}
+			<c:out value="${userDTO.firstName} ${userDTO.lastName}"/>
 		</h2>
 		<c:choose>
 			<c:when
@@ -161,13 +161,13 @@
 			</h2>
 			
 			<h4>
-				${pixlrDTO.reflectInstructions}
+				<lams:out value="${pixlrDTO.reflectInstructions}" escapeHtml="true"/>
 			</h4>
 			
 			<c:choose>
 				<c:when test="${userDTO.finishedReflection}">
 					<p>
-						${userDTO.notebookEntry}
+						<lams:out value="${userDTO.notebookEntry}" escapeHtml="true"/>
 					</p>
 				</c:when>
 				<c:otherwise>
Index: lams_tool_pixlr/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r63ab4413a66861635ecc8d57de6256e4aefed77b
--- lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_pixlr/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
@@ -36,15 +36,15 @@
 			<div id="content">
 			
 			<h1>
-				${pixlrDTO.title}
+				<c:out value="${pixlrDTO.title}" escapeXml="true"/>
 			</h1>
 		
 			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
 				<html:hidden property="mode" value="${mode}" />
 				
 				<p class="small-space-top">
-					<lams:out value="${pixlrDTO.reflectInstructions}" />
+					<lams:out value="${pixlrDTO.reflectInstructions}" escapeHtml="true"/>
 				</p>
 		
 				<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_pixlr/web/pages/learning/pixlr.jsp
===================================================================
diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r63ab4413a66861635ecc8d57de6256e4aefed77b
--- lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
+++ lams_tool_pixlr/web/pages/learning/pixlr.jsp	(.../pixlr.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
@@ -28,11 +28,11 @@
 
 <div id="content">
 	<h1>
-		${pixlrDTO.title}
+		<c:out value="${pixlrDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<p>
-		${pixlrDTO.instructions}
+		<c:out value="${pixlrDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<c:if test="${pixlrDTO.lockOnFinish and mode == 'learner'}">
Index: lams_tool_pixlr/web/pages/learning/viewAll.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r63ab4413a66861635ecc8d57de6256e4aefed77b
--- lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_pixlr/web/pages/learning/viewAll.jsp	(.../viewAll.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
@@ -40,7 +40,7 @@
 			<div id="content">
 			
 			<h1>
-				${pixlrDTO.title}
+				<c:out value="${pixlrDTO.title}" escapeXml="true"/>
 			</h1>
 		
 			<html:form action="/learning" method="post" styleId="messageForm">
@@ -58,7 +58,7 @@
 								<tr>
 									<td width="30%">
 										<a href="javascript:openPopup('${pixlrImageFolderURL}/${learner.imageFileName}', ${learner.imageHeight}, ${learner.imageWidth})">
-										${learner.firstName} ${learner.lastName}
+										<c:out value="${learner.firstName} ${learner.lastName}" escapeXml="true"/>
 										</a>
 									</td>
 									<td>
Index: lams_tool_pixlr/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -rb703d43cf69269e0afcc716321fd5ef42c249a43 -r63ab4413a66861635ecc8d57de6256e4aefed77b
--- lams_tool_pixlr/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision b703d43cf69269e0afcc716321fd5ef42c249a43)
+++ lams_tool_pixlr/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
@@ -15,7 +15,7 @@
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
-				<c:out value="${dto.title}" escapeXml="false" />
+				<c:out value="${dto.title}" escapeXml="true" />
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_pixlr/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -r63ab4413a66861635ecc8d57de6256e4aefed77b
--- lams_tool_pixlr/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b)
+++ lams_tool_pixlr/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 63ab4413a66861635ecc8d57de6256e4aefed77b)
@@ -12,82 +12,12 @@
 </script>
 
 <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>
+	<c:out value="${dto.title}" escapeXml="true" />
 </h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-
-	<tr>
-		<td>
-			<fmt:message key="advanced.lockOnFinished" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.lockOnFinish}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="advanced.allowViewOthersImages" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.allowViewOthersImages}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	<tr>
-		<td>
-			<fmt:message key="monitor.summary.td.addNotebook" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.reflectOnActivity == true}">
-					<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="${dto.reflectOnActivity == true}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					${dto.reflectInstructions}	
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
+<div class="instructions small-space-top">
+	<c:out value="${dto.instructions}" escapeXml="false" />	
 </div>
-
-
+<br/>
 <html:form action="/monitoring" method="post" styleId="monitoringForm">
 	
 	<html:hidden property="dispatch" styleId="dispatch" value="toggleHideImage" />
@@ -127,7 +57,7 @@
 				<tr>
 					<td>
 						<a href="javascript:openPopup('${pixlrImageFolderURL}/${user.imageFileName}', ${user.imageHeight}, ${user.imageWidth})">
-							${user.firstName} ${user.lastName}
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 						</a>
 					</td>
 					<td align="center">
@@ -163,7 +93,7 @@
 						<td >
 							<c:choose>
 								<c:when test="${user.finishedReflection}">
-									${user.notebookEntry}
+									<lams:out escapeHtml="true" value="${user.notebookEntry}" />
 								</c:when>
 								<c:otherwise>
 									<fmt:message key="label.notAvailable" />
@@ -178,3 +108,81 @@
 	</c:forEach>
 
 </html:form>
+
+
+<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="advanced.lockOnFinished" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.lockOnFinish}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<fmt:message key="advanced.allowViewOthersImages" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.allowViewOthersImages}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<fmt:message key="monitor.summary.td.addNotebook" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.reflectOnActivity == true}">
+					<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="${dto.reflectOnActivity == true}">
+			<tr>
+				<td>
+					<fmt:message key="monitor.summary.td.notebookInstructions" />
+				</td>
+				<td>
+					<lams:out value="${dto.reflectInstructions}" escapeHtml="true"/>	
+				</td>
+			</tr>
+		</c:when>
+	</c:choose>
+</table>
+</div>
+