Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -765,8 +765,8 @@
 			Date postedDate = (notebookEntry.getLastModified() != null) ? notebookEntry.getLastModified()
 				: notebookEntry.getCreateDate();
 			reflectionDTO.setDate(postedDate);
-			String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
-			reflectionDTO.setEntry(notebookEntryPresentable);
+			// String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
+			reflectionDTO.setEntry(notebookEntry.getEntry());
 			reflectionDTOs.add(reflectionDTO);
 		    }
 		}
@@ -791,8 +791,8 @@
 			    Date postedDate = (notebookEntry.getLastModified() != null) ? notebookEntry
 				    .getLastModified() : notebookEntry.getCreateDate();
 			    reflectionDTO.setDate(postedDate);
-			    String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
-			    reflectionDTO.setEntry(notebookEntryPresentable);
+			    // String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
+			    reflectionDTO.setEntry(notebookEntry.getEntry());
 			    reflectionDTOs.add(reflectionDTO);
 			}
 		    }
@@ -1485,4 +1485,4 @@
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getQaOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
-}
\ No newline at end of file
+}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
diff -u -raf2294a9411ee67e92a614ee7e60df3c1c764b6e -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision af2294a9411ee67e92a614ee7e60df3c1c764b6e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -142,8 +142,8 @@
 		qaMonitoredUserDTO.setSessionId(sessionId.toString());
 		qaMonitoredUserDTO.setResponse(response.getAnswer());
 
-		String responsePresentable = QaUtils.replaceNewLines(response.getAnswer());
-		qaMonitoredUserDTO.setResponsePresentable(responsePresentable);
+		//String responsePresentable = QaUtils.replaceNewLines(response.getAnswer());
+		qaMonitoredUserDTO.setResponsePresentable(response.getAnswer());
 
 		qaMonitoredUserDTO.setQuestionUid(questionUid);
 		qaMonitoredUserDTO.setVisible(new Boolean(response.isVisible()).toString());
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -129,11 +129,11 @@
 		boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness"));
 		String answerParamName = "answer" + questionIndex + (isTestHarness ? "__textarea" : "");
 		String answer = request.getParameter(answerParamName);
-		String answerPresentable = QaUtils.replaceNewLines(answer);
+		// String answerPresentable = QaUtils.replaceNewLines(answer);
 
 		String questionIndexString = new Integer(questionIndex).toString();
 		mapAnswers.put(questionIndexString, answer);
-		mapAnswersPresentable.put(questionIndexString, answerPresentable);
+		mapAnswersPresentable.put(questionIndexString, answer);
 
 		Map<String, QaQuestionDTO> questionContentMap = generalLearnerFlowDTO.getMapQuestionContentLearner();
 		QaQuestionDTO dto = questionContentMap.get(questionIndexString);
@@ -817,8 +817,8 @@
 		CoreNotebookConstants.NOTEBOOK_TOOL, QaAppConstants.MY_SIGNATURE, new Integer(userID));
 
 	if (notebookEntry != null) {
-	    String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
-	    qaLearningForm.setEntryText(notebookEntryPresentable);
+	    // String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
+	    qaLearningForm.setEntryText(notebookEntry.getEntry());
 	}
 
 	request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
@@ -901,7 +901,7 @@
 	GeneralLearnerFlowDTO generalLearnerFlowDTO = new GeneralLearnerFlowDTO();
 	generalLearnerFlowDTO.setActivityTitle(qaContent.getTitle());
 	String reflectionSubject = qaContent.getReflectionSubject();
