Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.81 -r1.82
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	6 Mar 2014 22:43:34 -0000	1.81
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	2 Apr 2014 15:04:59 -0000	1.82
@@ -620,8 +620,8 @@
 			reflectionDTO.setSessionId(voteSession.getVoteSessionId().toString());
 			reflectionDTO.setUserName(user.getFullname());
 			reflectionDTO.setReflectionUid(notebookEntry.getUid().toString());
-			String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
-			reflectionDTO.setEntry(notebookEntryPresentable);
+			//String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
+			reflectionDTO.setEntry(notebookEntry.getEntry());
 			reflectionsContainerDTO.add(reflectionDTO);
 		    }
 		}
@@ -642,8 +642,8 @@
 			    reflectionDTO.setSessionId(voteSession.getVoteSessionId().toString());
 			    reflectionDTO.setUserName(user.getFullname());
 			    reflectionDTO.setReflectionUid(notebookEntry.getUid().toString());
-			    String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
-			    reflectionDTO.setEntry(notebookEntryPresentable);
+			    // String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
+			    reflectionDTO.setEntry(notebookEntry.getEntry());
 			    reflectionsContainerDTO.add(reflectionDTO);
 			}
 		    }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java,v
diff -u -r1.57 -r1.58
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	6 Mar 2014 22:43:33 -0000	1.57
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	2 Apr 2014 15:04:59 -0000	1.58
@@ -143,8 +143,8 @@
 	voteService.prepareChartData(request, toolContentID, toolSessionUid, voteGeneralLearnerFlowDTO);
 
 	voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
-	String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
-	voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+	//String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+	voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
 
 	voteLearningForm.resetCommands();
 
@@ -260,8 +260,8 @@
 	setContentInUse(request, voteService, toolContentID);
 
 	voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
-	String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
-	voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+	//String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+	voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
 
 	voteLearningForm.resetCommands();
 
@@ -311,8 +311,8 @@
 	voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions());
 
 	voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
-	String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
-	voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+	//String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+	voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
 
 	request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
 
@@ -576,6 +576,7 @@
 	voteLearningForm.setUserID(userID);
 
 	String reflectionEntry = request.getParameter(ENTRY_TEXT);
+	logger.info("reflection entry: " + reflectionEntry);
 
 	voteService.createNotebookEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, MY_SIGNATURE,
 		new Integer(userID), reflectionEntry);
@@ -597,9 +598,9 @@
 	voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle());
 
 	String reflectionSubject = voteContent.getReflectionSubject();
-	reflectionSubject = VoteUtils.replaceNewLines(reflectionSubject);
+	//reflectionSubject = VoteUtils.replaceNewLines(reflectionSubject);
 
-	voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+	voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
 
 	String userID = request.getParameter("userID");
 	voteLearningForm.setUserID(userID);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v
diff -u -r1.58 -r1.59
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	6 Mar 2014 22:43:33 -0000	1.58
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	2 Apr 2014 15:04:59 -0000	1.59
@@ -164,8 +164,8 @@
 	voteGeneralLearnerFlowDTO.setToolContentUID(voteContent.getUid().toString());
 
 	voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
-	String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
-	voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
+	//String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
+	voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject());
 
 	String mode = voteLearningForm.getLearningMode();
 	voteGeneralLearnerFlowDTO.setLearningMode(mode);
@@ -174,8 +174,8 @@
 	NotebookEntry notebookEntry = voteService.getEntry(new Long(toolSessionID),
 		CoreNotebookConstants.NOTEBOOK_TOOL, VoteAppConstants.MY_SIGNATURE, new Integer(userId));
 	if (notebookEntry != null) {
-	    String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
-	    voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
+	    //String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
+	    voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry());
 	}
 
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.57 -r1.58
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	6 Mar 2014 22:43:33 -0000	1.57
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	2 Apr 2014 15:04:59 -0000	1.58
@@ -208,8 +208,8 @@
 
 	VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO();
 	if (notebookEntry != null) {
-	    String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
-	    voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
+	    //String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry());
+	    voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry());
 	    voteGeneralLearnerFlowDTO.setUserName(userName);
 	}
 	request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
