Index: lams_tool_chat/web/common/header.jsp
===================================================================
diff -u -rdeaca84b3059ab928c655a3b46e29abcc3c1e0b5 -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/common/header.jsp	(.../header.jsp)	(revision deaca84b3059ab928c655a3b46e29abcc3c1e0b5)
+++ lams_tool_chat/web/common/header.jsp	(.../header.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -9,7 +9,7 @@
 
 <head>
 	<title>
-		<bean:message key="activity.title" />
+		<fmt:message key="activity.title" />
 	</title>
 	<link href="${tool}pages/learning/chat_style.css" rel="stylesheet" type="text/css">
 	<lams:headItems />
Index: lams_tool_chat/web/images/error.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/error_big.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/exclude.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/exclude_big.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/good.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/good_big.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/hidden.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/hidden_big.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/warning.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/images/warning_big.png
===================================================================
diff -u -r9ecb81dd8b4bc8ce82c3170806e30a9ba23dc021 -red3c47b7ae61ab6af7d88769b237943923199ad8
Binary files differ
Index: lams_tool_chat/web/layouts/defaultLayout.jsp
===================================================================
diff -u -rc277bb1c30c1283b5f66c6f651855c51a5f87bc5 -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision c277bb1c30c1283b5f66c6f651855c51a5f87bc5)
+++ lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -10,7 +10,7 @@
 			<tiles:useAttribute name="pageTitleKey" ignore="true"/>
 			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
 			<h1 class="no-tabs-below">
-				<bean:message key="${pTitleKey}" />
+				<fmt:message key="${pTitleKey}" />
 			</h1>
 			<div id="header-no-tabs"></div>
 			<div id="content">
Index: lams_tool_chat/web/layouts/tabLayout.jsp
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -10,7 +10,7 @@
 			<tiles:useAttribute name="pageTitleKey" />
 			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
 			<h1>
-				<bean:message key="${pTitleKey}" />
+				<fmt:message key="${pTitleKey}" />
 			</h1>
 			<tiles:insert attribute="body" />
 		</div>
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r97964dcb4328d4b3dce27306a1793506c19413c9 -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 97964dcb4328d4b3dce27306a1793506c19413c9)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -13,35 +13,44 @@
 <!--closes header-->
 
 <div id="content">
-	<html:form action="/authoring" styleId="authoringForm" method="post" enctype="multipart/form-data">
-		<html:hidden property="toolContentID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="dispatch" value="updateContent" />
-		<html:hidden property="sessionMapID" />
+	<html:form action="/authoring" styleId="authoringForm" method="post"
+		enctype="multipart/form-data">
+		<div>
+			<html:hidden property="toolContentID" />
+			<html:hidden property="currentTab" styleId="currentTab" />
+			<html:hidden property="dispatch" value="updateContent" />
+			<html:hidden property="sessionMapID" />
+		</div>
 
-		<div id="message" align="center">
+		<div id="message" style="text-align: center;">
 			<c:if test="${unsavedChanges}">
-				<img src="${tool}images/warning.png" />
-				<bean:message key="message.unsavedChanges" />
+				<fmt:message key="message.unsavedChanges" />
 			</c:if>
 		</div>
 
 		<%-- Page tabs --%>
 		<lams:TabBody id="1" titleKey="button.basic" page="basic.jsp" />
 		<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
-		<lams:TabBody id="3" titleKey="button.instructions" page="instructions.jsp" />
+		<lams:TabBody id="3" titleKey="button.instructions"
+			page="instructions.jsp" />
 
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}"/>	
+		<c:set var="formBean"
+			value="<%=request
+										.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+		<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 
 		<c:set var="defineLater" value="no" />
 		<c:if test="${sessionMap.mode == 'teacher'}">
 			<c:set var="defineLater" value="yes" />
 		</c:if>
-		
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lachat11" cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${formBean.toolContentID}"
-			accessMode="${sessionMap.mode}" defineLater="${defineLater}" customiseSessionID="${sessionMap.sessionID}"/>
 
+		<lams:AuthoringButton formID="authoringForm"
+			clearSessionActionUrl="/clearsession.do" toolSignature="lachat11"
+			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save"
+			toolContentID="${formBean.toolContentID}"
+			accessMode="${sessionMap.mode}" defineLater="${defineLater}"
+			customiseSessionID="${sessionMap.sessionID}" />
+
 	</html:form>
 </div>
 
Index: lams_tool_chat/web/pages/learning/chat_ui.jsp
===================================================================
diff -u -r4d1146e33ddcaae15e13756729802dd5008aad00 -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/pages/learning/chat_ui.jsp	(.../chat_ui.jsp)	(revision 4d1146e33ddcaae15e13756729802dd5008aad00)
+++ lams_tool_chat/web/pages/learning/chat_ui.jsp	(.../chat_ui.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -74,12 +74,14 @@
 						<span id="sendToEveryone"><fmt:message>label.everyone</fmt:message>
 						</span><span id="sendToUser" style="display: none"></span>
 					</h2>
-					
-					
-					<span> <textarea name="msg" onKeyPress="return checkEnter(event);"
-							id="msgArea" rows="3" cols="80"></textarea> </span>
-							
-							
+
+
+					<div>
+						<textarea name="msg" onKeyPress="return checkEnter(event);"
+							id="msgArea" rows="3" cols="80"></textarea>
+					</div>
+
+
 					<div class="left-buttons">
 						<input id="sendButton" class="button" type="submit"
 							value='<fmt:message>button.send</fmt:message>' />
Index: lams_tool_chat/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r47041304a9d027531f04cc2a0217b7dda2acc913 -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 47041304a9d027531f04cc2a0217b7dda2acc913)
+++ lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -5,15 +5,15 @@
 <table cellspacing="0">
 	<tbody>
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name" style="width: 30%;">
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
 				<c:out value="${dto.title}" escapeXml="false" />
 			</td>
 		</tr>
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name" style="width: 30%;">
 				<fmt:message key="label.authoring.basic.instructions" />
 			</td>
 			<td>
