Index: lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp
===================================================================
diff -u -rc7d3fcf4395bbe2cd1d4fde631985e7ca3d265de -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision c7d3fcf4395bbe2cd1d4fde631985e7ca3d265de)
+++ lams_tool_laqa/web/authoring/BasicContentViewOnly.jsp	(.../BasicContentViewOnly.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -28,7 +28,7 @@
 								<div class="field-name">
 									<fmt:message key="label.authoring.title.col"></fmt:message>
 								</div>
-						  			<c:out value="${qaGeneralAuthoringDTO.activityTitle}" escapeXml="false"/> 								
+						  			<c:out value="${qaGeneralAuthoringDTO.activityTitle}" escapeXml="true"/> 
 							</td>
 						</tr>
 						
@@ -71,4 +71,4 @@
 
 
 
-		
\ No newline at end of file
+		
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90)
+++ lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -31,9 +31,9 @@
 
 	<div id="content">
 
-		<h1>${generalLearnerFlowDTO.activityTitle} </h1>
+		<h1><c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="true"/> </h1>
 			
-		<h1>${generalLearnerFlowDTO.activityInstructions} </h1>
+		<h1><c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false"/> </h1>
 
 		<c:if test="${(portfolioExportMode != 'learner') && !isToolSessionAvailable}">
 			<p>
@@ -97,8 +97,7 @@
 												<c:choose>
 													<c:when
 														test="${generalLearnerFlowDTO.userUid == userData.queUsrId or userData.visible == 'true'}">
-														<c:out value="${userData.responsePresentable}"
-															escapeXml="false" />
+														<c:out value="${userData.responsePresentable}" escapeXml="true" />
 														<jsp:include page="../learning/parts/ratingStarsDisabled.jsp" />
 													</c:when>
 													<c:otherwise>
@@ -138,7 +137,7 @@
 						
 						<c:if test="${not empty currentDto.feedback}">
 							<strong> <fmt:message key="label.feedback" /> : </strong>
-							<c:out value="${currentDto.feedback}" escapeXml="false" />
+							<c:out value="${currentDto.feedback}" escapeXml="true" />
 						</c:if>
 
 						<table cellspacing="0" class="alternative-color">
@@ -210,10 +209,10 @@
 					<h4>
 						<fmt:message key="label.user" />
 						:
-						<c:out value="${userName}" escapeXml="false" />
+						<c:out value="${userName}" escapeXml="true" />
 					</h4>
 					<p>
-						<c:out value="${entry}" escapeXml="false" />
+						<lams:out value="${entry}" escapeHtml="true" />
 					</p>
 
 				</c:forEach>
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -106,7 +106,7 @@
 	<div id="content">
 		<h1>
 			<c:out value="${generalLearnerFlowDTO.activityTitle}"
-				escapeXml="false" />
+				escapeXml="true" />
 		</h1>
 
 		<c:if test="${not empty sessionMap.submissionDeadline}">
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90)
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -30,7 +30,7 @@
 <body class="stripes">
 	<div id="content">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 		
 		<c:if test="${not empty sessionMap.submissionDeadline}">
@@ -59,7 +59,7 @@
 				<div class="shading-bg">
 					<p>
 						<strong>
-							<fmt:message key="label.question" /> <c:out value="${questionEntry.key}" />:
+							<fmt:message key="label.question" /> <c:out value="${questionEntry.key}" escapeXml="false"/>:
 						</strong>
 						<br>
 						<c:out value="${questionEntry.value.question}" escapeXml="false" />
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -111,7 +111,7 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 		
 		<c:if test="${not empty sessionMap.submissionDeadline}">
@@ -123,9 +123,12 @@
 		</c:if>
 		
 		<c:if test="${isLeadershipEnabled}">
+			<c:set var="fullName">
+				<c:out value="${sessionMap.groupLeader.fullname}" escapeXml="true"/>
+			</c:set>
 			<h4>
 				<fmt:message key="label.group.leader" >
-					<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
+					<fmt:param>${fullName}</fmt:param> 
 				</fmt:message>
 			</h4>
 		</c:if>
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -46,12 +46,12 @@
 
 			<h1>
 				<c:out value="${generalLearnerFlowDTO.activityTitle}"