@@ -454,8 +454,8 @@
 			voteMonitoredUserDTO.setSessionId(sessionId.toString());
 			voteMonitoredUserDTO.setResponse(voteUsrResp.getUserEntry());
 
-			String responsePresentable = VoteUtils.replaceNewLines(voteUsrResp.getUserEntry());
-			voteMonitoredUserDTO.setResponsePresentable(responsePresentable);
+			// String responsePresentable = VoteUtils.replaceNewLines(voteUsrResp.getUserEntry());
+			voteMonitoredUserDTO.setResponsePresentable(voteUsrResp.getUserEntry());
 
 			voteMonitoredUserDTO.setQuestionUid(questionUid);
 			voteMonitoredUserDTO.setVisible(new Boolean(voteUsrResp.isVisible()).toString());
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v
diff -u -r1.49 -r1.50
--- lams_tool_vote/web/authoring/BasicContent.jsp	4 Jan 2012 02:28:09 -0000	1.49
+++ lams_tool_vote/web/authoring/BasicContent.jsp	2 Apr 2014 15:04:59 -0000	1.50
@@ -136,14 +136,14 @@
 	<c:if
 		test="${voteGeneralAuthoringDTO.activeModule == 'authoring' || voteGeneralAuthoringDTO.activeModule == 'defineLater'}">
 		<a
-			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+			href="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.nomination" /> </a>
 	</c:if>
 	<c:if
 		test="${voteGeneralAuthoringDTO.activeModule != 'authoring' && voteGeneralAuthoringDTO.activeModule != 'defineLater'}">
 		<a
-			href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');"
+			href="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newNominationBox&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}}"/>');"
 			class="button-add-item"> <fmt:message
 				key="label.add.new.nomination" /> </a>
 	</c:if>
Index: lams_tool_vote/web/authoring/BasicContentViewOnly.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/Attic/BasicContentViewOnly.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	23 Nov 2006 07:07:28 -0000	1.14
+++ lams_tool_vote/web/authoring/BasicContentViewOnly.jsp	2 Apr 2014 15:04:59 -0000	1.15
@@ -29,7 +29,7 @@
 								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
-						  			<c:out value="${voteGeneralAuthoringDTO.activityTitle}" escapeXml="false"/> 								
+						  			<c:out value="${voteGeneralAuthoringDTO.activityTitle}" escapeXml="true"/> 								
 							</td>
 						</tr>
 						
Index: lams_tool_vote/web/authoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/itemlist.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_vote/web/authoring/itemlist.jsp	25 Sep 2013 10:56:11 -0000	1.13
+++ lams_tool_vote/web/authoring/itemlist.jsp	2 Apr 2014 15:04:59 -0000	1.14
@@ -90,7 +90,7 @@
 				<td width="10%" class="align-right">
 					<img src="<c:out value="${tool}"/>images/edit.gif" border="0"
 						title="<fmt:message key='label.tip.editNomination'/>"
-						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableNominationBox&questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');">
+						onclick="javascript:showMessage('<html:rewrite page="/authoring.do?dispatch=newEditableNominationBox&questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}"/>');">
 				</td>
 
 				<td width="10%" class="align-right">
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/export/ExportContent.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_vote/web/export/ExportContent.jsp	6 Mar 2014 22:43:33 -0000	1.24
+++ lams_tool_vote/web/export/ExportContent.jsp	2 Apr 2014 15:04:59 -0000	1.25
@@ -85,11 +85,11 @@
 					
 		<tr>							
 			<td>
