Index: lams_tool_chat/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_chat/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_chat/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -47,7 +47,7 @@
 								<div class="message">
 									<span class="messageFrom"> ${message.from} </span>
 									<br />
-									<lams:out value="${message.body}" escapeXml="true"></lams:out>
+									<lams:out escapeHtml="true" value="${message.body}"></lams:out>
 								</div>
 							</c:forEach>
 
Index: lams_tool_chat/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8)
+++ lams_tool_chat/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -3,26 +3,26 @@
 <html:form action="/learning" method="post">
 	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
 	<html:hidden property="dispatch" value="openNotebook" />
-	
+
 	<c:if
 		test="${chatUserDTO.finishedActivity and chatDTO.reflectOnActivity}">
 		<div class="space-top">
 			<h2>
 				${chatDTO.reflectInstructions}
 			</h2>
-			
+
 			<p>
 				<c:choose>
 					<c:when test="${not empty chatUserDTO.notebookEntry}">
-						<lams:out value="${chatUserDTO.notebookEntry}" escapeXml="true" />
+						<lams:out escapeHtml="true" value="${chatUserDTO.notebookEntry}" />
 					</c:when>
-					
+
 					<c:otherwise>
-						<em><fmt:message key="message.no.reflection.available" /></em>  
+						<em><fmt:message key="message.no.reflection.available" /> </em>
 					</c:otherwise>
-				</c:choose>		
+				</c:choose>
 			</p>
-			
+
 			<html:submit styleClass="button">
 				<fmt:message key="button.edit" />
 			</html:submit>
@@ -39,7 +39,8 @@
 	}
 </script>
 
-<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+<html:form action="/learning" method="post"
+	onsubmit="disableFinishButton();">
 	<html:hidden property="chatUserUID" value="${chatUserDTO.uid}" />
 	<div class="space-bottom-top align-right">
 		<c:choose>
Index: lams_tool_chat/web/pages/monitoring/chatHistory.jsp
===================================================================
diff -u -r4ff2485da68573b3cf2c6e35733de0c308eab8fc -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_chat/web/pages/monitoring/chatHistory.jsp	(.../chatHistory.jsp)	(revision 4ff2485da68573b3cf2c6e35733de0c308eab8fc)
+++ lams_tool_chat/web/pages/monitoring/chatHistory.jsp	(.../chatHistory.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -32,7 +32,7 @@
 
 <c:choose>
 	<c:when test="${empty session.messageDTOs}">
-		<fmt:message key="message.noChatMessages"/>
+		<fmt:message key="message.noChatMessages" />
 	</c:when>
 	<c:otherwise>
 		<div class="space-left space-right">
@@ -43,12 +43,11 @@
 				</c:if>
 
 				<div class="message"
-					onclick="javascript:toggleEditPane('u${message.uid}')"
-					style="${hiddenStyle}">
+					onclick="javascript:toggleEditPane('u${message.uid}')" style="">
 					<div class="messageFrom">
 						${message.from}
 					</div>
-					<lams:out value="${message.body}" escapeXml="true"></lams:out>
+					<lams:out escapeHtml="true" value="${message.body}"></lams:out>
 					<img src="images/edit.gif" alt="edit" />
 				</div>
 
@@ -61,11 +60,11 @@
 						<c:choose>
 							<c:when test="${message.hidden}">
 								<input id="cb${message.uid}" name="messageHidden"
-									type="checkbox" checked="checked" class="noBorder"/>
+									type="checkbox" checked="checked" class="noBorder" />
 							</c:when>
 							<c:otherwise>
 								<input id="cb${message.uid}" name="messageHidden"
-									type="checkbox" class="noBorder"/>
+									type="checkbox" class="noBorder" />
 							</c:otherwise>
 						</c:choose>
 
@@ -76,7 +75,8 @@
 
 						<html:textarea property="messageBody" value="${message.body}"
 							style="width:95%" rows="3" />
-						<br /><br />
+						<br />
+						<br />
 
 						<html:submit styleClass="button">
 							<fmt:message>button.save</fmt:message>
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r4ff2485da68573b3cf2c6e35733de0c308eab8fc -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 4ff2485da68573b3cf2c6e35733de0c308eab8fc)
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -46,8 +46,10 @@
 					<c:otherwise>
 						<c:forEach var="message" items="${session.messageDTOs}">
 							<div class="message">
