Index: lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c2ba0dc3e2d99441897de8d185e83c419a416f2d)
+++ lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -24,7 +24,7 @@
 					<td>
 						<span class="field-name"> <fmt:message
 								key="label.authoring.basic.resource.url" /> : </span>
-						${resource.title}
+						<c:out value="${resource.title}" escapeXml="true"/>
 					</td>
 					<td width="10%">
 						<a href="#"
Index: lams_tool_larsrc/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -rd926a01b391e585bd535135a7360205f36cde6e6 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
+++ lams_tool_larsrc/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -39,11 +39,11 @@
 	<div id="content">
 
 		<h1>
-			${title}
+			<c:out value="${title}" escapeXml="true"/>
 		</h1>
 		
 		<div>
-			${instructions}
+			<c:out value="${instructions}" escapeXml="false"/>
 		</div>
 
 		<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
@@ -138,7 +138,7 @@
 										<ol>
 											<c:forEach var="itemInstruction" items="${item.itemInstructions}">
 												<li>
-													${itemInstruction}
+													<c:out value="${itemInstruction}" escapeXml="true"/>
 												</li>
 											</c:forEach>
 										</ol>
@@ -150,7 +150,7 @@
 							</td>
 
 							<td>
-								${item.username}
+								<c:out value="${item.username}" escapeXml="true"/>
 							</td>
 
 							<td align="center">
@@ -195,7 +195,7 @@
 			</h3>
 			<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
 				<h4>
-					${reflectDTO.fullName}
+					<c:out value="${reflectDTO.fullName}" escapeXml="true"/>
 				</h4>
 				<p>
 					<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
Index: lams_tool_larsrc/web/pages/itemreview/mobile/instructionsnav.jsp
===================================================================
diff -u -r3a9ee15ed806fb8092cef103341aa784424f404a -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/itemreview/mobile/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 3a9ee15ed806fb8092cef103341aa784424f404a)
+++ lams_tool_larsrc/web/pages/itemreview/mobile/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -28,7 +28,7 @@
 
 <lams:html>
 	<lams:head>
-		<title>${instructions.title}</title>
+		<title><c:out value="${instructions.title}" escapeXml="true"/></title>
 
 		<%@ include file="/common/mobileheader.jsp"%>
 		<style media="screen,projection" type="text/css">