-				<c:out value="${userName}" escapeXml="false"/> 
+				<c:out value="${userName}" escapeXml="true"/> 
 			</td>
 
 			<td>
-				<c:out value="${entry}" escapeXml="false"/> 
+				<c:out value="${entry}" escapeXml="true"/> 
 			</td>
 		</tr>	
 	</c:forEach>		
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.54 -r1.55
--- lams_tool_vote/web/learning/AllNominations.jsp	28 Jan 2014 23:05:52 -0000	1.54
+++ lams_tool_vote/web/learning/AllNominations.jsp	2 Apr 2014 15:04:58 -0000	1.55
@@ -61,7 +61,7 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 
 		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
@@ -216,12 +216,12 @@
 			<c:forEach var="entry"
 				items="${requestScope.listGeneralCheckedOptionsContent}">
 				<div>
-					<c:out value="${entry}" escapeXml="false" />
+					<c:out value="${entry}" escapeXml="true" />
 				</div>
 			</c:forEach>
 
 			<div>
-				<c:out value="${VoteLearningForm.userEntry}" />
+				<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
 			</div>
 
 
@@ -232,7 +232,7 @@
 				</h2>
 	
 				<p>
-					<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false" />
+					<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
 				</p>
 			</c:if>							
 
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v
diff -u -r1.38 -r1.39
--- lams_tool_vote/web/learning/AnswersContent.jsp	22 Jan 2014 14:10:50 -0000	1.38
+++ lams_tool_vote/web/learning/AnswersContent.jsp	2 Apr 2014 15:04:58 -0000	1.39
@@ -139,7 +139,7 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 
 		<html:form onsubmit="return validate();" action="/learning?validate=false&dispatch=continueOptionsCombined" method="POST" target="_self">
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v
diff -u -r1.37 -r1.38
--- lams_tool_vote/web/learning/ExitLearning.jsp	2 Jan 2014 23:12:49 -0000	1.37
+++ lams_tool_vote/web/learning/ExitLearning.jsp	2 Apr 2014 15:04:58 -0000	1.38
@@ -66,7 +66,7 @@
 
 		<h1>
 			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}"
-				escapeXml="false" />
+				escapeXml="true" />
 		</h1>
 		
 		<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
@@ -112,13 +112,14 @@
 			<c:if test="${VoteLearningForm.showResults != 'true'}">
 				<jsp:include page="/learning/RevisitedNoDisplay.jsp" />
 			</c:if>
+			
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection}">
 					<h2>
-							<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
+							<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
 					</h2>
 	
-					<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-						escapeXml="false" />
+					<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
+						escapeHtml="true" />
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.37 -r1.38
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	22 Jan 2014 14:10:50 -0000	1.37
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	2 Apr 2014 15:04:58 -0000	1.38
@@ -50,7 +50,7 @@
 <body class="stripes">
 	<div id="content">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 		
 		<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
@@ -105,7 +105,7 @@
 
 				<c:if test="${not empty VoteLearningForm.userEntry}">
 					<li>
-						<c:out value="${VoteLearningForm.userEntry}" />
+						<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/> 
 					</li>
 				</c:if>
 			</ul>
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Notebook.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_vote/web/learning/Notebook.jsp	2 Jan 2014 23:12:49 -0000	1.10
+++ lams_tool_vote/web/learning/Notebook.jsp	2 Apr 2014 15:04:58 -0000	1.11
@@ -60,11 +60,12 @@
 
 		<div id="content">
 			<h1>
-				<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+				<lams:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeHtml="true" />
 			</h1>
 
 			<p>
-				<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />
+				<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true"/>
+
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedAllNominations.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	2 Jan 2014 23:12:50 -0000	1.18
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	2 Apr 2014 15:04:58 -0000	1.19
@@ -66,7 +66,7 @@
 	<div id="content">
 
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 
 		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
@@ -107,12 +107,12 @@
 				<jsp:include page="/learning/RevisitedNoDisplay.jsp" />
 			</c:if>
 
