Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	9 Aug 2012 21:55:36 -0000	1.2
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	1 Apr 2014 02:28:49 -0000	1.3
@@ -8,7 +8,7 @@
 		<c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
 			<tr>
 				<td style="padding-top:15px; padding-bottom:15px;">
-					${item.title}			
+					<c:out value="${item.title}" escapeXml="true"/>			
 				</td>
 					
 				<td width="20px" style="padding-left:10px; vertical-align:middle; text-align: center;">
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/learning.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_scratchie/web/pages/learning/learning.jsp	13 Jan 2014 14:01:44 -0000	1.16
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	1 Apr 2014 02:28:49 -0000	1.17
@@ -100,7 +100,7 @@
 
 	<div id="content">
 		<h1>
-			${scratchie.title}
+			<c:out value="${scratchie.title}" escapeXml="true"/>
 		</h1>
 		
 		<h4>
@@ -110,7 +110,7 @@
 		</h4>
 
 		<p style="font-style: italic;">
-			${scratchie.instructions}
+			<c:out value="${scratchie.instructions}" escapeXml="false"/>
 		</p>
 		
 		<c:if test="${not empty sessionMap.submissionDeadline}">
Index: lams_tool_scratchie/web/pages/learning/notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/notebook.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_scratchie/web/pages/learning/notebook.jsp	24 Sep 2013 16:49:12 -0000	1.3
+++ lams_tool_scratchie/web/pages/learning/notebook.jsp	1 Apr 2014 02:28:49 -0000	1.4
@@ -28,13 +28,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" styleClass="text-area" />
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/questionlist.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	19 Dec 2013 08:50:10 -0000	1.10
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	1 Apr 2014 02:28:49 -0000	1.11
@@ -56,8 +56,8 @@
 </script>
 
 		<c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
-			<h3>${item.title}</h3>
-			<div>${item.description}</div>
+			<h3><c:out value="${item.title}" escapeXml="true"/></h3>
+			<div><c:out value="${item.description}" escapeXml="false"/></div>
 	
 			<table id="scratches" class="alternative-color">
 				<c:forEach var="answer" items="${item.answers}" varStatus="status">
Index: lams_tool_scratchie/web/pages/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/editactivity.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	8 Aug 2013 12:09:49 -0000	1.2
+++ lams_tool_scratchie/web/pages/monitoring/editactivity.jsp	1 Apr 2014 02:28:49 -0000	1.3
@@ -15,7 +15,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${scratchie.title}" escapeXml="false" />
+			<c:out value="${scratchie.title}" escapeXml="true" />
 		</td>
 	</tr>
 
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp	12 Dec 2013 17:10:24 -0000	1.13
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp	1 Apr 2014 02:28:49 -0000	1.14
@@ -198,11 +198,11 @@
 
 </script>
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<h1><c:out value="${scratchie.title}" escapeXml="true"/></h1>
 
-<%@ include file="parts/advanceOptions.jsp"%>
-
-<%@ include file="parts/dateRestriction.jsp"%>
-
+<div class"instructions space-top space-bottom>
+<c:out value="${scratchie.instructions }" escapeXml="false" />
+</div>
 <c:choose>
 	<c:when test="${empty summaryList}">
 		<div align="center">
@@ -241,7 +241,7 @@
 			<select id="item-uid" style="float: left">
 				<option selected="selected" value="-1"><fmt:message key="label.monitoring.summary.choose" /></option>
     			<c:forEach var="item" items="${scratchie.scratchieItems}">
-					<option value="${item.uid}">${item.title}</option>
+					<option value="${item.uid}"><c:out value="${item.title}" escapeXml="true"/></option>
 			   	</c:forEach>
 			</select>
 			
@@ -259,7 +259,7 @@
 			<select id="userid-dropdown" class="float-left">
 				<option selected="selected" value="-1"><fmt:message key="label.monitoring.summary.choose" /></option>
     			<c:forEach var="learner" items="${sessionMap.learners}">
-					<option value="${learner.userId}" alt="${learner.session.sessionId}">${learner.firstName} ${learner.lastName} (${learner.session.sessionName})</option>
+					<option value="${learner.userId}" alt="${learner.session.sessionId}"><c:out value="${learner.firstName} ${learner.lastName} (${learner.session.sessionName})" escapeXml="true"/></option>
 			   	</c:forEach>
 			</select>
 		</div>
@@ -295,3 +295,8 @@
 	
 	</c:otherwise>
 </c:choose>
+
+
+<%@ include file="parts/advanceOptions.jsp"%>
+
+<%@ include file="parts/dateRestriction.jsp"%>
Index: lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	24 Sep 2013 16:49:12 -0000	1.4
+++ lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	1 Apr 2014 02:28:49 -0000	1.5
@@ -53,7 +53,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>
-					${sessionMap.scratchie.reflectInstructions}	
+					<lams:out value="${sessionMap.scratchie.reflectInstructions}" escapeHtml="true"/>	
 				</td>
 			</tr>
 		</c:when>