-								<div class="messageFrom"> ${message.from} </div>
-								<lams:out value="${message.body}" escapeXml="true"></lams:out>
+								<div class="messageFrom">
+									${message.from}
+								</div>
+								<lams:out escapeHtml="true" value="${message.body}"></lams:out>
 							</div>
 						</c:forEach>
 
@@ -101,7 +103,8 @@
 									<c:param name="uid" value="${user.uid}" />
 								</c:url>
 
-								<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
+								<html:link
+									href="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
 									<fmt:message key="link.view" />
 								</html:link>
 							</c:if>
Index: lams_tool_forum/web/jsps/learning/notebook.jsp
===================================================================
diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8)
+++ lams_tool_forum/web/jsps/learning/notebook.jsp	(.../notebook.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -8,7 +8,8 @@
 	}
 </script>
 
-<html:form action="/learning/submitReflection" method="post" onsubmit="disableFinishButton();">
+<html:form action="/learning/submitReflection" method="post"
+	onsubmit="disableFinishButton();">
 	<html:hidden property="userID" />
 	<html:hidden property="sessionMapID" />
 
@@ -19,20 +20,18 @@
 
 		<%@ include file="/common/messages.jsp"%>
 
-
 		<p>
 			<lams:out value="${sessionMap.reflectInstructions}" />
 		</p>
 
-		<html:textarea cols="52" rows="6" property="entryText" styleClass="text-area" />
+		<html:textarea cols="52" rows="6" property="entryText"
+			styleClass="text-area" />
 
 		<div class="space-bottom-top align-right">
 			<html:submit styleClass="button" styleId="finishButton">
 				<fmt:message key="label.finish" />
 			</html:submit>
-			</div>
-		
+		</div>
 
 	</div>
 </html:form>