-				<h2>
-						<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
-				</h2>
+				<h4>
+						<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
+				</h4>
 
-				<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-					escapeXml="false" />
+				<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
+					escapeHtml="true" />
 			
 				<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'true' && hasEditRight}">					
 				<br>
Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedDisplay.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp	28 Jan 2014 23:05:52 -0000	1.7
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp	2 Apr 2014 15:04:58 -0000	1.8
@@ -122,7 +122,7 @@
 					<c:forEach var="vote"
 						items="${requestScope.listUserEntriesContent}">
 						<div>
-							<c:out value="${vote.userEntry}" escapeXml="false" />
+							<c:out value="${vote.userEntry}" escapeXml="true" />
 						</div>
 					</c:forEach>
 					<div>&nbsp;</div>
@@ -145,7 +145,7 @@
 					</div>
 				</c:forEach>
 				<div>
-					<c:out value="${VoteLearningForm.userEntry}" />
+					<lams:out value="${VoteLearningForm.userEntry}" escapeHtml="true"/>
 				</div>
 
 				<div id="chartDiv0" style="height: 220px; display: none;"></div>
Index: lams_tool_vote/web/learning/WaitForLeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/WaitForLeader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/learning/WaitForLeader.jsp	2 Jan 2014 23:12:50 -0000	1.1
+++ lams_tool_vote/web/learning/WaitForLeader.jsp	2 Apr 2014 15:04:58 -0000	1.2
@@ -22,7 +22,7 @@
 
 	<div id="content">
 		<h1>
-			${content.title}
+			<c:out value="${content.title}" escapeXml="true"/>
 		</h1>
 		
 		<h2>
@@ -36,7 +36,7 @@
 		<div>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<div>
-					${user.fullname}
+					<c:out value="${user.fullname}" escapeXml="true"/>
 				</div>
 			</c:forEach>
 		</div>
Index: lams_tool_vote/web/learning/mobile/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/AllNominations.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_vote/web/learning/mobile/AllNominations.jsp	28 Jan 2014 23:05:50 -0000	1.9
+++ lams_tool_vote/web/learning/mobile/AllNominations.jsp	2 Apr 2014 15:04:58 -0000	1.10
@@ -67,7 +67,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 
@@ -202,7 +202,7 @@
 						items="${requestScope.listUserEntriesContent}">
 						<c:if test="${vote.userEntry != null}">
 							<div>
-								<c:out value="${vote.userEntry}" escapeXml="false" /> 
+								<c:out value="${vote.userEntry}" escapeXml="true" /> 
 							</div>
 						</c:if>
 					</c:forEach>
@@ -242,8 +242,8 @@
 				</h2>
 	
 				<p>
-					<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-						escapeXml="false" />
+					<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
+						escapeHtml="true" />
 				</p>
 			</c:if>			
 							
Index: lams_tool_vote/web/learning/mobile/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/AnswersContent.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/learning/mobile/AnswersContent.jsp	22 Jan 2014 14:10:50 -0000	1.7
+++ lams_tool_vote/web/learning/mobile/AnswersContent.jsp	2 Apr 2014 15:04:58 -0000	1.8
@@ -143,7 +143,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 
Index: lams_tool_vote/web/learning/mobile/ExitLearning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/ExitLearning.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/learning/mobile/ExitLearning.jsp	2 Jan 2014 23:12:49 -0000	1.7
+++ lams_tool_vote/web/learning/mobile/ExitLearning.jsp	2 Apr 2014 15:04:59 -0000	1.8
@@ -66,7 +66,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 	
@@ -117,11 +117,11 @@
 			</c:if>
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection}">
 					<h2>
-							<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
+							<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
 					</h2>
 	
-					<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-						escapeXml="false" />
+					<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
+						escapeHtml="true" />
 				</c:if>
 
 				<c:if test="${voteGeneralLearnerFlowDTO.learningMode != 'teacher' && hasEditRight}">
