Index: lams_tool_survey/web/pages/authoring/parts/instructions.jsp
===================================================================
diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8)
+++ lams_tool_survey/web/pages/authoring/parts/instructions.jsp	(.../instructions.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -7,6 +7,10 @@
 		<input type="hidden" name="instructionCount" id="instructionCount">
 		<table id="questionTable">
 			<c:forEach var="item" items="${instructionList}" varStatus="status">
+				<c:set var="item">
+					<c:out value="${item}" escapeXml="true"/>
+				</c:set>
+					
 				<tr id="instructionItem${status.index}">
 					<td width="3px">
 						${status.index+1}
Index: lams_tool_survey/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
+++ lams_tool_survey/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -29,7 +29,7 @@
 				</td>
 
 				<td>
-					${question.shortTitle}
+					<c:out value="${question.shortTitle}" escapeXml="true"/>
 				</td>
 
 				<td width="80px" align="center">
Index: lams_tool_survey/web/pages/learning/learning.jsp
===================================================================
diff -u -r13b73687bb274100057f20c3e95518d005a11675 -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 13b73687bb274100057f20c3e95518d005a11675)
+++ lams_tool_survey/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -46,14 +46,13 @@
 
 		<div id="content">
 			<h1>
-				${sessionMap.title}
+				<c:out value="${sessionMap.title}" escapeXml="true"/>
 			</h1>
 			<p>
 				<c:out value="${sessionMap.instructions}" escapeXml="false" />
 			</p>
 			<c:if test="${not empty sessionMap.submissionDeadline}">
 				<div class="info">
-					<fmt:message key="authoring.info.teacher.set.restriction" >
 						<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
 					</fmt:message>
 				</div>
Index: lams_tool_survey/web/pages/learning/notebook.jsp
===================================================================
diff -u -rc36dbb20e331722ae474d623bb7b7983f5680dcf -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision c36dbb20e331722ae474d623bb7b7983f5680dcf)
+++ lams_tool_survey/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -27,11 +27,11 @@
 
 		<div id="content">
 			<h1>
-				${sessionMap.title}
+				<c:out value="${sessionMap.title}" escapeXml="true"/>
 			</h1>
 
 			<p>
-				<lams:out value="${sessionMap.reflectInstructions}" />
+				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true" />
 			</p>
 			
 			<%@ include file="/common/messages.jsp"%>
Index: lams_tool_survey/web/pages/learning/question.jsp
===================================================================
diff -u -r7e3ed7aa6da2aaca0745a19e148b8b6013e340db -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 7e3ed7aa6da2aaca0745a19e148b8b6013e340db)
+++ lams_tool_survey/web/pages/learning/question.jsp	(.../question.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -31,13 +31,13 @@
 				<c:when test="${question.type == 1}">
 					<input type="radio" name="optionChoice${question.uid}" class="noBorder"
 						value="${option.uid}" ${checked} />
-					${option.description}
+					<c:out value="${option.description}" escapeXml="true"/>
 				</c:when>
 				<c:when test="${question.type == 2}">
 					<input type="checkbox" class="noBorder"
 					 name="optionChoice${question.uid}"
 						value="${option.uid}" ${checked}/>
-					${option.description}
+					<c:out value="${option.description}" escapeXml="true"/>
 				</c:when>
 			</c:choose>
 		</p>
@@ -51,7 +51,7 @@
 	</c:if>
 	<c:if test="${question.appendText}">
 		<c:set var="jsfunc" value="" />
-		<%-- for single choice question, use javascript to ensure only one optino or openText can be chosen --%>
+		<%-- for single choice question, use javascript to ensure only one option or openText can be chosen --%>
 		<c:if test="${question.type == 1}">
 			<c:set var="jsfunc" value="onclick=\" singleChoice('optionChoice${question.uid}')\""/>
 		</c:if>
@@ -66,3 +66,4 @@
 	</c:if>
 
 </div>
+
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -36,7 +36,7 @@
 
 	<div id="content">
 		<h1>
-			${sessionMap.title}
+			<c:out value="${sessionMap.title}" escapeXml="true"/>
 		</h1>
 		<p>
 			<c:out value="${sessionMap.instructions}" escapeXml="false" />
@@ -89,19 +89,19 @@
 							</c:if>
 
 							<c:if test="${checked}">
-								${option.description}
+								<c:out value="${option.description}" escapeXml="true"/>
 							</c:if>
 						</div>
 					</c:forEach>
 
 				</p>
 				<c:if test="${question.type == 3}">
-					<lams:out value="${answerText}" />
+					<lams:out value="${answerText}" escapeHtml="true"/>
 				</c:if>
 
 				<c:if test="${question.appendText && (not empty answerText)}">
 					<fmt:message key="label.append.text" />
-					<lams:out value="${answerText}" />
+					<lams:out value="${answerText}" escapeHtml="true" />
 				</c:if>
 			</div>
 		</c:forEach>
@@ -116,7 +116,7 @@
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
-					${sessionMap.reflectInstructions}
+					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 				</h2>
 
 				<c:choose>
Index: lams_tool_survey/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -ref6e02043e1d828aa7ce68fbe4083db70196f3fd -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision ef6e02043e1d828aa7ce68fbe4083db70196f3fd)
+++ lams_tool_survey/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -9,7 +9,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${survey.title}" escapeXml="false" />
+			<c:out value="${survey.title}" escapeXml="true" />
 		</td>
 	</tr>
 
