Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r070a0493e006b9e6407f000280fd0c94673bf2e8
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	(.../mindmap.jsp)	(revision 070a0493e006b9e6407f000280fd0c94673bf2e8)
@@ -58,11 +58,11 @@
 
 <div id="content">
 	<h1>
-		${mindmapDTO.title}
+		<c:out value="${mindmapDTO.title}" escapeXml="true"/>
 	</h1>
 
 	<p>
-		${mindmapDTO.instructions}
+		<c:out value="${mindmapDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<c:if test="${mindmapDTO.lockOnFinish and mode == 'learner'}">
@@ -152,4 +152,4 @@
 		</c:choose>
 
 	</html:form>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_mindmap/web/pages/learning/reflect.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r070a0493e006b9e6407f000280fd0c94673bf2e8
--- lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_mindmap/web/pages/learning/reflect.jsp	(.../reflect.jsp)	(revision 070a0493e006b9e6407f000280fd0c94673bf2e8)
@@ -12,11 +12,11 @@
 
 <div id="content">
 	<h1>
-		<c:out value="${reflectTitle}" escapeXml="false" />
+		<c:out value="${reflectTitle}" escapeXml="true" />
 	</h1>
 	<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="messageForm">
 		<p>
-			<lams:out value="${reflectInstructions}" />
+			<lams:out value="${reflectInstructions}" escapeHtml="true"/>
 		</p>
 		
 		<c:choose>
Index: lams_tool_mindmap/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r216faf48cfe263a39e62f3ffd4a9f1203348ed53 -r070a0493e006b9e6407f000280fd0c94673bf2e8
--- lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 216faf48cfe263a39e62f3ffd4a9f1203348ed53)
+++ lams_tool_mindmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 070a0493e006b9e6407f000280fd0c94673bf2e8)
@@ -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_mindmap/web/pages/monitoring/reflect.jsp
===================================================================
diff -u -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f -r070a0493e006b9e6407f000280fd0c94673bf2e8
--- lams_tool_mindmap/web/pages/monitoring/reflect.jsp	(.../reflect.jsp)	(revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f)
+++ lams_tool_mindmap/web/pages/monitoring/reflect.jsp	(.../reflect.jsp)	(revision 070a0493e006b9e6407f000280fd0c94673bf2e8)
@@ -1,14 +1,14 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 	<h1>
-		<c:out value="${reflectTitle}" escapeXml="false" />
+		<c:out value="${reflectTitle}" escapeXml="true" />
 	</h1>
 	
 	<h2>
-		${mindmapUser}
+		<c:out value="${mindmapUser}" escapeXml="true"/>
 	</h2>
 	
-	<c:out value="${reflectEntry}" escapeXml="false" />
+	<c:out value="${reflectEntry}" escapeXml="true" />
 		
 	<div align="right" class="space-bottom-top">
 		<html:button styleClass="button" property="backButton" onclick="history.go(-1)">
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r070a0493e006b9e6407f000280fd0c94673bf2e8
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 070a0493e006b9e6407f000280fd0c94673bf2e8)
@@ -35,84 +35,6 @@
 
 
 <c:set var="dto" value="${mindmapDTO}" />
-
-<h1 style="padding-bottom: 10px;">
-	<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>
-
-<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.multiUserMode" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.multiUserMode}">
-					<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.reflectOnActivity" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.reflectOnActivity}">
-					<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="label.notebookInstructions" />
-		</td>
-		
-		<td>
-			${dto.reflectInstructions}
-		</td>
-	</tr>
-	
-</table>
-</div>
-
-<%@include file="dateRestriction.jsp"%>
-
 <c:if test="${empty dto.sessionDTOs}">
 	<p class="warning">
 		<fmt:message key="label.nogroups" />
@@ -160,7 +82,7 @@
 						<c:forEach var="user" items="${session.userDTOs}">
 							<tr>
 								<td width="30%">
-									${user.firstName} ${user.lastName}
+									<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 								</td>
 						
 								<td width="40%">
@@ -204,7 +126,7 @@
 				<c:forEach var="user" items="${session.userDTOs}">
 					<tr>
 						<td width="30%">
-							${user.firstName} ${user.lastName}
+							<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 						</td>
 						
 						<td width="40%">
@@ -241,3 +163,85 @@
 
 	</table>
 </c:forEach>
+
+
+<div class="space-top">
+<h1 style="padding-bottom: 10px;">
+	<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>
+
+<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.multiUserMode" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.multiUserMode}">
+					<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.reflectOnActivity" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${dto.reflectOnActivity}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	  <c:if test="${dto.reflectOnActivity}">	
+		<tr>
+			<td>
+				<fmt:message key="label.notebookInstructions" />
+			</td>
+		
+			<td>
+				<lams:out value="${dto.reflectInstructions}" escapeHtml="true"/>
+			</td>
+		</tr>
+	 </c:if>
+	
+</table>
+</div>
+</div>
+<br/>
+<%@include file="dateRestriction.jsp"%>
+