Index: lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp	22 Jan 2014 14:10:50 -0000	1.7
+++ lams_tool_vote/web/learning/mobile/IndividualLearnerResults.jsp	2 Apr 2014 15:04:59 -0000	1.8
@@ -56,7 +56,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 
@@ -114,7 +114,7 @@
 
 				<c:if test="${not empty VoteLearningForm.userEntry}">
 					<li>
-						<c:out value="${VoteLearningForm.userEntry}" />
+						<c:out value="${VoteLearningForm.userEntry}" escapeXml="true" />
 					</li>
 				</c:if>
 			</ul>
Index: lams_tool_vote/web/learning/mobile/Notebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/Notebook.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/learning/mobile/Notebook.jsp	2 Jan 2014 23:12:49 -0000	1.4
+++ lams_tool_vote/web/learning/mobile/Notebook.jsp	2 Apr 2014 15:04:59 -0000	1.5
@@ -55,7 +55,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div>
 
@@ -71,7 +71,7 @@
 			<html:hidden property="useSelectLeaderToolOuput" />
 	
 				<p>
-					<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />
+					<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 				</p>
 	
 				<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
Index: lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp	2 Jan 2014 23:12:49 -0000	1.8
+++ lams_tool_vote/web/learning/mobile/RevisitedAllNominations.jsp	2 Apr 2014 15:04:58 -0000	1.9
@@ -66,7 +66,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 	
@@ -110,11 +110,11 @@
 				<jsp:include page="RevisitedNoDisplay.jsp" />
 			</c:if>
 
-			<h2>
-				<c:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
-			</h2>
+			<h4>
+				<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
+			</h4>
 
-			<c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false" />
+			<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="false" />
 			
 			<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'true' && hasEditRight}">					
 				<br>
Index: lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp	28 Jan 2014 23:05:50 -0000	1.4
+++ lams_tool_vote/web/learning/mobile/RevisitedDisplay.jsp	2 Apr 2014 15:04:58 -0000	1.5
@@ -124,7 +124,7 @@
 					<c:forEach var="vote"
 						items="${requestScope.listUserEntriesContent}">
 						<div>
-							<c:out value="${vote.userEntry}" escapeXml="false" />
+							<c:out value="${vote.userEntry}" escapeXml="true" />
 						</div>
 					</c:forEach>
 					<div>&nbsp;</div>
@@ -143,7 +143,7 @@
 				<c:forEach var="entry"
 					items="${requestScope.listGeneralCheckedOptionsContent}">
 					<div>
-						<c:out value="${entry}" escapeXml="false" />
+						<c:out value="${entry}" escapeXml="true" />
 					</div>
 				</c:forEach>
 				<div>
Index: lams_tool_vote/web/learning/mobile/WaitForLeader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/mobile/WaitForLeader.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/learning/mobile/WaitForLeader.jsp	2 Jan 2014 23:12:49 -0000	1.1
+++ lams_tool_vote/web/learning/mobile/WaitForLeader.jsp	2 Apr 2014 15:04:58 -0000	1.2
@@ -28,7 +28,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			${content.title}
+			<c:out value="${content.title}" escapeXml="true"/>
 		</h1>
 	</div><!-- /header -->
 
@@ -45,7 +45,7 @@
 		<div>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<div>
-					${user.fullname}
+					<c:out value="${user.fullname}" escapeXml="true"/>
 				</div>
 			</c:forEach>
 		</div>