-					escapeXml="false" />
+					escapeXml="true" />
 			</h1>
 
 			<p>
 				<c:out value="${generalLearnerFlowDTO.reflectionSubject}"
-					escapeXml="false" />
+					escapeXml="true" />
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
@@ -79,11 +79,3 @@
 
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -111,8 +111,7 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}"
-				escapeXml="false" />
+			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 		
 		<c:if test="${not empty sessionMap.submissionDeadline}">
@@ -274,10 +273,10 @@
 
 		<c:if test="${generalLearnerFlowDTO.reflection == 'true' }">					
 			<h2>
-				<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />						
+				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</h2>
 
-			<p><c:out value="${QaLearningForm.entryText}" escapeXml="false" /></p>
+			<p><c:out value="${QaLearningForm.entryText}" escapeXml="true" /></p>
 			
 			<c:if test="${hasEditRight}">
 				<html:button property="forwardtoReflection" styleClass="button" onclick="submitMethod('forwardtoReflection');"> 
Index: lams_tool_laqa/web/learning/WaitForLeader.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_laqa/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -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>
@@ -53,4 +53,4 @@
 	</div>
 
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp
===================================================================
diff -u -r6ce2602aa5f7692243cbbac9bdb2297b641ab250 -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 6ce2602aa5f7692243cbbac9bdb2297b641ab250)
+++ lams_tool_laqa/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -51,7 +51,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 
Index: lams_tool_laqa/web/learning/mobile/WaitForLeader.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/learning/mobile/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_laqa/web/learning/mobile/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -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>
@@ -62,4 +62,4 @@
 
 </div>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_laqa/web/monitoring/AdvanceOptions.jsp
===================================================================
diff -u -r200d92ae0697a356582d37f8b5196bc3c725475a -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision 200d92ae0697a356582d37f8b5196bc3c725475a)
+++ lams_tool_laqa/web/monitoring/AdvanceOptions.jsp	(.../AdvanceOptions.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -83,7 +83,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>	
 				<td>
-					${content.reflectionSubject}
+					<lams:out value="${content.reflectionSubject}" escapeHtml="true"/>
 				</td>
 			</tr>
 		</c:when>
@@ -158,4 +158,4 @@
 	</tr>
 
 </table>
-</div>
\ No newline at end of file
+</div>
Index: lams_tool_laqa/web/monitoring/Reflections.jsp
===================================================================
diff -u -r200d92ae0697a356582d37f8b5196bc3c725475a -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 200d92ae0697a356582d37f8b5196bc3c725475a)
+++ lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -11,11 +11,11 @@
 	<c:forEach var="reflectDTO" items="${reflectionsContainerDTO}">
 		<tr>			
 			<td valign=top class="align-left">
-				${reflectDTO.userName} <lams:Date value="${reflectDTO.date}"/>
+				<c:out value="${reflectDTO.userName}" escapeXml="true"/> <lams:Date value="${reflectDTO.date}"/>
 				<br>
 				<lams:out value="${reflectDTO.entry}" escapeHtml="true" />
 			</td>
 		</tr>	
 	</c:forEach>
 
-</table>
\ No newline at end of file
+</table>
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r200d92ae0697a356582d37f8b5196bc3c725475a -r55acfa2355b842ad87bac70171e366e088daad3c
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 200d92ae0697a356582d37f8b5196bc3c725475a)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
@@ -1,11 +1,9 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="instructions">
-	${content.title}
-</div>
+<h1><c:out value="${content.title}" escapeXml="true"/></h1>
 
-<div class="instructions">
-	${content.instructions}
+<div class="instructions space-top">
+	<c:out value="${content.instructions}" escapeXml="false"/>
 </div>
 
 <c:if test="${empty listAllGroupsDTO}">
@@ -139,4 +137,4 @@
 
 <%@include file="AdvanceOptions.jsp"%>
 
-<%@include file="dateRestriction.jsp"%>
\ No newline at end of file
+<%@include file="dateRestriction.jsp"%>