@@ -23,14 +23,14 @@
 	</tbody>
 </table>
 
-<p align="right">
+<p>
 	<c:choose>
 		<c:when test="${not dto.contentInUse}">
 			<c:url value="/authoring.do" var="authoringUrl">
 				<c:param name="toolContentID" value="${dto.toolContentId}" />
 				<c:param name="mode" value="teacher" />
 			</c:url>
-			<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+			<html:link href="${fn:escapeXml(authoringUrl)}" styleClass="button right-buttons" target="_blank">
 				<fmt:message key="button.editActivity" />
 			</html:link>
 		</c:when>
@@ -41,5 +41,3 @@
 		</c:otherwise>
 	</c:choose>
 </p>
-
-
Index: lams_tool_chat/web/pages/monitoring/instructions.jsp
===================================================================
diff -u -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
+++ lams_tool_chat/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -4,7 +4,7 @@
 <table>
 	<tbody>
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name" style="width: 30%;">
 				<fmt:message key="instructions.onlineInstructions" />
 			</td>
 			<td>
@@ -55,7 +55,7 @@
 <table>
 	<tbody>
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name" style="width: 30%;">
 				<fmt:message key="instructions.offlineInstructions" />
 			</td>
 			<td>
Index: lams_tool_chat/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r4723715bee4472a5a41fc2cafd690b23b7ae4e2a -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 4723715bee4472a5a41fc2cafd690b23b7ae4e2a)
+++ lams_tool_chat/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -11,7 +11,7 @@
 			</tr>
 
 			<tr>
-				<td class="field-name" width="30%">
+				<td class="field-name" style="width: 30%;">
 					<fmt:message>heading.totalLearners</fmt:message>
 				</td>
 				<td>
@@ -20,7 +20,7 @@
 			</tr>
 
 			<tr>
-				<td class="field-name" width="30%">
+				<td class="field-name" style="width: 30%;">
 					<fmt:message>heading.totalMessages</fmt:message>
 				</td>
 				<td>
@@ -57,8 +57,8 @@
 									<c:param name="dispatch" value="openNotebook" />
 									<c:param name="uid" value="${user.uid}" />
 								</c:url>
-
-								<html:link href="${openNotebook}" target="_blank">
+								
+								<html:link href="${fn:escapeXml(openNotebook)}" target="_blank">
 									<fmt:message key="link.view" />
 								</html:link>
 							</c:if>
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rdeaca84b3059ab928c655a3b46e29abcc3c1e0b5 -red3c47b7ae61ab6af7d88769b237943923199ad8
--- lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision deaca84b3059ab928c655a3b46e29abcc3c1e0b5)
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ed3c47b7ae61ab6af7d88769b237943923199ad8)
@@ -10,7 +10,7 @@
 		</tr>
 
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name" style="width: 30%;">
 				<fmt:message>heading.totalLearners</fmt:message>
 			</td>
 			<td>
@@ -19,7 +19,7 @@
 		</tr>
 
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name" style="width: 30%;">
 				<fmt:message>heading.totalMessages</fmt:message>
 			</td>
 			<td>
@@ -28,7 +28,7 @@
 		</tr>
 
 		<tr>
-			<td class="field-name" width="30%">
+			<td class="field-name" style="width: 30%;">
 				<fmt:message>heading.recentMessages</fmt:message>
 			</td>
 			<td>
@@ -46,7 +46,8 @@
 
 							<c:forEach var="message" items="${session.messageDTOs}">
 								<div>
-									<span style="font-weight: bold"> ${message.from}</span> ${message.body}
+									<span style="font-weight: bold"> ${message.from}</span>
+									${message.body}
 									<br />
 								</div>
 							</c:forEach>
@@ -59,20 +60,25 @@
 
 		<tr>
 			<td colspan="2">
-				<html:form action="/monitoring" method="post" target="_blank" style="float:left; margin-right: 4px">
-					<html:hidden property="dispatch" value="openChatHistory" />
-					<html:hidden property="toolSessionID" value="${session.sessionID}" />
-					<html:submit styleClass="button">
-						<fmt:message>summary.editMessages</fmt:message>
-					</html:submit>
+				<html:form action="/monitoring" method="post" target="_blank"
+					style="float:left; margin-right: 4px">
+					<div>
+						<html:hidden property="dispatch" value="openChatHistory" />
+						<html:hidden property="toolSessionID" value="${session.sessionID}" />
+						<html:submit styleClass="button">
+							<fmt:message>summary.editMessages</fmt:message>
+						</html:submit>
+					</div>
 				</html:form>
 
 				<html:form action="/learning" method="post" target="_blank">
-					<html:hidden property="toolSessionID" value="${session.sessionID}" />
-					<html:hidden property="mode" value="teacher" />
-					<html:submit styleClass="button">
-						<fmt:message>summary.openChat</fmt:message>
-					</html:submit>
+					<div>
+						<html:hidden property="toolSessionID" value="${session.sessionID}" />
+						<html:hidden property="mode" value="teacher" />
+						<html:submit styleClass="button">
+							<fmt:message>summary.openChat</fmt:message>
+						</html:submit>
+					</div>
 				</html:form>
 
 			</td>