-	reflectionSubject = QaUtils.replaceNewLines(reflectionSubject);
+	// reflectionSubject = QaUtils.replaceNewLines(reflectionSubject);
 	generalLearnerFlowDTO.setReflectionSubject(reflectionSubject);
 
 	// attempt getting notebookEntry
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -197,9 +197,9 @@
 	NotebookEntry notebookEntry = qaService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL,
 		MY_SIGNATURE, userId.intValue());
 	if (notebookEntry != null) {
-	    String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
-	    qaLearningForm.setEntryText(notebookEntryPresentable);
-	    generalLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable);
+	    //String notebookEntryPresentable = QaUtils.replaceNewLines(notebookEntry.getEntry());
+	    qaLearningForm.setEntryText(notebookEntry.getEntry());
+	    generalLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry());
 	}
 
 	/*
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r55acfa2355b842ad87bac70171e366e088daad3c -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -45,13 +45,13 @@
 		<div id="content">
 
 			<h1>
-				<c:out value="${generalLearnerFlowDTO.activityTitle}"
-					escapeXml="true" />
+				<lams:out value="${generalLearnerFlowDTO.activityTitle}"
+					escapeHtml="true" />
 			</h1>
 
 			<p>
-				<c:out value="${generalLearnerFlowDTO.reflectionSubject}"
-					escapeXml="true" />
+				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}"
+					escapeHtml="true" />
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r55acfa2355b842ad87bac70171e366e088daad3c -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -272,12 +272,21 @@
 		</c:if>
 
 		<c:if test="${generalLearnerFlowDTO.reflection == 'true' }">					
-			<h2>
-				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
-			</h2>
-
-			<p><c:out value="${QaLearningForm.entryText}" escapeXml="true" /></p>
+			<h2><fmt:message key="label.reflection"/></h2>
+			<table class="alternative-color">
+			    <tr>
+				<td>
+				  <strong><lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" /></strong>
+				</td>
+			    </tr>
+			    <tr>
+				<td>
+				  <lams:out value="${QaLearningForm.entryText}" escapeHtml="true" />
+				</td>
+			    </tr>
+			</table>
 			
+			
 			<c:if test="${hasEditRight}">
 				<html:button property="forwardtoReflection" styleClass="button" onclick="submitMethod('forwardtoReflection');"> 
 					<fmt:message key="label.edit" />
Index: lams_tool_laqa/web/learning/mobile/Notebook.jsp
===================================================================
diff -u -r6ce2602aa5f7692243cbbac9bdb2297b641ab250 -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/web/learning/mobile/Notebook.jsp	(.../Notebook.jsp)	(revision 6ce2602aa5f7692243cbbac9bdb2297b641ab250)
+++ lams_tool_laqa/web/learning/mobile/Notebook.jsp	(.../Notebook.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -41,7 +41,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 -->
 
@@ -54,7 +54,7 @@
 			<html:hidden property="totalQuestionCount" />
 	
 			<p>
-				<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />
+				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</p>
 	
 			<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -286,10 +286,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><lams:out value="${QaLearningForm.entryText}" escapeHtml="true" /></p>
 
 			<c:if test="${hasEditRight}">
 				<span class="button-inside">
Index: lams_tool_laqa/web/monitoring/Edit.jsp
===================================================================
diff -u -r200d92ae0697a356582d37f8b5196bc3c725475a -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 200d92ae0697a356582d37f8b5196bc3c725475a)
+++ lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -4,7 +4,7 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
 <%@ include file="/common/messages.jsp"%>
-		
+
 <c:if test="${editActivityDTO.monitoredContentInUse != 'true'}"> 
 	<c:if test="${qaGeneralMonitoringDTO.defineLaterInEditMode != 'true'}">
 		<jsp:include page="/authoring/BasicContentViewOnly.jsp" />
Index: lams_tool_laqa/web/monitoring/Reflections.jsp
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -13,7 +13,7 @@
 			<td valign=top class="align-left">
 				<c:out value="${reflectDTO.userName}" escapeXml="true"/> <lams:Date value="${reflectDTO.date}"/>
 				<br>
-				<c:out value="${reflectDTO.entry}" escapeXml="true"/>
+				<lams:out value="${reflectDTO.entry}" escapeHtml="true"/>
 
 			</td>
 		</tr>	
Index: lams_tool_laqa/web/monitoring/Stats.jsp
===================================================================
diff -u -r200d92ae0697a356582d37f8b5196bc3c725475a -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8
--- lams_tool_laqa/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 200d92ae0697a356582d37f8b5196bc3c725475a)
+++ lams_tool_laqa/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
@@ -1,21 +1,21 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<table>
+<table class="alternative-color">
 	<tr> 
-		<td NOWRAP valign=top>
+		<th>
 			<b> <fmt:message key="count.total.user" /> </b>
-		</td>
-		<td NOWRAP valign=top>
+		</th>
+		<td align="right">
 			<c:out value="${qaStatsDTO.countAllUsers}"/>
 		</td> 
 	</tr>
 						
 	<tr> 
-		<td NOWRAP valign=top>
+		<th>
 			<b>  <fmt:message key="count.finished.session" /> </b>
-		</td>
-		<td NOWRAP valign=top>
+		</th>
+		<td align="right">
 			<c:out value="${qaStatsDTO.countSessionComplete}"/>
 		</td> 
 	</tr>
-</table>
\ No newline at end of file
+</table>