Index: lams_tool_larsrc/web/pages/itemreview/mobile/openurl.jsp
===================================================================
diff -u -r3a9ee15ed806fb8092cef103341aa784424f404a -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/itemreview/mobile/openurl.jsp	(.../openurl.jsp)	(revision 3a9ee15ed806fb8092cef103341aa784424f404a)
+++ lams_tool_larsrc/web/pages/itemreview/mobile/openurl.jsp	(.../openurl.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -10,7 +10,7 @@
 		
 			<div data-role="content">
 				<h1>
-					${title}
+					<c:out value="${title}" escapeXml="true"/>
 				</h1>
 			
 				<p>
Index: lams_tool_larsrc/web/pages/itemreview/openurl.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/itemreview/openurl.jsp	(.../openurl.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_larsrc/web/pages/itemreview/openurl.jsp	(.../openurl.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -9,7 +9,7 @@
 
 		<div id="content">
 			<p>
-				${title}
+				<c:out value="${title}" escapeXml="true"/>
 			</p>
 			<p>
 				<a href="javascript:;"
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -73,11 +73,11 @@
 
 	<div id="content">
 		<h1>
-			${resource.title}
+			<c:out value="${resource.title}" escapeXml="true"/>
 		</h1>
 
 		<p>
-			${resource.instructions}
+			<c:out value="${resource.instructions}" escapeXml="false"/>
 		</p>
 
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
@@ -108,10 +108,10 @@
 				<tr>
 					<td>
 						<a href="#" onclick="viewItem(${item.uid})">
-							${item.title} </a>
+							<c:out value="${item.title}" escapeXml="true"/></a>
 						
 						<c:if test="${!item.createByAuthor && item.createBy != null}">
-								[${item.createBy.loginName}]
+								[<c:out value="${item.createBy.loginName}" escapeXml="true"/>]
 						</c:if>
 					</td>
 					<td align="center">
@@ -217,9 +217,10 @@
 
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>
-					${sessionMap.reflectInstructions}
-				</h2>
+				<h3><fmt:message key="title.reflection" /></h3>
+				<strong>
+					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
+				</strong>
 
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
Index: lams_tool_larsrc/web/pages/learning/mobile/learning.jsp
===================================================================
diff -u -r3a9ee15ed806fb8092cef103341aa784424f404a -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/learning/mobile/learning.jsp	(.../learning.jsp)	(revision 3a9ee15ed806fb8092cef103341aa784424f404a)
+++ lams_tool_larsrc/web/pages/learning/mobile/learning.jsp	(.../learning.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -71,14 +71,14 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			${resource.title}
+			<c:out value="${resource.title}" escapeXml="true"/>
 		</h1>
 	</div>
 
 	<div data-role="content">
 
 		<h2>
-			${resource.instructions}
+			<c:out value="${resource.instructions}" escapeXml="false"/>
 		</h2>
 
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
@@ -109,10 +109,10 @@
 				<tr>
 					<td>
 						<a href="#" onclick="viewItem(${item.uid})">
-							${item.title} </a>
+							<c:out value="${item.title}" escapeXml="true"/></a>
 						
 						<c:if test="${!item.createByAuthor && item.createBy != null}">
-								[${item.createBy.loginName}]
+								[<c:out value="${item.createBy.loginName}" escapeXml="true"/>]
 						</c:if>
 					</td>
 					<td align="center">
@@ -193,9 +193,10 @@
 
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
-				<h2>
-					${sessionMap.reflectInstructions}
-				</h2>
+				<h3><fmt:message key="title.reflection" /></h3>
+				<strong>
+					<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
+				</strong>
 
 				<c:choose>
 					<c:when test="${empty sessionMap.reflectEntry}">
Index: lams_tool_larsrc/web/pages/learning/mobile/notebook.jsp
===================================================================
diff -u -r3a9ee15ed806fb8092cef103341aa784424f404a -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 3a9ee15ed806fb8092cef103341aa784424f404a)
+++ lams_tool_larsrc/web/pages/learning/mobile/notebook.jsp	(.../notebook.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -29,7 +29,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			${sessionMap.title}
+			<c:out value="${sessionMap.title}" escapeXml="true"/>
 		</h1>
 	</div>
 	
@@ -38,7 +38,7 @@
 		<%@ include file="/common/messages.jsp"%>
 
 		<h2>
-			<lams:out value="${sessionMap.reflectInstructions}" />
+			<lams:out value="${sessionMap.reflectInstructions}" escapeHtml="true"/>
 		</h2>
 
 		<html:textarea cols="52" rows="6" property="entryText"
Index: lams_tool_larsrc/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_larsrc/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -29,13 +29,13 @@
 
 		<div id="content">
 			<h1>
-				${sessionMap.title}
+				<c:out value="${sessionMap.title}" escapeXml="true"/>
 			</h1>
 
 			<%@ 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_larsrc/web/pages/monitoring/advanceoptions.jsp
===================================================================
diff -u -rd926a01b391e585bd535135a7360205f36cde6e6 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
+++ lams_tool_larsrc/web/pages/monitoring/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -129,7 +129,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>
-					${sessionMap.resource.reflectInstructions}	
+					<lams:out escapeHtml="true" value="${sessionMap.resource.reflectInstructions}"/>	
 				</td>
 			</tr>
 		</c:when>
Index: lams_tool_larsrc/web/pages/monitoring/editactivity.jsp
===================================================================
diff -u -rdcba0e8da84c010ff230cd9196a4021fd37d5b34 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision dcba0e8da84c010ff230cd9196a4021fd37d5b34)
+++ lams_tool_larsrc/web/pages/monitoring/editactivity.jsp	(.../editactivity.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -3,9 +3,9 @@
 <c:set var="resource" value="${sessionMap.resource}"/>
 
 <c:if test="${sessionMap.isPageEditable}">
-	<p class="warning">
+	<div class="warning">
 		<fmt:message key="message.alertContentEdit" />
-	</p>
+	</div>
 </c:if>
 
 <table cellpadding="0">
@@ -15,7 +15,7 @@
 			:
 		</td>
 		<td>
-			<c:out value="${resource.title}" escapeXml="false" />
+			<c:out value="${resource.title}" escapeXml="true" />
 		</td>
 	</tr>
 
Index: lams_tool_larsrc/web/pages/monitoring/reflections.jsp
===================================================================
diff -u -r17304a9802e428871e2bf2e6d06d35dcbbc7d778 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision 17304a9802e428871e2bf2e6d06d35dcbbc7d778)
+++ lams_tool_larsrc/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -13,7 +13,7 @@
 	<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
 		<tr>
 			<td>
-				${reflectDTO.fullName} <lams:Date value="${reflectDTO.date}"/>
+				<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/>
 				<br>
 				<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
 			</td>
Index: lams_tool_larsrc/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -rd926a01b391e585bd535135a7360205f36cde6e6 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision d926a01b391e585bd535135a7360205f36cde6e6)
+++ lams_tool_larsrc/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -2,26 +2,28 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-<table cellspacing="3">
+<div class="info">
+<fmt:message key="monitoring.summary.note" />
+</div>
 
+
 	<c:if test="${empty summaryList}">
 		<div align="center">
 			<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 		</div>
 	</c:if>
-	
+	<br/>
 	<c:forEach var="group" items="${summaryList}" varStatus="firstGroup">
+	  
+	  
 		<c:forEach var="item" items="${group.items}" varStatus="status">
-		
+				
 			<%-- display group name on first row--%>
 			<c:if test="${status.index == 0}">
-				<tr>
-					<td colspan="4">
 						<c:if test="${sessionMap.isGroupedActivity}">
-							<B><fmt:message key="monitoring.label.group" /> ${group.sessionName}</B> 
+							<h1><fmt:message key="monitoring.label.group" /> ${group.sessionName}</h1> 
 						</c:if>
-					</td>
-				</tr>
+				<table cellspacing="3" class="alternative-color">
 				<tr>
 					<th width="20%">
 						<fmt:message key="monitoring.label.type" />
@@ -55,11 +57,11 @@
 						</c:choose>
 					</td>
 					<td>
-						${item.itemTitle}
+						<c:out value="${item.itemTitle}" escapeXml="true"/>
 					</td>
 					<td>
 						<c:if test="${!item.itemCreateByAuthor}">
-							${item.username}
+							<c:out value="${item.username}" escapeXml="true"/>
 						</c:if>
 					</td>
 					<td align="center">
@@ -76,6 +78,7 @@
 						</c:choose>
 					</td>
 				</tr>
+		</table>
 		</c:forEach>
+       
 	</c:forEach>
-</table>
Index: lams_tool_larsrc/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r65db8e31547517d7123660d8137e860673bf8268 -r73d41a9e127d790407deda8286fa5aa8182d8a1d
--- lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 65db8e31547517d7123660d8137e860673bf8268)
+++ lams_tool_larsrc/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 73d41a9e127d790407deda8286fa5aa8182d8a1d)
@@ -44,9 +44,9 @@
 			   		{name:'sessionId', index:'sessionId', width:0, hidden: true},
 			   		{name:'itemUid', index:'itemUid', width:0, hidden: true},
 			   		{name:'title', index:'title', width:260},
