Index: lams_tool_wookie/web/pages/authoring/widgetList.jsp
===================================================================
diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037
--- lams_tool_wookie/web/pages/authoring/widgetList.jsp	(.../widgetList.jsp)	(revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a)
+++ lams_tool_wookie/web/pages/authoring/widgetList.jsp	(.../widgetList.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
@@ -15,12 +15,12 @@
 					</tr>
 					<tr align="center">
 						<td class="wookie-title" align="center" valign="top">
-							<a href="javascript:selectWookieWidget('${widget.identifier}')">${widget.title}</a>
+							<a href="javascript:selectWookieWidget('${widget.identifier}')"><c:out value="${widget.title}" escapeXml="true"/></a>
 						</td>
 					</tr>
 					<tr align="center">
 						<td class="wookie-description" align="center" valign="top">
-							${widget.description}
+							<c:out value="${widget.description}" escapeXml="false"/>
 						</td>
 					</tr>				    			    
 				</table>			    
@@ -50,7 +50,7 @@
 					
 					<tr align="center">
 						<td class="wookie-description" align="center" valign="top">
-							${widget.description}
+							<c:out value="${widget.description}" escapeXml="false"/>
 						</td>
 					</tr>				    			    
 				</table>			    
Index: lams_tool_wookie/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r16f19684cdc9d508fab563581a9d12e823f8804d -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037
--- lams_tool_wookie/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 16f19684cdc9d508fab563581a9d12e823f8804d)
+++ lams_tool_wookie/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
@@ -5,7 +5,7 @@
 
 <html>
 <lams:head>
-	<title><c:out value="${wookieDTO.title}" escapeXml="false" /></title>
+	<title><c:out value="${wookieDTO.title}" escapeXml="true" /></title>
 	<lams:css localLinkPath="../" />
 
 	<script type="text/javascript">
@@ -33,7 +33,7 @@
 
 <div id="content">
 
-<h1><c:out value="${wookieDTO.title}" escapeXml="false" /></h1>
+<h1><c:out value="${wookieDTO.title}" escapeXml="true" /></h1>
 
 <p><c:out value="${wookieDTO.instructions}" escapeXml="false" /></p>
 
@@ -111,13 +111,13 @@
 						<c:forEach var="user" items="${session.userDTOs}">
 							<tr>
 								<td>
-									${user.firstName} ${user.lastName}
+									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 								</td>
 								
 									<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" />
@@ -137,7 +137,7 @@
 	<c:otherwise>
 		<br />
 		<h2>
-			${userDTO.firstName} ${userDTO.lastName}
+			<c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/>
 		</h2>
 		
 		<c:choose>
@@ -172,13 +172,13 @@
 			</h2>
 			
 			<h4>
-				${wookieDTO.reflectInstructions}
+				<lams:out value="${wookieDTO.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_wookie/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037
--- lams_tool_wookie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_wookie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
@@ -37,7 +37,7 @@
 			<div id="content">
 			
 			<h1>
-				${wookieDTO.title}
+				<c:out value="${wookieDTO.title}" escapeXml="true"/>
 			</h1>
 		
 			<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
Index: lams_tool_wookie/web/pages/learning/wookie.jsp
===================================================================
diff -u -r705d4b051cba5f8acaf541cd23d0846b92d82869 -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037
--- lams_tool_wookie/web/pages/learning/wookie.jsp	(.../wookie.jsp)	(revision 705d4b051cba5f8acaf541cd23d0846b92d82869)
+++ lams_tool_wookie/web/pages/learning/wookie.jsp	(.../wookie.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
@@ -16,11 +16,11 @@
 
 <div id="content">
 	<h1>
-		${wookieDTO.title}
+		<c:out value="${wookieDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<p>
-		${wookieDTO.instructions}
+		<c:out value="${wookieDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<c:if test="${wookieDTO.lockOnFinish and mode == 'learner'}">
Index: lams_tool_wookie/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r7c52d117dbe910bd67630b5506346429e25b99a9 -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037
--- lams_tool_wookie/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 7c52d117dbe910bd67630b5506346429e25b99a9)
+++ lams_tool_wookie/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
@@ -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_wookie/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037
--- lams_tool_wookie/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_wookie/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
@@ -34,14 +34,14 @@
 					<tr>
 						<td>
 							<h2>
-								${wookieUserDTO.firstName} ${wookieUserDTO.lastName}
+								<c:out value="${wookieUserDTO.firstName} ${wookieUserDTO.lastName}" escapeXml="true"/>
 							</h2>
 						</td>
 					</tr>
 					<tr>
 						<td>
 							<p>
-								<lams:out value="${wookieUserDTO.notebookEntry}" />
+								<lams:out value="${wookieUserDTO.notebookEntry}" escapeHtml="true"/>
 							</p>
 						</td>
 					</tr>
Index: lams_tool_wookie/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r2dafe7131ccf51f9ac062eb9fe3aac6fe63bfa78 -r03c1b10ef9f45b0e2b1c52610d1104716e3a9037
--- lams_tool_wookie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2dafe7131ccf51f9ac062eb9fe3aac6fe63bfa78)
+++ lams_tool_wookie/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 03c1b10ef9f45b0e2b1c52610d1104716e3a9037)
@@ -10,67 +10,7 @@
 	}
 </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>
-</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="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>
-
-
 <html:form action="/monitoring" method="post" styleId="monitoringForm">
 	
 	<html:hidden property="dispatch" styleId="dispatch" />
@@ -127,13 +67,13 @@
 				<c:forEach var="user" items="${session.userDTOs}">
 					<tr>
 						<td>
-							${user.firstName} ${user.lastName}
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 						</td>
 						
 							<td >
 								<c:choose>
 									<c:when test="${user.finishedReflection}">
-										${user.notebookEntry}
+										<lams:out value="${user.notebookEntry}" escapeXml="true"/>
 									</c:when>
 									<c:otherwise>
 										<fmt:message key="label.notAvailable" />
@@ -151,3 +91,65 @@
 	</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="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>
+

- -	- - - - - - - - -
- -	- - - - - - - - -
- -	- ${dto.reflectInstructions} -