Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r77bcef245dda8b166cdf40c12c62a7a5ab8d6fde -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 77bcef245dda8b166cdf40c12c62a7a5ab8d6fde)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -33,7 +33,7 @@
 			<%@ include file="/common/messages.jsp"%>
 
 			<p>
-				<lams:out value="${sessionMap.reflectInstructions}" />
+				<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -56,7 +56,7 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${sessionMap.title}" escapeXml="false" />
+			<c:out value="${sessionMap.title}" escapeXml="true" />
 		</h1>
 
 		<p>
@@ -135,7 +135,7 @@
 									<fmt:message key="label.learner.fileDescription" />
 								</td>
 								<td>
-									<lams:out value="${file.fileDescription}" />
+									<lams:out value="${file.fileDescription}" escapeHtml="true"/>
 								</td>
 							</tr>
 
@@ -177,7 +177,7 @@
 											<fmt:message key="label.learner.notAvailable" />
 										</c:when>
 										<c:otherwise>
-											<c:out value="${file.marks}" escapeXml="false" />
+											<c:out value="${file.marks}" escapeXml="true" />
 										</c:otherwise>
 									</c:choose>
 								</td>
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
diff -u -r02696b4b5a761a0fcc9f72a677d3599656ffb725 -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision 02696b4b5a761a0fcc9f72a677d3599656ffb725)
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	(.../allmarks.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -24,7 +24,7 @@
 			<fmt:message key="label.monitoring.heading.marking"/>
 		</h1>
 
-			<table cellpadding="0">
+			<table cellpadding="0" class="alternative-color">
 				<c:forEach var="user" items="${reports}">
 					<c:forEach items="${user.value}" var="fileInfo" varStatus="status">
 						<%@include file="filelist.jsp"%>
Index: lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp
===================================================================
diff -u -ra6f6ce90d6bff44fbec7a1afd0a39321a177962e -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	(.../fileinfo.jsp)	(revision a6f6ce90d6bff44fbec7a1afd0a39321a177962e)
+++ lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp	(.../fileinfo.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -36,7 +36,7 @@
 				<fmt:message key="label.learner.notAvailable" />
 			</c:when>
 			<c:otherwise>
-				<c:out value="${fileInfo.fileDescription}" escapeXml="false" />
+				<lams:out value="${fileInfo.fileDescription}" escapeHtml="true" />
 			</c:otherwise>
 		</c:choose>
 	</td>
Index: lams_tool_sbmt/web/monitoring/mark/filelist.jsp
===================================================================
diff -u -r02696b4b5a761a0fcc9f72a677d3599656ffb725 -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/monitoring/mark/filelist.jsp	(.../filelist.jsp)	(revision 02696b4b5a761a0fcc9f72a677d3599656ffb725)
+++ lams_tool_sbmt/web/monitoring/mark/filelist.jsp	(.../filelist.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -10,7 +10,7 @@
 				<fmt:message key="label.learner.notAvailable" />
 			</c:when>
 			<c:otherwise>
-				<c:out value="${fileInfo.marks}" escapeXml="false" />
+				<c:out value="${fileInfo.marks}" escapeXml="true" />
 			</c:otherwise>
 		</c:choose>
 		<html:link href="javascript:updateMark(${fileInfo.submissionID},${fileInfo.reportID},${toolSessionID},${fileInfo.owner.userID});" 
Index: lams_tool_sbmt/web/monitoring/notebook.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_sbmt/web/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -14,18 +14,18 @@
 			<h1>
 				<fmt:message key="page.title.monitoring.view.reflection"/>
 			</h1>
-			<p>${userDTO.firstName} ${userDTO.lastName}</p>
+			<p><c:out value="${userDTO.firstName} ${userDTO.lastName}" escapeXml="true"/></p>
 			<table class="alternative-color" cellspacing="0">
 				<tr>
 					<th class="first">
-						<lams:out value="${userDTO.reflectInstrctions}"/>
+						<lams:out value="${userDTO.reflectInstrctions}" escapeHtml="true"/>
 					</th>
 				</tr>
 				<tr>
 					<td>
 						<c:choose>
 							<c:when test="${userDTO.finishReflection}">
-								<lams:out value="${userDTO.reflect}"/>
+								<lams:out value="${userDTO.reflect}" escapeHtml="true"/>
 							</c:when>
 							<c:otherwise>
 								<fmt:message key="label.learner.notAvailable" />
Index: lams_tool_sbmt/web/monitoring/parts/activity.jsp
===================================================================
diff -u -r94fe28f5eb2724fc8653ec1faabfdb8e7290b608 -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 94fe28f5eb2724fc8653ec1faabfdb8e7290b608)
+++ lams_tool_sbmt/web/monitoring/parts/activity.jsp	(.../activity.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -10,17 +10,17 @@
 
 <table cellpadding="0">
 	<tr>
-		<td class="field-name" width="30%">
+		<td class="field-name" width="10%" nowrap>
 			<fmt:message key="label.authoring.basic.title" />
 			:
 		</td>
 		<td>
-			<c:out value="${authoring.title}" escapeXml="false" />
+			<c:out value="${authoring.title}" escapeXml="true" />
 		</td>
 	</tr>
 	<!-- Instructions Row -->
 	<tr>
-		<td class="field-name" width="30%">
+		<td class="field-name" width="10%" nowrap valign="top">
 			<fmt:message key="label.authoring.basic.instruction" />
 			:
 		</td>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
diff -u -rf05af5fb7b4b509624b201aee7cfc59ca4f20d1c -r223502c7884deaf414065ca1b3695fb6e56b6e8a
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision f05af5fb7b4b509624b201aee7cfc59ca4f20d1c)
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	(.../summary.jsp)	(revision 223502c7884deaf414065ca1b3695fb6e56b6e8a)
@@ -81,6 +81,106 @@
 </script>
 
 
+
+<table cellpadding="0">
+<tr><td>
+	<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />
+	<span id="messageArea"></span>
+</td></tr>
+</table>
+<c:forEach var="element" items="${sessionUserMap}">
+	<c:set var="sessionDto" value="${element.key}" />
+	<c:set var="userlist" value="${element.value}" />
+
+		<c:if test="${isGroupedActivity}">
+			<h1>
+				<fmt:message key="label.session.name" />: 
+				<c:out value="${sessionDto.sessionName}" />
+			</h1>
+		</c:if>
+		<br/>
+		
+		<c:forEach var="user" items="${userlist}" varStatus="status">
+			<table cellpadding="0" class="alternative-color">
+			<c:if test="${status.first}">
+				<tr>
+					<th>
+						<fmt:message key="monitoring.user.fullname"/>
+					</th>
+					<th align="center">
+						<fmt:message key="monitoring.user.submittedFiles"/>
+					</th>
+					<c:if test="${user.hasRefection}">
+						<th align="center">
+							<fmt:message key="monitoring.user.reflection"/>
+						</th>
+					</c:if>
+					<th align="center">
+						<fmt:message key="monitoring.marked.question"/>
+					</th>
+				</tr>
+			</c:if>		
+			<tr>
+				<td><c:out value="${user.firstName}" /> 
+					<c:out value="${user.lastName}" />
+				</td>
+				<!-- LDEV-2194 -->
+				<td align="center"><c:out value="${fn:length(user.filesUploaded)}" /></td>
+				
+				<c:if test="${user.hasRefection}">
+				<td align="center">
+						<c:set var="viewReflection">
+							<c:url value="/monitoring.do?method=viewReflection&toolSessionID=${sessionDto.sessionID}&userUid=${user.userUid}"/>
+						</c:set>
+						<html:link href="javascript:launchPopup('${viewReflection}')">
+							<fmt:message key="label.view" />
+						</html:link>
+				</td>
+				</c:if>				
+				<td align="center">
+					<c:choose>
+					<c:when test="${user.anyFilesMarked}">
+						<fmt:message key="label.yes"/>
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.no"/>
+					</c:otherwise>
+					</c:choose>
+				[<html:link
+					href="javascript:viewMark(${user.userID},${sessionDto.sessionID});"
+					property="Mark" >
+					<fmt:message key="label.monitoring.Mark.button" />
+				</html:link>]</td>
+			</tr>
+		</c:forEach>
+		<c:if test="${empty userlist}">
+			<tr>
+				<td colspan="3"><fmt:message key="label.no.user.available" />
+				</td>
+			</tr>
+		</c:if>
+		</table>
+		<table>
+		  <tr>
+			<td align="center"><html:link href="javascript:viewAllMarks(${sessionDto.sessionID});"
+				property="viewAllMarks" styleClass="button">
+				<fmt:message key="label.monitoring.viewAllMarks.button" />
+			</html:link></td>
+			<td align="center"><html:link href="javascript:releaseMarks(${sessionDto.sessionID});"
+				property="releaseMarks" styleClass="button">
+				<fmt:message key="label.monitoring.releaseMarks.button" />
+			</html:link></td>
+			<td align="center" style="border-bottom: 12px;border-bottom-color: gray;"><html:link href="javascript:downloadMarks(${sessionDto.sessionID});"
+				property="downloadMarks" styleClass="button">
+				<fmt:message key="label.monitoring.downloadMarks.button" />
+			</html:link></td>
+		</tr>
+	</table>
+	<br/>
+</c:forEach>
+
+<br/>
+
 <h1 style="padding-bottom: 10px;">
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
 
@@ -182,110 +282,12 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>
-					${authoring.reflectInstructions}	
+					<lams:out value="${authoring.reflectInstructions}" escapeHtml="true"/>	
 				</td>
 			</tr>
 		</c:when>
 	</c:choose>
 </table>
 </div>
 
-<%@include file="daterestriction.jsp"%>
-
-<table cellpadding="0">
-<tr><td>
-	<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />
-	<span id="messageArea"></span>
-</td></tr>
-</table>
-<c:forEach var="element" items="${sessionUserMap}">
-	<c:set var="sessionDto" value="${element.key}" />
-	<c:set var="userlist" value="${element.value}" />
-	<table cellpadding="0">
-		<c:if test="${isGroupedActivity}">
-			<tr>
-				<th colspan="3">
-					<h2>
-						<fmt:message key="label.session.name" /> : 
-						<c:out value="${sessionDto.sessionName}" />
-					</h2>
-				</th>
-			</tr>
-		</c:if>
-		
-		<c:forEach var="user" items="${userlist}" varStatus="status">
-			<c:if test="${status.first}">
-				<tr>
-					<th>
-						<fmt:message key="monitoring.user.fullname"/>
-					</th>
-					<th>
-						<fmt:message key="monitoring.user.submittedFiles"/>
-					</th>
-					<c:if test="${user.hasRefection}">
-						<th>
-							<fmt:message key="monitoring.user.reflection"/>
-						</th>
-					</c:if>
-					<th>
-						<fmt:message key="monitoring.marked.question"/>
-					</th>
-					<th>&nbsp;</th>
-				</tr>
-			</c:if>		
-			<tr>
-				<td><c:out value="${user.firstName}" /> 
-					<c:out value="${user.lastName}" />
-				</td>
-				<!-- LDEV-2194 -->
-				<td align="center"><c:out value="${fn:length(user.filesUploaded)}" /></td>
-				
-				<c:if test="${user.hasRefection}">
-				<td>
-						<c:set var="viewReflection">
-							<c:url value="/monitoring.do?method=viewReflection&toolSessionID=${sessionDto.sessionID}&userUid=${user.userUid}"/>
-						</c:set>
-						<html:link href="javascript:launchPopup('${viewReflection}')">
-							<fmt:message key="label.view" />
-						</html:link>
-				</td>
-				</c:if>				
-				<td>
-					<c:choose>
-					<c:when test="${user.anyFilesMarked}">
-						<fmt:message key="label.yes"/>
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.no"/>
-					</c:otherwise>
-					</c:choose>
-				</td>
-				<td><html:link
-					href="javascript:viewMark(${user.userID},${sessionDto.sessionID});"
-					property="Mark" styleClass="button">
-					<fmt:message key="label.monitoring.Mark.button" />
-				</html:link></td>
-			</tr>
-		</c:forEach>
-		<c:if test="${empty userlist}">
-			<tr>
-				<td colspan="3"><fmt:message key="label.no.user.available" />
-				</td>
-			</tr>
-		</c:if>
-		<tr>
-			<td><html:link href="javascript:viewAllMarks(${sessionDto.sessionID});"
-				property="viewAllMarks" styleClass="button">
-				<fmt:message key="label.monitoring.viewAllMarks.button" />
-			</html:link></td>
-			<td><html:link href="javascript:releaseMarks(${sessionDto.sessionID});"
-				property="releaseMarks" styleClass="button">
-				<fmt:message key="label.monitoring.releaseMarks.button" />
-			</html:link></td>
-			<td><html:link href="javascript:downloadMarks(${sessionDto.sessionID});"
-				property="downloadMarks" styleClass="button">
-				<fmt:message key="label.monitoring.downloadMarks.button" />
-			</html:link></td>
-		</tr>
-	</table>
-</c:forEach>
+<%@include file="daterestriction.jsp"%>
\ No newline at end of file