-			   		{name:'type', index:'type', width:90},
-			   		{name:'suggest', index:'suggest', width:160},
-			   		{name:'viewNumber', index:'viewNumber', width:100, align:"right", sorttype:"int"},
+			   		{name:'type', index:'type', width:90, align:"center"},
+			   		{name:'suggest', index:'suggest', width:160, align:"center"},
+			   		{name:'viewNumber', index:'viewNumber', width:100, align:"center", sorttype:"int"},
 			   		{name:'actions', index:'actions', width:120, align:"center"}		
 			   	],
 			   	caption: "${groupSummary.sessionName}",
@@ -112,11 +112,15 @@
 					</c:when>
 				</c:choose>
    	        
+				<c:set var="itemTitle">
+					<c:out value="${item.itemTitle}" escapeXml="true"/>
+				</c:set>
+				
    	     		jQuery("#group${groupSummary.sessionId}").addRowData(${i.index + 1}, {
    	   	     		id:		"${i.index + 1}",
    	   	     		sessionId:	"${groupSummary.sessionId}",
    	   	     		itemUid:	"${item.itemUid}",
-   	   	     		title:	"<a href='#nogo' onclick='javascript:viewItem(${item.itemUid}); return false;'>${item.itemTitle}</a>",
+   	   	     		title:	"<a href='#nogo' onclick='javascript:viewItem(${item.itemUid}); return false;'>${itemTitle}</a>",
    	   	     		type:	"${itemTypeLabel}",
    	   	     		suggest:	"${item.username}",
    	   	     		viewNumber:"	${item.viewNumber}",
@@ -167,12 +171,16 @@
 
 </script>
 
-<h2>
-	${sessionMap.resource.title}
-</h2>
+<h1>
+	<c:out value="${sessionMap.resource.title}" escapeXml="true"/>
+</h1>
+
 <div class="instructions">
-	${sessionMap.resource.instructions}
+	<c:out value="${sessionMap.resource.instructions}" escapeXml="false"/>
 </div>
+
+<br/>
+
 <c:if test="${empty summaryList}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>