Index: lams_tool_survey/web/pages/monitoring/listanswers.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/monitoring/listanswers.jsp	(.../listanswers.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_survey/web/pages/monitoring/listanswers.jsp	(.../listanswers.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -37,7 +37,7 @@
 								<%= SurveyConstants.OPTION_SHORT_HEADER %>${optStatus.count}
 							</td>
 							<td>
-								${option.description}
+								<c:out value="${option.description}" escapeXml="true"/>
 							</td>
 						</tr>
 					</c:forEach>
@@ -93,7 +93,7 @@
 							<c:if test="${question.appendText ||question.type == 3}">
 								<td>
 									<c:if test="${not empty question.answer}">
-										<lams:out value="${question.answer.answerText}"/>
+										<lams:out value="${question.answer.answerText}" escapeHtml="true"/>
 									</c:if>
 									&nbsp;
 								</td>
Index: lams_tool_survey/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r6fd79355e0da0b563663468f2bb85ef424152d1c -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 6fd79355e0da0b563663468f2bb85ef424152d1c)
+++ lams_tool_survey/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -13,18 +13,18 @@
 			<h1>
 				<fmt:message key="page.title.monitoring.view.reflection"/>
 			</h1>
-				${userDTO.fullName}<BR><BR>
+				<c:out value="${userDTO.fullName}" escapeXml="true"/><BR><BR>
 				<table class="alternative-color" cellspacing="0">
 					<tr>
 						<th class="first">
-							<lams:out value="${userDTO.reflectInstrctions}"/>
+							<lams:out value="${userDTO.reflectInstrctions}" 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.not.available" />
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rdb4fc43d6e110f7298d227fae4683af2e1e681f3 -r40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf
--- lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision db4fc43d6e110f7298d227fae4683af2e1e681f3)
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 40c565b9307a4b3fcc2f724b1baf104c6c8a2dcf)
@@ -44,103 +44,6 @@
 	}
 </script>
 
-<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>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.advance.lock.on.finished" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.survey.lockWhenFinished}">
-					<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.authoring.advance.show.on.one.page" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.survey.showOnePage}">
-					<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.authoring.advanced.notify.onanswersubmit" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.survey.notifyTeachersOnAnswerSumbit}">
-					<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="${sessionMap.survey.reflectOnActivity}">
-					<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="${sessionMap.survey.reflectOnActivity}">
-			<tr>
-				<td>
-					<fmt:message key="monitor.summary.td.notebookInstructions" />
-				</td>
-				<td>
-					${sessionMap.survey.reflectInstructions}	
-				</td>
-			</tr>
-		</c:when>
-	</c:choose>
-</table>
-</div>
-
-<%@include file="daterestriction.jsp"%>
-
-<br />
-
 <c:if test="${empty summaryList}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
@@ -178,7 +81,7 @@
 			<tr>
 				<th class="first" colspan="2">
 					<a href="javascript:;" onclick="launchPopup('<c:url value="/monitoring/listAnswers.do?"/>toolSessionID=${surveySession.sessionId}&questionUid=${question.uid}')">
-						${question.shortTitle}
+						${question.shortTitle} 
 					</a>
 					<div style="float:right">
 					<%-- Only show pie/bar chart when question is single/multiple choics type --%>
@@ -194,7 +97,7 @@
 			<c:set var="optSize" value="${fn:length(question.options)}" />
 			<c:forEach var="option" items="${question.options}"  varStatus="optStatus">
 				<tr>
-					<td>${option.description}</td>
+					<td><c:out value="${option.description}" escapeXml="true"/></td>
 					<td>
 						<c:set var="imgTitle">
 							<fmt:message key="message.learner.choose.answer.percentage">
@@ -298,4 +201,102 @@
 						</td>
 					</tr>		
 			</table>
-	</c:forEach>
\ No newline at end of file
+	</c:forEach>
+	
+<br />	
+	
+<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>
+<br />
+
+<div class="monitoring-advanced" id="advancedDiv" style="display:none">
+<table class="alternative-color">
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.advance.lock.on.finished" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.survey.lockWhenFinished}">
+					<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.authoring.advance.show.on.one.page" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.survey.showOnePage}">
+					<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.authoring.advanced.notify.onanswersubmit" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.survey.notifyTeachersOnAnswerSumbit}">
+					<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="${sessionMap.survey.reflectOnActivity}">
+					<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="${sessionMap.survey.reflectOnActivity}">
+			<tr>
+				<td>
+					<fmt:message key="monitor.summary.td.notebookInstructions" />
+				</td>
+				<td>
+					<lams:out value="${sessionMap.survey.reflectInstructions}" escapeHtml="true"/>
+				</td>
+			</tr>
+		</c:when>
+	</c:choose>
+</table>
+</div>
+
+<%@include file="daterestriction.jsp"%>
+	
\ No newline at end of file