-
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
diff -u -recfd06ed9f05e30114b9ed8d1600a251bb7681d8 -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision ecfd06ed9f05e30114b9ed8d1600a251bb7681d8)
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	(.../viewforum.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -11,7 +11,7 @@
 	<div class="small-space-top">
 		<c:out value="${sessionMap.instruction}" escapeXml="false" />
 	</div>
-		
+
 	<%@ include file="/common/messages.jsp"%>
 
 	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
@@ -20,76 +20,77 @@
 		<html:rewrite
 			page="/learning/newTopic.do?sessionMapID=${sessionMapID}" />
 	</c:set>
-	
+
 	<c:set var="refresh">
 		<html:rewrite
 			page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
 	</c:set>
-	
+
 	<c:set var="continue">
 		<html:rewrite
 			page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
 	</c:set>
-	
+
 	<c:set var="finish">
-		<html:rewrite
-			page="/learning/finish.do?sessionMapID=${sessionMapID}" />
+		<html:rewrite page="/learning/finish.do?sessionMapID=${sessionMapID}" />
 	</c:set>
 
 	<div>
-		
+
 		<c:set var="buttonClass" value="button" />
 		<c:if test="${sessionMap.finishedLock}">
 			<c:set var="buttonClass" value="disabled" />
 		</c:if>
-	
-		<c:if	test='${sessionMap.mode != "teacher" && sessionMap.allowNewTopics}'>
+
+		<c:if
+			test='${sessionMap.mode != "teacher" && sessionMap.allowNewTopics}'>
 			<html:button property="newtopic"
 				onclick="javascript:location.href='${newtopic}';"
 				disabled="${sessionMap.finishedLock}" styleClass="${buttonClass}">
 				<fmt:message key="label.newtopic" />
 			</html:button>
 		</c:if>
-		
+
 		<html:button property="refresh"
-			onclick="javascript:location.href='${refresh}';"
-			styleClass="button">
+			onclick="javascript:location.href='${refresh}';" styleClass="button">
 			<fmt:message key="label.refresh" />
 		</html:button>
 	</div>
-	
+
 	<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 		<div class="small-space-top">
-			<h2>${sessionMap.reflectInstructions}</h2>
-	
+			<h2>
+				${sessionMap.reflectInstructions}
+			</h2>
+
 			<c:choose>
 				<c:when test="${empty sessionMap.reflectEntry}">
 					<p>
-						<em>
-							<fmt:message key="message.no.reflection.available" />
-						</em>
+						<em> <fmt:message key="message.no.reflection.available" /> </em>
 					</p>
 				</c:when>
 				<c:otherwise>
-					<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+					<p>
+						<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+					</p>
 				</c:otherwise>
 			</c:choose>
-			
+
 			<html:button property="continue"
 				onclick="javascript:location.href='${continue}';"
 				styleClass="button">
 				<fmt:message key="label.edit" />
-			</html:button>											
+			</html:button>
 		</div>
 	</c:if>
-	
+
 	<script type="text/javascript">
 		function submitFinish() {
 			document.getElementById("finish").disabled = true;
 			location.href = '${finish}';
 		}		
 	</script>
-	
+
 	<div align="right" class="space-bottom-top">
 		<c:if test='${sessionMap.mode != "teacher"}'>
 			<c:choose>
@@ -101,15 +102,14 @@
 						<fmt:message key="label.continue" />
 					</html:button>
 				</c:when>
-	
+
 				<c:otherwise>
 					<html:button property="finish" styleId="finish"
-						onclick="submitFinish();"
-						styleClass="button">
+						onclick="submitFinish();" styleClass="button">
 						<fmt:message key="label.finish" />
 					</html:button>
 				</c:otherwise>
-	
+
 			</c:choose>
 		</c:if>
 	</div>
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -180,7 +180,7 @@
 				<iframe
 					onload="javascript:this.style.height=this.contentWindow.document.body.scrollHeight+'px'"
 					id="reourceInputArea" name="reourceInputArea"
-					style="width:0px;height:0px;border:0px;display:none"
+					style="width: 0px; height: 0px; border: 0px; display: none"
 					frameborder="no" scrolling="no">
 				</iframe>
 
@@ -213,30 +213,33 @@
 			</c:choose>
 			<%-- end mode != teacher --%>
 		</c:if>
-		
-		
+
+
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>${sessionMap.reflectInstructions}</h2>
-			
+				<h2>
+					${sessionMap.reflectInstructions}
+				</h2>
+
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
 						<p>
-							<em>
-								<fmt:message key="message.no.reflection.available" />
+							<em> <fmt:message key="message.no.reflection.available" />
 							</em>
 						</p>
 					</c:when>
 					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+						<p>
+							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+						</p>
 					</c:otherwise>
 				</c:choose>
-				
+
 				<c:if test="${mode != 'teacher'}">
 					<html:button property="FinishButton"
 						onclick="return continueReflect()" styleClass="button">
 						<fmt:message key="label.edit" />
-					</html:button>											
+					</html:button>
 				</c:if>
 			</div>
 		</c:if>
Index: lams_tool_larsrc/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_larsrc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_larsrc/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -31,28 +31,31 @@
 		<p>
 			<fmt:message key="run.offline.message" />
 		</p>
-		
+
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>${sessionMap.reflectInstructions}</h2>
-			
+				<h2>
+					${sessionMap.reflectInstructions}
+				</h2>
+
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
 						<p>
-							<em>
-								<fmt:message key="message.no.reflection.available" />
+							<em> <fmt:message key="message.no.reflection.available" />
 							</em>
 						</p>
 					</c:when>
 					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+						<p>
+							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+						</p>
 					</c:otherwise>
 				</c:choose>
-				
+
 				<html:button property="FinishButton"
 					onclick="return continueReflect()" styleClass="button">
 					<fmt:message key="label.edit" />
-				</html:button>											
+				</html:button>
 			</div>
 		</c:if>
 
Index: lams_tool_nb/web/learnerContent.jsp
===================================================================
diff -u -r0b11fde95e5fc5820969dd4f7f664dd5a3ae8617 -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 0b11fde95e5fc5820969dd4f7f664dd5a3ae8617)
+++ lams_tool_nb/web/learnerContent.jsp	(.../learnerContent.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -18,59 +18,67 @@
 
 <div id="content">
 
-<h1><c:out value="${NbLearnerForm.title}" escapeXml="false" /></h1>
+	<h1>
+		<c:out value="${NbLearnerForm.title}" escapeXml="false" />
+	</h1>
 
 	<p>
 		<c:out value="${NbLearnerForm.content}" escapeXml="false" />
 	</p>
-  	 
- 	<html:form action="/learner" target="_self" onsubmit="disableFinishButton();" styleId="learnerForm"> 
+
+	<html:form action="/learner" target="_self"
+		onsubmit="disableFinishButton();" styleId="learnerForm">
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="mode" />
 		<c:choose>
 			<c:when test="${reflectOnActivity}">
-				<input type="hidden" id="methodVar" name="method" value="reflect"/>
+				<input type="hidden" id="methodVar" name="method" value="reflect" />
 			</c:when>
 			<c:otherwise>
-				<input type="hidden" id="methodVar" name="method" value="finish"/>
+				<input type="hidden" id="methodVar" name="method" value="finish" />
 			</c:otherwise>
 		</c:choose>
-		  	 
+
 		<c:if test="${userFinished and reflectOnActivity}">
 			<div class="small-space-top">
-		    	<h2>${reflectInstructions}</h2>
-		 	
-		 	    <c:choose>
-		    	    <c:when test="${empty reflectEntry}">
-		        	<p>
-		            	<em>
-		                	<fmt:message key="message.no.reflection.available" />
-		                </em>
-		            </p>
-		            
-		            </c:when>
-		            
-		            <c:otherwise>
-		            	<p> <lams:out escapeXml="true" value="${reflectEntry}" />  </p>
+				<h2>
+					${reflectInstructions}
+				</h2>
+
+				<c:choose>
+					<c:when test="${empty reflectEntry}">
+						<p>
+							<em> <fmt:message key="message.no.reflection.available" />
+							</em>
+						</p>
+
+					</c:when>
+
+					<c:otherwise>
+						<p>
+							<lams:out escapeHtml="true" value="${reflectEntry}" />
+						</p>
 					</c:otherwise>
-		            
+
 				</c:choose>
 
-		    </div>
+			</div>
 		</c:if>
-	
+
 		<div class="space-bottom-top align-right">
 			<c:if test="${not NbLearnerForm.readOnly}">
 				<c:choose>
 					<c:when test="${reflectOnActivity}">
-						<html:button property="continueButton" styleClass="button" onclick="submitForm('reflect')">
+						<html:button property="continueButton" styleClass="button"
+							onclick="submitForm('reflect')">
 							<fmt:message key="button.continue" />
 						</html:button>
 					</c:when>
 					<c:otherwise>
-						
-							
-						<html:button property="finishButton" styleClass="button" styleId="finishButton" onclick="submitForm('finish')">
+
+
+						<html:button property="finishButton" styleClass="button"
+							styleId="finishButton" onclick="submitForm('finish')">
 							<fmt:message key="button.finish" />
 						</html:button>
 					</c:otherwise>
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_sbmt/web/learner/runoffline.jsp	(.../runoffline.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -35,26 +35,29 @@
 
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>${sessionMap.reflectInstructions}</h2>
-				
+				<h2>
+					${sessionMap.reflectInstructions}
+				</h2>
+
 				<c:choose>
 					<c:when test="${empty learner.reflect}">
 						<p>
-							<em>
-								<fmt:message key="message.no.reflection.available" />
+							<em> <fmt:message key="message.no.reflection.available" />
 							</em>
 						</p>
 					</c:when>
 					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${learner.reflect}" />  </p>				
+						<p>
+							<lams:out escapeHtml="true" value="${learner.reflect}" />
+						</p>
 					</c:otherwise>
 				</c:choose>
-				
+
 				<html:button property="notebookButton"
 					onclick="javascript:notebook();" styleClass="button">
-					<fmt:message key="label.edit" />					
-				</html:button>				
-								
+					<fmt:message key="label.edit" />
+				</html:button>
+
 			</div>
 		</c:if>
 
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -6,14 +6,15 @@
 
 <lams:html>
 <lams:head>
-<title><fmt:message key="tool.display.name" /></title>
-<html:base />
-<%@ include file="/common/header.jsp"%>
+	<title><fmt:message key="tool.display.name" />
+	</title>
+	<html:base />
+	<%@ include file="/common/header.jsp"%>
 
-<link href="<html:rewrite page='/includes/css/tool_custom.css'/>"
-	rel="stylesheet" type="text/css">
+	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>"
+		rel="stylesheet" type="text/css">
 
-<script type="text/javascript">
+	<script type="text/javascript">
 		function submitCount(tUrl){
 			var lockOnFinished = <c:out value="${sessionMap.lockOnFinish}"/>;
 			var uploadFileNum = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
@@ -51,167 +52,201 @@
 
 <body class="stripes">
 
-<div id="content">
-<h1><c:out value="${sessionMap.title}" escapeXml="false" /></h1>
+	<div id="content">
+		<h1>
+			<c:out value="${sessionMap.title}" escapeXml="false" />
+		</h1>
 
-<p><c:out value="${sessionMap.instruction}" escapeXml="false" /></p>
+		<p>
+			<c:out value="${sessionMap.instruction}" escapeXml="false" />
+		</p>
 
-<%@include file="/common/messages.jsp"%> <c:if
-	test="${sessionMap.limitUpload}">
-	<fmt:message key="message.left.upload.limit">
-		<fmt:param value="${learner.limitUploadLeft}" />
-	</fmt:message>
-</c:if> <!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
-<c:choose>
+		<%@include file="/common/messages.jsp"%>
+		<c:if test="${sessionMap.limitUpload}">
+			<fmt:message key="message.left.upload.limit">
+				<fmt:param value="${learner.limitUploadLeft}" />
+			</fmt:message>
+		</c:if>
+		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
+		<c:choose>
 
-	<c:when test="${empty learner.filesUploaded}">
-		<p><fmt:message key="label.learner.noUpload" /></p>
-	</c:when>
+			<c:when test="${empty learner.filesUploaded}">
+				<p>
+					<fmt:message key="label.learner.noUpload" />
+				</p>
+			</c:when>
 
-	<c:otherwise>
-		<c:forEach var="file" items="${learner.filesUploaded}">
+			<c:otherwise>
+				<c:forEach var="file" items="${learner.filesUploaded}">
 
-			<div class="shading-bg">
-			<table>
-				<tr>
-					<!--First Row displaying the name of the File -->
-					<td class="field-name"><fmt:message
-						key="label.learner.fileName" /></td>
-					<td><c:out value="${file.filePath}" /> <c:if
-						test="${file.currentLearner}">
-						<c:set var="downloadURL">
-							<c:url
-								value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
-						</c:set>
-						<a href="${downloadURL}"><fmt:message key="label.download" /></a>
-					</c:if></td>
-				</tr>
+					<div class="shading-bg">
+						<table>
+							<tr>
+								<!--First Row displaying the name of the File -->
+								<td class="field-name">
+									<fmt:message key="label.learner.fileName" />
+								</td>
+								<td>
+									<c:out value="${file.filePath}" />
+									<c:if test="${file.currentLearner}">
+										<c:set var="downloadURL">
+											<c:url
+												value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
+										</c:set>
+										<a href="${downloadURL}"><fmt:message key="label.download" />
+										</a>
+									</c:if>
+								</td>
+							</tr>
 
-				<tr>
-					<!--Second Row displaying the description of the File -->
-					<td class="field-name"><fmt:message
-						key="label.learner.fileDescription" /></td>
-					<td><lams:out value="${file.fileDescription}" /></td>
-				</tr>
+							<tr>
+								<!--Second Row displaying the description of the File -->
+								<td class="field-name">
+									<fmt:message key="label.learner.fileDescription" />
+								</td>
+								<td>
+									<lams:out value="${file.fileDescription}" />
+								</td>
+							</tr>
 
-				<tr>
-					<!--Third row displaying the date of submission of the File -->
-					<td class="field-name"><fmt:message key="label.learner.time" />
-					</td>
-					<td><lams:Date value="${file.dateOfSubmission}" /></td>
-				</tr>
+							<tr>
+								<!--Third row displaying the date of submission of the File -->
+								<td class="field-name">
+									<fmt:message key="label.learner.time" />
+								</td>
+								<td>
+									<lams:Date value="${file.dateOfSubmission}" />
+								</td>
+							</tr>
 
-				<tr>
-					<!--Fourth row displaying the comments -->
-					<td class="field-name"><fmt:message
-						key="label.learner.comments" /></td>
-					<td><c:choose>
-						<c:when test="${empty file.comments}">
-							<fmt:message key="label.learner.notAvailable" />
-						</c:when>
-						<c:otherwise>
-							<c:out value="${file.comments}" escapeXml="false" />
-						</c:otherwise>
-					</c:choose></td>
-				</tr>
+							<tr>
+								<!--Fourth row displaying the comments -->
+								<td class="field-name">
+									<fmt:message key="label.learner.comments" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${empty file.comments}">
+											<fmt:message key="label.learner.notAvailable" />
+										</c:when>
+										<c:otherwise>
+											<c:out value="${file.comments}" escapeXml="false" />
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
 
-				<tr>
-					<!--Fifth row displaying the marks-->
-					<td class="field-name"><fmt:message key="label.learner.marks" />
-					</td>
-					<td><c:choose>
-						<c:when test="${empty file.comments}">
-							<fmt:message key="label.learner.notAvailable" />
-						</c:when>
-						<c:otherwise>
-							<c:out value="${file.marks}" escapeXml="false" />
-						</c:otherwise>
-					</c:choose></td>
-				</tr>
-			</table>
-			</div>
-		</c:forEach>
+							<tr>
+								<!--Fifth row displaying the marks-->
+								<td class="field-name">
+									<fmt:message key="label.learner.marks" />
+								</td>
+								<td>
+									<c:choose>
+										<c:when test="${empty file.comments}">
+											<fmt:message key="label.learner.notAvailable" />
+										</c:when>
+										<c:otherwise>
+											<c:out value="${file.marks}" escapeXml="false" />
+										</c:otherwise>
+									</c:choose>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</c:forEach>
 
-	</c:otherwise>
-</c:choose>
+			</c:otherwise>
+		</c:choose>
 
 
 
-<div class="last-item"></div>
+		<div class="last-item"></div>
 
-<c:if test="${sessionMap.mode != 'teacher'}">
-	<html:form action="/learner?method=uploadFile" method="post"
-		enctype="multipart/form-data">
-		<html:hidden property="sessionMapID" />
+		<c:if test="${sessionMap.mode != 'teacher'}">
+			<html:form action="/learner?method=uploadFile" method="post"
+				enctype="multipart/form-data">
+				<html:hidden property="sessionMapID" />
 
-		<!-- Hidden fields -->
-		<html:hidden property="toolSessionID"
-			value="${sessionMap.toolSessionID}" />
+				<!-- Hidden fields -->
+				<html:hidden property="toolSessionID"
+					value="${sessionMap.toolSessionID}" />
 
-		<!--File path row -->
-		<div class="field-name"><fmt:message
-			key="label.learner.filePath" /></div>
+				<!--File path row -->
+				<div class="field-name">
+					<fmt:message key="label.learner.filePath" />
+				</div>
 
-		<html:file property="file"
-			disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
-			size="40" tabindex="1" />
+				<html:file property="file"
+					disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
+					size="40" tabindex="1" />
 
-		<!--File Description row -->
-		<div class="field-name space-top"><fmt:message
-			key="label.learner.fileDescription" /></div>
-		<html:textarea rows="5" cols="40" tabindex="2" styleClass="text-area"
-			property="description"
-			disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
+				<!--File Description row -->
+				<div class="field-name space-top">
+					<fmt:message key="label.learner.fileDescription" />
+				</div>
+				<html:textarea rows="5" cols="40" tabindex="2"
+					styleClass="text-area" property="description"
+					disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
 
-		<div class="small-space-top"><html:submit
-			disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
-			styleClass="button">
-			<fmt:message key="label.learner.upload" />
-		</html:submit></div>
+				<div class="small-space-top">
+					<html:submit
+						disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
+						styleClass="button">
+						<fmt:message key="label.learner.upload" />
+					</html:submit>
+				</div>
 
-		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
-			<div class="small-space-top">
-				<h2>${sessionMap.reflectInstructions}</h2>
-				
-				<c:choose>
-					<c:when test="${empty learner.reflect}">
-						<p>
-							<em>
-								<fmt:message key="message.no.reflection.available" />
-							</em>
-						</p>
-					</c:when>
-					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${learner.reflect}" />  </p>				
-					</c:otherwise>
-				</c:choose>
-				
-				<html:button property="notebookButton"
-					onclick="javascript:notebook();" styleClass="button">
-					<fmt:message key="label.edit" />					
-				</html:button>				
-								
-			</div>
-		</c:if>
+				<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+					<div class="small-space-top">
+						<h2>
+							${sessionMap.reflectInstructions}
+						</h2>
 
-		<div class="space-bottom-top" align="right"><c:choose>
-			<c:when
-				test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
-				<html:button property="notebookButton"
-					onclick="javascript:notebook();" styleClass="button">
-					<fmt:message key="label.continue" />
-				</html:button>
-			</c:when>
-			<c:otherwise>
-				<html:button property="finishButton" onclick="javascript:finish();"
-					styleClass="button" styleId="finishButton">
-					<fmt:message key="button.finish" />
-				</html:button>
-			</c:otherwise>
-		</c:choose></div>
+						<c:choose>
+							<c:when test="${empty learner.reflect}">
+								<p>
+									<em> <fmt:message key="message.no.reflection.available" />
+									</em>
+								</p>
+							</c:when>
+							<c:otherwise>
+								<p>
+									<lams:out escapeHtml="true" value="${learner.reflect}" />
+								</p>
+							</c:otherwise>
+						</c:choose>
 
-	</html:form>
-</c:if></div>
-<div id="footer"></div>
+						<html:button property="notebookButton"
+							onclick="javascript:notebook();" styleClass="button">
+							<fmt:message key="label.edit" />
+						</html:button>
+
+					</div>
+				</c:if>
+
+				<div class="space-bottom-top" align="right">
+					<c:choose>
+						<c:when
+							test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
+							<html:button property="notebookButton"
+								onclick="javascript:notebook();" styleClass="button">
+								<fmt:message key="label.continue" />
+							</html:button>
+						</c:when>
+						<c:otherwise>
+							<html:button property="finishButton"
+								onclick="javascript:finish();" styleClass="button"
+								styleId="finishButton">
+								<fmt:message key="button.finish" />
+							</html:button>
+						</c:otherwise>
+					</c:choose>
+				</div>
+
+			</html:form>
+		</c:if>
+	</div>
+	<div id="footer"></div>
 </body>
 </lams:html>
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -5,7 +5,8 @@
 <lams:html>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <lams:head>
-	<title><fmt:message key="label.learning.title" /></title>
+	<title><fmt:message key="label.learning.title" />
+	</title>
 	<%@ include file="/common/header.jsp"%>
 
 	<script type="text/javascript">
@@ -93,59 +94,60 @@
 		</c:forEach>
 
 		<c:if test="${not sessionMap.finishedLock}">
-			 <html:button
-				property="RetakeButton" onclick="return retakeSurvey(-1)"
-				styleClass="button">
+			<html:button property="RetakeButton"
+				onclick="return retakeSurvey(-1)" styleClass="button">
 				<fmt:message key="label.retake.survey" />
-			</html:button> 
+			</html:button>
 		</c:if>
 
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>${sessionMap.reflectInstructions}</h2>
-			
+				<h2>
+					${sessionMap.reflectInstructions}
+				</h2>
+
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
 						<p>
-							<em>
-								<fmt:message key="message.no.reflection.available" />
+							<em> <fmt:message key="message.no.reflection.available" />
 							</em>
 						</p>
 					</c:when>
 					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+						<p>
+							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+						</p>
 					</c:otherwise>
 				</c:choose>
-				
+
 				<html:button property="ContinueButton"
 					onclick="return continueReflect()" styleClass="button">
 					<fmt:message key="label.edit" />
-				</html:button>											
+				</html:button>
 			</div>
 		</c:if>
 
 		<c:if test="${sessionMap.mode != 'teacher'}">
-		<table>
-			<tr>
-				<td>
-					<span class="right-buttons"> <c:choose>
-							<c:when
-								test="${sessionMap.reflectOn}">
-								<html:button property="ContinueButton"
-									onclick="return continueReflect()" styleClass="button">
-									<fmt:message key="label.continue" />
-								</html:button>
-							</c:when>
-							<c:otherwise>
-								<html:button property="FinishButton" styleId="finishButton"
-									onclick="return finishSession()" styleClass="button">
-									<fmt:message key="label.finished" />
-								</html:button>
-							</c:otherwise>
-						</c:choose> </span>
-				</td>
-			</tr>
-		</table>
+			<table>
+				<tr>
+					<td>
+						<span class="right-buttons"> <c:choose>
+								<c:when test="${sessionMap.reflectOn}">
+									<html:button property="ContinueButton"
+										onclick="return continueReflect()" styleClass="button">
+										<fmt:message key="label.continue" />
+									</html:button>
+								</c:when>
+								<c:otherwise>
+									<html:button property="FinishButton" styleId="finishButton"
+										onclick="return finishSession()" styleClass="button">
+										<fmt:message key="label.finished" />
+									</html:button>
+								</c:otherwise>
+							</c:choose> </span>
+					</td>
+				</tr>
+			</table>
 		</c:if>
 	</div>
 	<!--closes content-->
Index: lams_tool_survey/web/pages/learning/runoffline.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r2495e17b412e141f3827b7edee81e43475d16d07
--- lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_survey/web/pages/learning/runoffline.jsp	(.../runoffline.jsp)	(revision 2495e17b412e141f3827b7edee81e43475d16d07)
@@ -35,25 +35,28 @@
 
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>${sessionMap.reflectInstructions}</h2>
-			
+				<h2>
+					${sessionMap.reflectInstructions}
+				</h2>
+
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
 						<p>
-							<em>
-								<fmt:message key="message.no.reflection.available" />
+							<em> <fmt:message key="message.no.reflection.available" />
 							</em>
 						</p>
 					</c:when>
 					<c:otherwise>
-						<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+						<p>
+							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+						</p>
 					</c:otherwise>
 				</c:choose>
-				
+
 				<html:button property="ContinueButton"
 					onclick="return continueReflect()" styleClass="button">
 					<fmt:message key="label.edit" />
-				</html:button>											
+				</html:button>
 			</div>
 		</c:if>