Index: lams_tool_vote/web/monitoring/AdvanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AdvanceOptions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/monitoring/AdvanceOptions.jsp	23 Jan 2014 23:53:16 -0000	1.1
+++ lams_tool_vote/web/monitoring/AdvanceOptions.jsp	2 Apr 2014 15:04:59 -0000	1.2
@@ -116,7 +116,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>	
-					${reflectionSubject}
+					<lams:out value="${reflectionSubject}" escapeHtml="true"/>
 				</td>
 			</tr>
 		</c:when>
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v
diff -u -r1.26 -r1.27
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	6 Feb 2014 22:07:15 -0000	1.26
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	2 Apr 2014 15:04:59 -0000	1.27
@@ -3,9 +3,13 @@
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
-<h3>
+<h1>
+	<c:out value="${voteGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
+</h1>
+
+<div class="instructions space-top">
 	<c:out value="${voteGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/> 
-</h3>
+</div>
 
 <c:forEach var="sessionDto" items="${voteGeneralMonitoringDTO.sessionDTOs}">
 
@@ -114,7 +118,7 @@
 		  	 		<c:set var="currentUid" scope="request" value="${userData.uid}"/>
 					<tr> 
 						<td  valign=top class="align-left"> 
-							<c:out value="${openVoteDto.question}" escapeXml="false"/> 
+							<c:out value="${openVoteDto.question}" escapeXml="true"/> 
 							<c:if test="${userData.visible != 'true' }"> 			
 								<i><fmt:message key="label.hidden"/> </i> 
 							</c:if> 								
Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/LearnerNotebook.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_vote/web/monitoring/LearnerNotebook.jsp	23 Jan 2014 23:53:16 -0000	1.8
+++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp	2 Apr 2014 15:04:59 -0000	1.9
@@ -32,13 +32,13 @@
 				<tr>
 					<td>
 						<h2>
-							<c:out value="${voteGeneralLearnerFlowDTO.userName}" escapeXml="false"/>
+							<c:out value="${voteGeneralLearnerFlowDTO.userName}" escapeXml="true"/>
 						</h2>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<p><c:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/></p>
+						<p><lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/></p>
 					</td>
 				</tr>
 			</table>
Index: lams_tool_vote/web/monitoring/Reflections.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/Reflections.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/web/monitoring/Reflections.jsp	23 Jan 2014 23:53:16 -0000	1.5
+++ lams_tool_vote/web/monitoring/Reflections.jsp	2 Apr 2014 15:04:59 -0000	1.6
@@ -1,12 +1,12 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 				<c:if test="${notebookEntriesExist == 'true' }"> 			
-					<table class="forms">
+					<table class="alternative-color">
 						
 								<tr>			
-									<td colspan=2 valign=top class="align-left">
+									<th colspan=2 valign=top class="align-left">
 										<b>  <fmt:message key="label.reflection"/>  </b> 
-									 </td>
+									 </th>
 								</tr>	
 						
 						
@@ -17,7 +17,7 @@
 					  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
 								<tr>			
 									<td valign=top class="align-left">
-										 <c:out value="${userName}" escapeXml="false"/> 
+										 <c:out value="${userName}" escapeXml="true"/> 
 									 </td>
 	
 									<td valign=top class="align-left">
Index: lams_tool_vote/web/monitoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/itemlist.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_vote/web/monitoring/itemlist.jsp	23 Jan 2014 23:53:16 -0000	1.9
+++ lams_tool_vote/web/monitoring/itemlist.jsp	2 Apr 2014 15:04:59 -0000	1.10
@@ -57,7 +57,7 @@
 		
 
 		<td width="10%" class="align-right">
-				<a title="<fmt:message key='label.tip.editNomination'/>" href="javascript:;" onclick="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newEditableNominationBox&questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}&reflectionSubject=${voteGeneralAuthoringDTO.reflectionSubject}"/>');">
+				<a title="<fmt:message key='label.tip.editNomination'/>" href="javascript:;" onclick="javascript:showMessage('<html:rewrite page="/monitoring.do?dispatch=newEditableNominationBox&questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&activeModule=${voteGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${voteGeneralAuthoringDTO.defaultContentIdStr}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}"/>');">
 	                    <img src="<c:out value="${tool}"/>images/edit.gif" border="0">
 				</a> 
 		</td>