Index: lams_tool_chat/build.xml
===================================================================
diff -u -rc4ce2f458f9276e07cd58fd7c391410ae2e10509 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/build.xml	(.../build.xml)	(revision c4ce2f458f9276e07cd58fd7c391410ae2e10509)
+++ lams_tool_chat/build.xml	(.../build.xml)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -181,6 +181,7 @@
 				<include name="*" />
 				<include name="common/**" />
 				<include name="images/**" />
+				<include name="images-for-css/**" />
 				<include name="includes/**" />
 				<include name="layouts/**" />
 				<include name="pages/**" />
Index: lams_tool_chat/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -reb77a0a10c2be753711e4653b8ff2362c3ba154a -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
+++ lams_tool_chat/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -40,6 +40,7 @@
     <action
       path="/learning"
       type="org.lamsfoundation.lams.tool.chat.web.actions.LearningAction"
+      parameter="dispatch"
       unknown="false"
       validate="true"
     >
Index: lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -rff20896b171dd911f58f729fcb3e2ed1e9f53ed8 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision ff20896b171dd911f58f729fcb3e2ed1e9f53ed8)
+++ lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -23,13 +23,11 @@
 <tiles-definitions>
 	<!--  Begin: Layouts -->
 	<definition name="tiles:/layout:default" path="/layouts/defaultLayout.jsp">
-		<put name="pageTitleKey" value="" />
 		<put name="header" value="tiles:/header:default"/> 
 		<put name="body" value="" />
 	</definition>
 	
 	<definition name="tiles:/layout:tab" path="/layouts/tabLayout.jsp">
-		<put name="pageTitleKey" value="" />
 		<put name="header" value="tiles:/header:default"/> 
 		<put name="body" value="" />
 	</definition>
Index: lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag
===================================================================
diff -u -re1582051fac0c62608ec525ed2de8b666699ac86 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
+++ lams_tool_chat/web/WEB-INF/tags/HTMLEditor.tag	(.../HTMLEditor.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -51,7 +51,7 @@
             </div>
             <div style="text-align: center">
                 <a href="#" onClick="saveWYSWYGEdittedText(activeEditorIndex); doPreview(activeEditorIndex)" ><img src="${lams}images/tick.gif" border="0" alt="<bean:message key="label.save"/>"/></a>
-                &nbsp&nbsp&nbsp&nbsp
+                &nbsp;&nbsp;&nbsp;&nbsp;
                 <a href="#" onClick="doPreview(activeEditorIndex)"><img src="${lams}images/cross.gif" border="0" alt="<bean:message key="label.cancel"/>"/></a>
             </div>
         </div>
Index: lams_tool_chat/web/WEB-INF/tags/SetEditor.tag
===================================================================
diff -u -re1582051fac0c62608ec525ed2de8b666699ac86 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
+++ lams_tool_chat/web/WEB-INF/tags/SetEditor.tag	(.../SetEditor.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,64 +1,67 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * SetEditor.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a dynamic textarea field using a HTML Editor.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="text" required="true" rtexprvalue="true" %>
-<%@ attribute name="small" required="false" rtexprvalue="true" %>
-<%@ taglib uri="tags-function" prefix="fn" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tool"><lams:WebAppURL/></c:set>
+			/**
+			 * SetEditor.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a dynamic textarea field using a HTML Editor.
+			 * Wiki: 
+			 */
 
-<c:set var="previewClassName" value="previewPanel"/>
-<c:set var="txtClassName" value="textareaPanel"/>
-<c:set var="id_a" value="${fn:substring(id, 0, 1)}"/>
-<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}"/>
+		%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="text" required="true" rtexprvalue="true"%>
+<%@ attribute name="small" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
-	<c:if test="${small}">
-		<c:set var="previewClassName" value="smallPreviewPanel"/>
-		<c:set var="txtClassName" value="smallTextareaPanel"/>
-	</c:if>
-	<span id="preview${id}" style="visibility: hidden; display: none;">
-		<div>
-	    	<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
-	    </div>
-	    <div class="${previewClassName}" id="preview${id}.text"></div>
-	</span>
-	<span id="tx${id}">
-		<div>
-	    	<a href="javascript:doTextToHTML('${id}'); doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
-	    </div>
-		<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
-	</span>
\ No newline at end of file
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<c:set var="previewClassName" value="previewPanel" />
+<c:set var="txtClassName" value="textareaPanel" />
+<c:set var="id_a" value="${fn:substring(id, 0, 1)}" />
+<c:set var="id_b" value="${fn:substring(id, 1, fn:length(id))}" />
+
+<c:if test="${small}">
+	<c:set var="previewClassName" value="smallPreviewPanel" />
+	<c:set var="txtClassName" value="smallTextareaPanel" />
+</c:if>
+<div id="preview${id}" style="visibility: hidden; display: none;">
+	<div>
+		<a href="javascript:doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+	</div>
+	<div class="${previewClassName}" id="preview${id}.text"></div>
+</div>
+<div id="tx${id}">
+	<div>
+		<a href="javascript:doTextToHTML('${id}');doWYSWYGEdit('${id}'<c:if test="${small}">,'small'</c:if>)"><img src="${lams}images/html.gif" border="0" alt="Open HTML Editor"></a>
+	</div>
+	<textarea class="${txtClassName}" name="${fn:toLowerCase(id_a)}${id_b}" id="tx${id}.textarea"><c:out value="${text}" escapeXml="false" /></textarea>
+</div>
Index: lams_tool_chat/web/WEB-INF/tags/Tab.tag
===================================================================
diff -u -re1582051fac0c62608ec525ed2de8b666699ac86 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
+++ lams_tool_chat/web/WEB-INF/tags/Tab.tag	(.../Tab.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,79 +1,99 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * Tab.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates a tab element.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="empty" %>
-<%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="value" required="false" rtexprvalue="true" %>
-<%@ attribute name="key" required="false" rtexprvalue="true" %>
-<%@ attribute name="inactive" required="false" rtexprvalue="true" %>
-<%@ attribute name="methodCall" required="false" rtexprvalue="true" %>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="lams"><lams:LAMSURL/></c:set>
-<c:set var="tabTitle" value="${value}"/>
-<c:set var="tableftFile" value="aqua_tab_left.gif"/>
-<c:set var="tabrightFile" value="aqua_tab_right.gif"/>
-<c:set var="tabcentreClass" value="tab tabcentre"/>
+			/**
+			 * Tab.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates a tab element.
+			 * Wiki: 
+			 */
 
-<% // Usually methodCall is selectTab, but the calling code can override methodCall if desired.
-   // this is handy if the page needs different logic on initialisation and user switching tabs %>
+			%>
+<%@ tag body-content="empty"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="value" required="false" rtexprvalue="true"%>
+<%@ attribute name="key" required="false" rtexprvalue="true"%>
+<%@ attribute name="inactive" required="false" rtexprvalue="true"%>
+<%@ attribute name="methodCall" required="false" rtexprvalue="true"%>
+
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="lams">
+	<lams:LAMSURL />
+</c:set>
+<c:set var="tabTitle" value="${value}" />
+<c:set var="tableftFile" value="aqua_tab_left.gif" />
+<c:set var="tabrightFile" value="aqua_tab_right.gif" />
+<c:set var="tabcentreClass" value="tab tabcentre" />
+
+<%// Usually methodCall is selectTab, but the calling code can override methodCall if desired.
+			// this is handy if the page needs different logic on initialisation and user switching tabs %>
 <c:if test="${methodCall == null}">
 	<c:choose>
-	<c:when test="${dControl}">
-		<c:set var="methodCall" value="doSelectTab"/>
-	</c:when>
-	<c:otherwise>
-		<c:set var="methodCall" value="selectTab"/>
-	</c:otherwise>
+		<c:when test="${dControl}">
+			<c:set var="methodCall" value="doSelectTab" />
+		</c:when>
+		<c:otherwise>
+			<c:set var="methodCall" value="selectTab" />
+		</c:otherwise>
 	</c:choose>
 </c:if>
- 
+
 <c:if test="${key != null && value == null}">
-	<c:set var="tabTitle"><bean:message name="key" scope="page"/></c:set>
+	<c:set var="tabTitle">
+		<bean:message name="key" scope="page" />
+	</c:set>
 </c:if>
 
 <c:if test="${inactive}">
-	<c:set var="tableftFile" value="aqua_tab_i_left.gif"/>
-	<c:set var="tabrightFile" value="aqua_tab_i_right.gif"/>
-	<c:set var="tabcentreClass" value="tab tabcentre_inactive"/>
+	<c:set var="tableftFile" value="aqua_tab_i_left.gif" />
+	<c:set var="tabrightFile" value="aqua_tab_i_right.gif" />
+	<c:set var="tabcentreClass" value="tab tabcentre_inactive" />
 </c:if>
 
+<!-- 
 <td>
 	<table border="0" cellspacing="0" cellpadding="0" width="120" summary="This table is being used for layout purposes only">
-	  <tr>
-		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}"/></a></td>
-		<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap"><a href="#" onClick="${methodCall}(${id});return false;" id="${id}" >${tabTitle}</a></td>
-		<td width="8"><a href="#" onClick="${methodCall}(${id});return false;" ><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}"/></a></td></tr>
+		<tr>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tableftFile}" name="tableft_${id}" width="8" height="22" border="0" id="tableft_${id}" /></a>
+			</td>
+			<td class="${tabcentreClass}" id="tab${id}" nowrap="nowrap">
+				<a href="#" onClick="${methodCall}(${id});return false;" id="${id}">${tabTitle}</a>
+			</td>
+			<td width="8">
+				<a href="#" onClick="${methodCall}(${id});return false;"><img src="${lams}images/${tabrightFile}" name="tabright_${id}" width="8" height="22" border="0" id="tabright_${id}" /></a>
+			</td>
+		</tr>
 	</table>
-</td>
\ No newline at end of file
+</td>
+-->
+
+<div class="nav-box">
+	<div class="tab-left" id="tab-left-${id}"></div>
+	<div class="tab-middle" id="tab-middle-${id}">
+		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#" onclick="${methodCall}(${id});return false;">${tabTitle}</a>
+	</div>
+	<div class="tab-right" id="tab-right-${id}"></div>
+</div>
Index: lams_tool_chat/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -re1582051fac0c62608ec525ed2de8b666699ac86 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
+++ lams_tool_chat/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,62 +1,52 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * TabBody.tag
-  *	Author: Mitchell Seaton
-  *	Description: Creates the body container for a tab element
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<%@ attribute name="id" required="true" rtexprvalue="true" %>
-<%@ attribute name="tabTitle" required="false" rtexprvalue="true" %>
-<%@ attribute name="titleKey" required="false" rtexprvalue="true" %>
-<%@ attribute name="page" required="false" rtexprvalue="true" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
 
+			/**
+			 * TabBody.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Creates the body container for a tab element
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="scriptless"%>
+<%@ attribute name="id" required="true" rtexprvalue="true"%>
+<%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="page" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+
 <!-- begin tab content -->
-<div id="tabbody${id}">
-<c:if test="${tabTitle != null}">
-	<h2><font size=2> <b><bean:write name="tabTitle" scope="page"/></b></font></h2>
-</c:if>
-<c:if test="${titleKey != null && tabTitle == null}">
-	<h2><font size=2> <b><bean:message name="titleKey" scope="page"/></b></font></h2>
-</c:if>
+<div class="box" id="tabbody${id}">
+	<c:choose>
+		<c:when test="${page != null}">
+			<jsp:include page="${page}" />
+		</c:when>
+		<c:otherwise>
+			<jsp:doBody />
+		</c:otherwise>
+	</c:choose>
 
-<div id="formtablecontainer">
-<c:choose>
-	<c:when test="${page != null}">
-		<jsp:include page="${page}"/>
-	</c:when>
-	<c:otherwise>
-		<jsp:doBody/>
-	</c:otherwise>
-</c:choose>
 </div>
-
-</div>
-<!-- end tab content -->
\ No newline at end of file
+<!-- end tab content -->
Index: lams_tool_chat/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -re1582051fac0c62608ec525ed2de8b666699ac86 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
+++ lams_tool_chat/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,72 +1,69 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * Tabs.tag
-  *	Author: Mitchell Seaton
-  *	Description: Create a tab list from a input collection or nested Tab tags.
-  * Wiki: 
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true" %>
-<%@ attribute name="control" required="false" rtexprvalue="true" %>
-<%@ attribute name="useKey" required="false" rtexprvalue="true" %>
-<%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-lams" prefix="lams" %>
-<c:set var="dControl" value="false" scope="request"/>
+<%/****************************************************************
+			 * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+			 * =============================================================
+			 * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+			 * 
+			 * This program is free software; you can redistribute it and/or modify
+			 * it under the terms of the GNU General Public License version 2.0
+			 * as published by the Free Software Foundation.
+			 * 
+			 * This program is distributed in the hope that it will be useful,
+			 * but WITHOUT ANY WARRANTY; without even the implied warranty of
+			 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+			 * GNU General Public License for more details.
+			 * 
+			 * You should have received a copy of the GNU General Public License
+			 * along with this program; if not, write to the Free Software
+			 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+			 * USA
+			 * 
+			 * http://www.gnu.org/licenses/gpl.txt
+			 * ****************************************************************
+			 */
+
+			/**
+			 * Tabs.tag
+			 *	Author: Mitchell Seaton
+			 *	Description: Create a tab list from a input collection or nested Tab tags.
+			 * Wiki: 
+			 */
+
+		%>
+<%@ tag body-content="scriptless"%>
+<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
+<%@ attribute name="control" required="false" rtexprvalue="true"%>
+<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="dControl" value="false" scope="request" />
 <c:if test="${control}">
-	<c:set var="dControl" value="${control}" scope="request"/>
+	<c:set var="dControl" value="${control}" scope="request" />
 </c:if>
 
-<c:set var="dUseKey" value="false" scope="request"/>
+<c:set var="dUseKey" value="false" scope="request" />
 <c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request"/>
+	<c:set var="dUseKey" value="${useKey}" scope="request" />
 </c:if>
 
 <!-- tab holder table -->
-<table border="0" cellspacing="0" cellpadding="0" summary="This table is being used for layout purposes only">
-  <tr valign="bottom">
-<c:choose>
-	<c:when test="${collection != null}">
-			<c:set var="count" value="0"/>
+<div id="nav">
+	<c:choose>
+		<c:when test="${collection != null}">
+			<c:set var="count" value="0" />
 			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}"/>
+				<c:set var="count" value="${count+1}" />
 				<c:choose>
 					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}"/>
+						<lams:Tab id="${count}" key="${tab}" />
 					</c:when>
 					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}"/>
+						<lams:Tab id="${count}" value="${tab}" />
 					</c:otherwise>
 				</c:choose>
 			</c:forEach>
-	</c:when>
-	<c:otherwise>
-		<jsp:doBody/>
-	</c:otherwise>
-</c:choose>
-  </tr>
-</table>
\ No newline at end of file
+		</c:when>
+		<c:otherwise>
+			<jsp:doBody />
+		</c:otherwise>
+	</c:choose>
+</div>
Index: lams_tool_chat/web/WEB-INF/tags/headItems.tag
===================================================================
diff -u -r196eee412e9be0d16fec7635a2b7813f16956f31 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 196eee412e9be0d16fec7635a2b7813f16956f31)
+++ lams_tool_chat/web/WEB-INF/tags/headItems.tag	(.../headItems.tag)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -45,12 +45,13 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
-<lams:css />
-<link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+<link href="${tool}includes/css/aqua.css" rel="stylesheet" type="text/css">
 
+<link href="${tool}includes/css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${tool}includes/javascript/tabcontroller.js"></script>
 <script type="text/javascript" src="${tool}includes/javascript/xmlrequest.js"></script>
 	
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -reb77a0a10c2be753711e4653b8ff2362c3ba154a -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision eb77a0a10c2be753711e4653b8ff2362c3ba154a)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -130,15 +130,20 @@
 	<servlet-class>org.lamsfoundation.lams.tool.chat.JabberHTTPBind.JHBServlet</servlet-class>
 </servlet>
 
+<servlet>
+	<servlet-name>exportPortfolio</servlet-name>
+	<servlet-class>org.lamsfoundation.lams.tool.chat.web.servlets.ExportServlet</servlet-class>
+</servlet>
+
   <servlet-mapping>
 	<servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
+	<url-pattern>*.do</url-pattern>
 </servlet-mapping>
 
 <!--  FCKEditor Connector Configuration -->
 <servlet-mapping>
-    <servlet-name>Connector</servlet-name>
-    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
+	<servlet-name>Connector</servlet-name>
+	<url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 </servlet-mapping>
 
 <servlet-mapping>
@@ -152,6 +157,11 @@
 	<url-pattern>/JHB/</url-pattern>
 </servlet-mapping>
 
+<servlet-mapping>
+	<servlet-name>exportPortfolio</servlet-name>
+	<url-pattern>/exportPortfolio</url-pattern>
+</servlet-mapping>
+
    <session-config>
       <session-timeout>120</session-timeout>
    </session-config>
Index: lams_tool_chat/web/includes/css/aqua.css
===================================================================
diff -u
--- lams_tool_chat/web/includes/css/aqua.css	(revision 0)
+++ lams_tool_chat/web/includes/css/aqua.css	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -0,0 +1,590 @@
+/* last mod 2006-06-16-1318  */
+* {
+	margin: 0px;
+	padding: 0px;
+	color: #333;
+}
+
+body {
+	font-size: 11px;
+	font-family: verdana, arial, helvetica, sans-serif;
+	background: url('../images-for-css/page_bg.gif');
+}
+
+.row {
+	voice-family: "\"}\""; /* hide the following rules from IE5 */
+	voice-family: inherit;
+	overflow: hidden; /* CSS 'clearing hack' - works on all except for IE5, that's why the IE5 box model hack above */
+}
+
+* html .row {
+	height: 1%;
+}  /* part of the CSS 'clearing hack' */
+h1 {
+	color: #0087e5;
+	font-size: 15px;
+	margin-bottom: 0px;
+	margin-left: 10px;
+	padding-top: 5px;
+}
+
+h4 {
+	color: #47bc23;
+	font-size: 11px;
+}
+
+/*defines when instructions are given and places a blue arrow before the text */
+p.instructions {
+	color: #0087e5;
+	margin-bottom: 0px;
+	margin-top: 0px;;
+	margin-left: 30px;
+	font-weight: bold;
+	background: url('../images-for-css/blue_arrow_right.gif') no-repeat 0 0px;
+	padding-left: 30px;
+	padding-bottom: 10px;
+	font-size: 12px
+}
+
+p {
+	margin-left: 25px;
+	margin-right: 30px;
+	margin-bottom: 18px;
+}
+
+#page { /*whole layout of page*/
+	margin: 25px auto;
+	width: 707px;
+	background: url('../images-for-css/lams_logo.gif') no-repeat right 10px;
+}
+
+#header { /*layout of the header */
+	width: 707px;
+	height: 66px;
+	background: url('../images-for-css/top_bg.jpg') no-repeat bottom;
+}
+
+/* layout of whole navigation section -------------------------------------*/
+#nav { /* layout of box that contains the main navigation */
+	margin-top: 15px;
+	width: auto;
+	height: 40px;
+	margin-left: 4px;
+}
+
+#nav a {
+	color: #0087e5;
+	text-decoration: none;
+	font-size: 12px;
+	font-weight: bold;
+}
+
+#nav a:hover {
+	color: #006bb6;
+	text-decoration: none;
+}
+
+#nav a.selected {
+	color: #333;
+}
+
+/*------------------------------------- TAB STYLES -------------------------------------*/
+.nav-box { /* layout of containers that surround the tab navigation */
+	height: 31px;
+	width: auto;
+	margin-right: 2px;
+	float: left;
+	text-align: center;
+}
+
+.tab-left-selected { /* defines left side of selected tab */
+	height: 31px;
+	width: 8px;
+	background: url('../images-for-css/selected_left.jpg') no-repeat top left;
+	float: left
+}
+
+.tab-middle-selected { /* defines middle of selected tab */
+	height: 31px;
+	width: auto;
+	background: url('../images-for-css/selected_bg.jpg') repeat-x;
+	float: left;
+	width: 90px;
+	padding-left: 5px;
+	padding-right: 5px;
+	padding-top: 8px;
+	padding-bottom: 0px
+}
+
+#nav .tab-middle-link-selected {
+	color: #333333
+}
+
+.tab-right-selected { /* defines right side of selected tab */
+	height: 31px;
+	width: 8px;
+	background: url('../images-for-css/selected_right.jpg') no-repeat top right;;
+	float: left
+}
+
+.tab-left { /* defines left side of selected tab */
+	height: 31px;
+	width: 8px;
+	background: url('../images-for-css/button_left.jpg') no-repeat top left;
+	float: left
+}
+
+.tab-middle { /* defines middle of selected tab */
+	height: 31px;
+	width: auto;
+	background: url('../images-for-css/button_bg.jpg') repeat-x;
+	float: left;
+	width: 90px;
+	padding-left: 5px;
+	padding-right: 5px;
+	padding-top: 8px;
+	padding-bottom: 0px
+}
+
+#nav .tab-middle-link {
+	color: #0087e5
+}
+
+.tab-right { /* defines right side of selected tab */
+	height: 31px;
+	width: 8px;
+	background: url('../images-for-css/button_right.jpg') no-repeat top right;;
+	float: left
+}
+
+/* end of navigation ------------------------------------------------------*/
+#content { /*box around the main content area */
+	width: 707px;
+	background: url('../images-for-css/body_bg.jpg') repeat-y;
+	padding-bottom: 20px;
+	font-size: 11px;
+	margin-top: -5px
+}
+
+/*layout of Links within the content area */
+#content a {
+	color: #47bc23;
+	text-decoration: none;
+	border-bottom: 1px dotted #47bc23;
+}
+
+#content a:hover {
+	color: #47bc23;
+	text-decoration: none;
+	border-bottom: 1px solid #47bc23;
+}
+
+/*layout of a general button*/
+#content a.button {
+	background: url('../images-for-css/btn_off.gif') no-repeat 0px 20px;
+	color: #333;
+	border: 0px none;
+	padding-left: 20px;
+	padding-right: 20px;
+	padding-top: 25px;
+	padding-bottom: 25px
+}
+
+#content a:hover.button {
+	background: url('../images-for-css/btn_over.gif') no-repeat 0px 20px;
+	color: #349018;
+	border: 0px none;
+	padding-left: 20px;
+	padding-right: 20px;
+	padding-top: 25px;
+	padding-bottom: 25px
+}
+
+/*layout of adding a topic button */
+#content a.button-add-item {
+	background: url('../images-for-css/btn_add_off.gif') no-repeat 0px 20px;
+	color: #333;
+	border: 0px none;
+	padding-left: 25px;
+	padding-right: 15px;
+	padding-top: 25px;
+	padding-bottom: 25px
+}
+
+#content a:hover.button-add-item {
+	background: url('../images-for-css/btn_add_over.gif') no-repeat 0px 20px;
+	color: #349018;
+	border: 0px none;
+	padding-left: 25px;
+	padding-right: 15px;
+	padding-top: 25px;
+	padding-bottom: 25px
+}
+
+/*layout of html editor button */
+#content a.button-html-editor {
+	background: url('../images-for-css/btn_htmled_off.gif') no-repeat 0px 20px;
+	color: #666;
+	border: 0px none;
+	padding-left: 28px;
+	padding-right: 15px;
+	padding-top: 25px;
+	padding-bottom: 25px
+}
+
+#content a:hover.button-html-editor {
+	background: url('../images-for-css/btn_htmled_off.gif') no-repeat 0px 20px;
+	color: #333;
+	border: 0px none;
+	padding-left: 28px;
+	padding-right: 15px;
+	padding-top: 25px;
+	padding-bottom: 25px
+}
+
+.box {
+	display: none;
+	min-height: 100px;
+}
+
+#footer { /*layout of the footer - the bottom of the box */
+	width: 707px;
+	height: 14px;
+	background: url('../images-for-css/footer_bg.jpg') no-repeat bottom;
+}
+
+/*layout of the table with the alternate color for the table heading cell */
+table.alternative-color {
+	width: 695px;
+	margin-left: 7px;
+	margin-top: 25px;
+	margin-bottom: 30px;;
+	background: url('../images-for-css/greyfade_bg.jpg') no-repeat 3px 32px;
+	text-align: left
+}
+
+table.alternative-color th {
+	background: url('../images-for-css/green_bg.jpg') repeat-x;
+	height: 30px;
+	color: #47bc23;
+	padding-left: 15px;
+	border-left: 1px solid #cacdd1;
+	border-right: 1px solid #fff;
+	font-size: 12px;
+}
+
+table.alternative-color td {
+	padding-left: 20px;
+	font-size: 11px;
+	border-bottom: 1px solid #efefef;
+	vertical-align: middle;
+}
+
+table.alternative-color td.first,table.alternative-color th.first {
+	border-left: none;
+	padding-left: 20px;
+}
+
+/*layout of the table with form elements */
+table {
+	width: 695px;
+	margin-left: 7px;
+	text-align: left;
+}
+
+td {
+	padding: 10px;
+	padding-right: 5px;
+	font-size: 12px;
+}
+
+/*layout of button in table */
+td p.button {
+	margin: 0px;
+	padding: 10px 10px 10px 0px;
+	font-size: 11px;
+}
+
+/* */ /*layout of form styles */
+.field-name {
+	color: #0087e5;
+	font-weight: bold;
+	text-align: right;
+}
+
+.field-name-alternative-color {
+	color: #47bc23;
+	font-weight: bold;
+	text-align: right;
+}
+
+input {
+	border: 1px solid #c1c1c1;
+	padding: 2px;
+}
+
+textarea {
+	border: 1px solid #c1c1c1;;
+	padding: 2px;
+}
+
+.noBorder {
+	border: none;
+}
+
+/*misc styles*/
+.space-right {
+	margin-right: 10px;
+}
+
+.space-left {
+	margin-left: 10px;
+}
+
+.space-bottom {
+	margin-bottom: 40px;
+}
+
+hr {
+	border: none 0;
+	border-top: 1px solid #ccc;
+	width: 650px;
+	height: 1px;
+	margin: 15px 25px 10px 25px;
+}
+
+/* Warning message style */
+.warning {
+	color: #cc0000;
+	padding: 10px;
+	padding-left: 35px;
+	margin-top: 5px;
+	text-align: left;
+	font-weight: normal;
+	background: url('../images-for-css/warning.gif') no-repeat #ffeae0 10px 8px;
+	width: 72%
+}
+/* NOTE1 START : the following labels are not contained in the new css*/ /***********************************************************************
+h2 {
+	font-size: small;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	border-bottom-color: #666666;
+	margin-bottom: 1px;
+}
+
+th {
+	font-size: small;
+	color: #ffffff;
+	background-color: #075a8b;
+	text-align: left;
+}
+
+.formtablecontainer {
+	text-align: center;
+}
+
+.datatablecontainer {
+	width: 100%;
+}
+
+.buttoncontainer {
+	
+}
+
+input,select,textarea {
+	font-family: 'verdana', 'arial', 'helvetica', sans-serif;
+	font-size: small;
+}
+
+.forms {
+	border: 1px solid #999999;
+	font-size: small;
+	font-style: normal;
+	width: 100%;
+}
+
+.formlabel {
+	font-size: small;
+	font-style: normal;
+	text-align: right;
+	width: 20%;
+}
+
+.formcontrol {
+	font-size: small;
+	font-style: normal;
+	text-align: left;
+}
+
+.error {
+	font-size: small;
+	color: red;
+	font-style: normal;
+	text-align: left;
+}
+***********************************************************************/ /* NOTE1 END */ /********* tab styles **********/ /*tab styles*/ /* *****************************************************************************
+.tab {
+	text-align: center;
+}
+
+.tab a {
+	font-size: 11px;
+	color: #000000;
+	text-decoration: none;
+}
+
+.tab a:hover {
+	font-size: 11px;
+	color: #000000;
+	text-decoration: underline
+}
+
+.tabcentre {
+	background-image: url(../images/aqua_tab_centre.gif);
+	background-repeat: repeat-x;
+}
+
+.tabcentre_selected {
+	background-image: url(../images/aqua_tab_s_centre.gif);
+	background-repeat: repeat-x;
+}
+
+.tabcentre_inactive {
+	background-image: url(../images/aqua_tab_i_centre.gif);
+	background-repeat: repeat-x;
+}
+
+
+ *********************************************************************** */ /** Non Selected tab style **/ /* **********************************************************************
+.tableft td {
+	background: url(../images/aqua_tab_left.gif) no-repeat;
+}
+
+.tabright td {
+	background: url(../images/aqua_tab_right.gif) no-repeat;
+}
+
+
+*********************************************************************** */ /** Selected tab style **/ /* *********************************************************************
+.tableft_selected td {
+	background: url(../images/aqua_tab_s_left.gif) no-repeat;
+}
+
+.tableft_inactive td {
+	background: url(../images/aqua_tab_i_left.gif) no-repeat;
+}
+
+.tabright_selected td {
+	background: url(../images/aqua_tab_s_right.gif) no-repeat;
+}
+
+.tabright_inactive td {
+	background: url(../images/aqua_tab_i_right.gif) no-repeat;
+}
+
+*************************************************************************/ /*Tab content containers*/ /* ***********************************************************************
+.tabbody {
+	width: 98%;
+	background-color: #d9e8ff;
+	float: left;
+	margin: 0px 0px 0px 0px;
+	border-right-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-left-style: solid;
+	border-right-color: #0d3f59;
+	border-left-color: #0d3f59;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #0d3f59;
+	padding: 5px;
+}
+***********************************************************************/ /*specific styles for the content divs of the tabs*/ /***********************************************************************
+.content_b {
+	z-index: 0;
+	position: relative;
+	visibility: visible;
+}
+
+.content_a {
+	z-index: 0;
+	position: absolute;
+	visibility: hidden;
+}
+
+.content_i {
+	z-index: 0;
+	position: absolute;
+	visibility: hidden;
+}
+
+***********************************************************************/ /*end tabs*/ /***********************************************************************
+a.button {
+	float: right;
+	font-size: 12px;
+	color: #000000;
+	text-decoration: none;
+	text-align: center;
+	background-color: #b4c8fe;
+	margin: 2px 5px 2px 5px;
+	padding: 3px;
+	width: 80px;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-style: solid;
+	border-right-style: solid;
+	border-bottom-style: solid;
+	border-left-style: solid;
+	border-top-color: #ffffff;
+	border-right-color: #0d3f59;
+	border-bottom-color: #0d3f59;
+	border-left-color: #ffffff;
+}
+
+a.button:link {
+	color: #000000;
+	text-decoration: none;
+	background-color: #b4c8fe;
+}
+
+a.button:visited {
+	color: #000000;
+	text-decoration: none;
+	background-color: #b4c8fe;
+}
+
+a.button:hover {
+	text-decoration: none;
+	background-color: #ffffff;
+}
+
+a.button:active {
+	text-decoration: none;
+	background-color: #cccccc;
+	border-top-width: 1px;
+	border-right-width: 1px;
+	border-bottom-width: 1px;
+	border-left-width: 1px;
+	border-top-style: solid;
+	border-right-style: solid;
+	border-bottom-style: solid;
+	border-left-style: solid;
+	border-bottom-color: #ffffff;
+	border-left-color: #0d3f59;
+	border-top-color: #0d3f59;
+	border-right-color: #ffffff;
+}
+
+***********************************************************************/ /* For  <input type="button"> style */ /***********************************************************************
+.buttonStyle {
+	font-size: 12px;
+	color: #000000;
+	text-decoration: none;
+	text-align: center;
+	background-color: #b4c8fe;
+}
+
+***********************************************************************/
\ No newline at end of file
Index: lams_tool_chat/web/includes/css/fckeditor_style.css
===================================================================
diff -u -rb32ded72d955763a9b49e33e2dc2ab195d83564b -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/includes/css/fckeditor_style.css	(.../fckeditor_style.css)	(revision b32ded72d955763a9b49e33e2dc2ab195d83564b)
+++ lams_tool_chat/web/includes/css/fckeditor_style.css	(.../fckeditor_style.css)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,55 +1,46 @@
-.previewPanel{
-	width: 700px; 
-	height: 220px; 
+.previewPanel {
+	width: 500px;
+	height: 220px;
 	border-style: none;
 	border-width: 1px;
 	padding: 5px;
-	
 	overflow: auto;
 }
 
-.textareaPanel{
-	width: 700px; 
-	height: 220px; 
+.textareaPanel {
+	width: 500px;
+	height: 220px;
 }
 
-
-.smallPreviewPanel{
-         width: 700px;
-         height: 120px;
-         border-style: none;
-         border-width: 1px;
-         padding: 5px;
+.smallPreviewPanel {
+	width: 500px;
+	height: 120px;
+	border-style: none;
+	border-width: 1px;
+	padding: 5px;
 }
 
-.smallTextareaPanel{
-         width: 700px;
-         height: 120px;
+.smallTextareaPanel {
+	width: 500px;
+	height: 120px;
 }
 
-#wyswygEditor{
-	/*position the wyswygEditor in the centre*/
-	position: absolute; 
+#wyswygEditor { /*position the wyswygEditor in the centre*/
+	position: absolute;
 	/*top: 15%; 
 	left: 50%;
 	margin-left: -400px;
 	margin-top: -260px;*/
-	
 	width: 100%;
 	height: 100%;
-	
-	
 	/*border-style: solid; 
 	border-width: 3px;*/
 }
 
-#wyswygEditorScreen{
+#wyswygEditorScreen {
 	position: absolute;
-
-	width: 700px; 
-	height: 220px; 
-
+	width: 500px;
+	height: 220px;
 	padding: 0px;
 	margin: 0px;
-}
-
+}
\ No newline at end of file
Index: lams_tool_chat/web/includes/images-for-css/blue_arrow_right.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/body_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/btn_add_off.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/btn_add_over.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/btn_htmled_off.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/btn_htmled_over.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/btn_off.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/btn_over.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/button_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/button_bg.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/button_left.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/button_right.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/delete.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/down.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/edit.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/footer_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/green_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/greyfade_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/lams.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/lams_logo.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/layers.png
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/page_bg.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/selected_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/selected_left.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/selected_right.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/td_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/top_bg.jpg
===================================================================
diff -u
Binary files differ
Index: lams_tool_chat/web/includes/images-for-css/warning.gif
===================================================================
diff -u
Binary files differ
Fisheye: Tag 0039d5b56d00598a667c5cfd495364c49621ef65 refers to a dead (removed) revision in file `lams_tool_chat/web/includes/javascript/tabcontroller.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_chat/web/layouts/defaultLayout.jsp
===================================================================
diff -u -r37f1167e8ad177e0b943537cc4bdfa58685111c8 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision 37f1167e8ad177e0b943537cc4bdfa58685111c8)
+++ lams_tool_chat/web/layouts/defaultLayout.jsp	(.../defaultLayout.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,11 +1,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
         "http://www.w3.org/TR/html4/strict.dtd">
-        
-<%@ include file="/common/taglibs.jsp"%>        
 
+<%@ include file="/common/taglibs.jsp"%>
+
 <html>
 	<tiles:insert attribute="header" />
 	<body>
-		<tiles:insert attribute="body" />
+		<div id="page">
+			<div id="header"></div>
+			<div id="content">
+				<tiles:insert attribute="body" />
+			</div>
+			<div id="footer"></div>
+		</div>
 	</body>
 </html>
Index: lams_tool_chat/web/layouts/tabLayout.jsp
===================================================================
diff -u -r37f1167e8ad177e0b943537cc4bdfa58685111c8 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 37f1167e8ad177e0b943537cc4bdfa58685111c8)
+++ lams_tool_chat/web/layouts/tabLayout.jsp	(.../tabLayout.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -6,11 +6,13 @@
 <html>
 	<tiles:insert attribute="header" />
 	<body onload="init();">
-		<tiles:useAttribute name="pageTitleKey" />
-		<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
-		<h1>
-			<bean:message key="${pTitleKey}" />
-		</h1>
-		<tiles:insert attribute="body" />
+		<div id="page">
+			<tiles:useAttribute name="pageTitleKey" />
+			<bean:define name="pageTitleKey" id="pTitleKey" type="String" />
+			<h1>
+				<bean:message key="${pTitleKey}" />
+			</h1>
+			<tiles:insert attribute="body" />
+		</div>
 	</body>
 </html>
Index: lams_tool_chat/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r4be807263bfbc9cea8df491b18b07a17983f1923 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 4be807263bfbc9cea8df491b18b07a17983f1923)
+++ lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -3,26 +3,32 @@
 <c:set var="authoringForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
 <!-- ========== Advanced Tab ========== -->
-<div id="authoring_advanced">
-	<table class="forms">
+<table cellpadding="0">
+	<tbody>
 		<tr>
-			<td class="formcontrol">
-				<html:checkbox property="lockOnFinished" value="1">
-					<fmt:message key="advanced.lockOnFinished" />
-				</html:checkbox>
+			<td align="right">
+				<html:checkbox property="lockOnFinished" value="1" styleClass="noBorder"></html:checkbox>
 			</td>
+			<td>
+				<fmt:message key="advanced.lockOnFinished" />
+			</td>
 		</tr>
 		<tr>
-			<td class="formcontrol">
-				<html:checkbox property="filteringEnabled" value="1">
-					<fmt:message key="advanced.filteringEnabled" />
-				</html:checkbox>
+			<td align="right">
+				<html:checkbox property="filteringEnabled" value="1" styleClass="noBorder"></html:checkbox>
 			</td>
+			<td>
+				<fmt:message key="advanced.filteringEnabled" />
+			</td>
 		</tr>
 		<tr>
-			<td class="formcontrol">
+			<td>
+				&nbsp;
+			</td>
+			<td>
 				<html:textarea property="filterKeywords" cols="30" rows="3" />
 			</td>
 		</tr>
-	</table>
-</div>
+	</tbody>
+</table>
+
Index: lams_tool_chat/web/pages/authoring/authoring.jsp
===================================================================
diff -u -re1582051fac0c62608ec525ed2de8b666699ac86 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision e1582051fac0c62608ec525ed2de8b666699ac86)
+++ lams_tool_chat/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,28 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:Tabs control="true">
-	<lams:Tab id="1" key="button.basic" />
-	<lams:Tab id="2" key="button.advanced" />
-	<lams:Tab id="3" key="button.instructions" />
-</lams:Tabs>
+<div id="header">
 
-<div class="tabbody">
+	<!--  TITLE KEY PAGE GOES HERE -->
+	<lams:Tabs control="true">
+		<lams:Tab id="1" key="button.basic" />
+		<lams:Tab id="2" key="button.advanced" />
+		<lams:Tab id="3" key="button.instructions" />
+	</lams:Tabs>
+
+</div>
+<!--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="dispatch" value="updateContent" />
 		<html:hidden property="authSessionId" />
 
 		<div id="message" align="center">
 			<c:if test="${updateContentSuccess}">
-				<img src="${tool}images/good.png" >
+				<img src="${tool}images/good.png">
 				<bean:message key="message.updateSuccess" />
 				</img>
 			</c:if>
-			
+
 			<c:if test="${unsavedChanges}">
-				<img src="${tool}images/warning.png"/>
-				<bean:message key="message.unsavedChanges"/>
+				<img src="${tool}images/warning.png" />
+				<bean:message key="message.unsavedChanges" />
 			</c:if>
 		</div>
 
@@ -31,16 +37,17 @@
 		<lams:TabBody id="2" titleKey="button.advanced" page="advanced.jsp" />
 		<lams:TabBody id="3" titleKey="button.instructions" page="instructions.jsp" />
 
-		<hr />
 
+
 		<%-- Form Controls --%>
 		<!-- Button Row -->
 		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lachat11" 
-			cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${formBean.toolContentID}" />					
+		<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="lachat11" cancelButtonLabelKey="button.cancel" saveButtonLabelKey="button.save" toolContentID="${formBean.toolContentID}" />
 	</html:form>
 </div>
 
+<div id="footer"></div>
+
 <lams:HTMLEditor />
 
 
Index: lams_tool_chat/web/pages/authoring/basic.jsp
===================================================================
diff -u -rb32ded72d955763a9b49e33e2dc2ab195d83564b -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision b32ded72d955763a9b49e33e2dc2ab195d83564b)
+++ lams_tool_chat/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -3,27 +3,24 @@
 <c:set var="authoringForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
 <!-- ========== Basic Tab ========== -->
-<div id="authoring_basic">
-	<table class="forms">
-		
-		<%-- ========== TITLE FIELD ========== --%>
+<table cellpadding="0">
+	<tbody>
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="20%">
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
 				<lams:SetEditor id="Title" text="${authoringForm.title}" small="true" />
 			</td>
 		</tr>
 
-		<%-- ========== INSTRUCTIONS FIELD ========== --%>
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="20%">
 				<fmt:message key="label.authoring.basic.instructions" />
 			</td>
 			<td>
 				<lams:SetEditor id="Instructions" text="${authoringForm.instructions}" />
 			</td>
 		</tr>
-	</table>
-</div>
+	</tbody>
+</table>
Index: lams_tool_chat/web/pages/authoring/instructions.jsp
===================================================================
diff -u -rb32ded72d955763a9b49e33e2dc2ab195d83564b -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision b32ded72d955763a9b49e33e2dc2ab195d83564b)
+++ lams_tool_chat/web/pages/authoring/instructions.jsp	(.../instructions.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -3,14 +3,15 @@
 <c:set var="authoringForm" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 <html:hidden property="deleteFileUuid" />
 
-<div id="authoring_instructions">
-	<table class="form">
+
+<table cellpadding="0">
+	<tbody>
 		<!-- ==========  Online Instructions ========== -->
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="30%">
 				<fmt:message key="instructions.onlineInstructions" />
 			</td>
-			<td NOWRAP width="700">
+			<td>
 				<lams:SetEditor id="OnlineInstruction" text="${authoringForm.onlineInstruction}" />
 			</td>
 		</tr>
@@ -30,18 +31,12 @@
 							<c:set var="viewURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 							</c:set>
-							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-								<fmt:message key="link.view" />
-							</a>
-							&nbsp;
+							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
 
 							<c:set var="downloadURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
 							</c:set>
-							<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-								<fmt:message key="link.download" />
-							</a>
-							&nbsp;
+							<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
 
 							<html:link href="javascript:deleteAttachment('deleteOnline','${file.fileUuid}')">
 								<fmt:message key="link.delete" />
@@ -59,18 +54,12 @@
 							<c:set var="viewURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 							</c:set>
-							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-								<fmt:message key="link.view" />
-							</a>
-							&nbsp;
+							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
 
 							<c:set var="downloadURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
 							</c:set>
-							<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-								<fmt:message key="link.download" />
-							</a>
-							&nbsp;
+							<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
 
 							<html:link href="javascript:deleteAttachment('removeUnsavedOnline','${file.fileUuid}')">
 								<fmt:message key="link.delete" />
@@ -84,10 +73,10 @@
 
 		<!-- ==========  Online Attachments Upload========== -->
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="30%">
 				<fmt:message key="instructions.uploadOnlineInstr" />
 			</td>
-			<td class="formcontrol">
+			<td>
 				<html:file property="onlineFile">
 					<!--<fmt:message key="label.authoring.choosefile.button" />  -->
 					choose
@@ -97,23 +86,21 @@
 				</html:link>
 			</td>
 		</tr>
+	</tbody>
+</table>
 
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-		</tr>
 
+<hr />
+
+
+<table>
+	<tbody>
 		<!-- ==========  Offline Instructions ========== -->
 		<tr>
-			<td class="formlabel">
+			<td class="field-name-alternative-color" width="30%">
 				<fmt:message key="instructions.offlineInstructions" />
 			</td>
-			<td NOWRAP width="700">
-				<%-- TODO get rid of the nowrap --%>
+			<td>
 				<lams:SetEditor id="OfflineInstruction" text="${authoringForm.offlineInstruction}" />
 			</td>
 		</tr>
@@ -134,18 +121,12 @@
 							<c:set var="viewURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 							</c:set>
-							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-								<fmt:message key="link.view" />
-							</a>
-							&nbsp;
+							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
 
 							<c:set var="downloadURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
 							</c:set>
-							<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-								<fmt:message key="link.download" />
-							</a>
-							&nbsp;
+							<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
 
 							<html:link href="javascript:deleteAttachment('deleteOffline','${file.fileUuid}')">
 								<fmt:message key="link.delete" />
@@ -161,18 +142,12 @@
 							<c:set var="viewURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 							</c:set>
-							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')">
-								<fmt:message key="link.view" />
-							</a>
-							&nbsp;
+							<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"> <fmt:message key="link.view" /> </a> &nbsp;
 
 							<c:set var="downloadURL">
 								<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=true" />
 							</c:set>
-							<a href="<c:out value='${downloadURL}' escapeXml='false'/>">
-								<fmt:message key="link.download" />
-							</a>
-							&nbsp;
+							<a href="<c:out value='${downloadURL}' escapeXml='false'/>"> <fmt:message key="link.download" /> </a> &nbsp;
 
 							<html:link href="javascript:deleteAttachment('removeUnsavedOffline','${file.fileUuid}')">
 								<fmt:message key="link.delete" />
@@ -188,10 +163,10 @@
 		<!-- ==========  Offline Attachments Upload ========== -->
 
 		<tr>
-			<td class="formlabel">
+			<td class="field-name-alternative-color" width="30%">
 				<fmt:message key="instructions.uploadOfflineInstr" />
 			</td>
-			<td class="formcontrol">
+			<td>
 				<html:file property="offlineFile">
 					<!--<fmt:message key="label.authoring.choosefile.button" />  -->
 					choose
@@ -201,7 +176,6 @@
 				</html:link>
 			</td>
 		</tr>
+	</tbody>
+</table>
 
-
-	</table>
-</div>
Index: lams_tool_chat/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -rdd30b77529710e132099120a71a66aeabab46974 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision dd30b77529710e132099120a71a66aeabab46974)
+++ lams_tool_chat/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -2,43 +2,41 @@
 
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 
-<div class="datatablecontainer">
-	<table class="forms">
+<table cellspacing="0">
+	<tbody>
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="30%">
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
-			<td class="formcontrol">
+			<td>
 				<c:out value="${dto.title}" escapeXml="false" />
 			</td>
 		</tr>
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="30%">
 				<fmt:message key="label.authoring.basic.instructions" />
 			</td>
-			<td class="formcontrol">
+			<td>
 				<c:out value="${dto.instructions}" escapeXml="false" />
 			</td>
 		</tr>
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td class="formcontrol">
-				<c:choose>
-					<c:when test='${dto.chatEditable == "true"}'>
-						<c:url value="/authoring.do" var="authoringUrl">
-							<c:param name="toolContentID" value="${dto.toolContentId}" />
-						</c:url>
-						<html:link href="${authoringUrl}" styleClass="button" target="_blank">
-							<fmt:message key="button.editActivity" />
-						</html:link>
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.contentInUseSet" />
-					</c:otherwise>
-				</c:choose>
-			</td>
-		</tr>
-	</table>
-</div>
+	</tbody>
+</table>
+
+<p align="right">
+	<c:choose>
+		<c:when test='${dto.chatEditable == "true"}'>
+			<c:url value="/authoring.do" var="authoringUrl">
+				<c:param name="toolContentID" value="${dto.toolContentId}" />
+			</c:url>
+			<html:link href="${authoringUrl}" styleClass="button" target="_blank">
+				<fmt:message key="button.editActivity" />
+			</html:link>
+		</c:when>
+		<c:otherwise>
+			<fmt:message key="message.contentInUseSet" />
+		</c:otherwise>
+	</c:choose>
+</p>
+
+
Index: lams_tool_chat/web/pages/monitoring/instructions.jsp
===================================================================
diff -u -r3230983c0eb152473433c6fa2c24c6077600f436 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 3230983c0eb152473433c6fa2c24c6077600f436)
+++ lams_tool_chat/web/pages/monitoring/instructions.jsp	(.../instructions.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,15 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
-
-<div class="datatablecontainer">
-	<table class="forms">
-
+<table>
+	<tbody>
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="30%">
 				<fmt:message key="instructions.onlineInstructions" />
 			</td>
-			<td class="formcontrol">
+			<td>
 				<c:out value="${dto.onlineInstructions}" escapeXml="false" />
 			</td>
 		</tr>
@@ -18,7 +16,7 @@
 			<td>
 				&nbsp;
 			</td>
-			<td class="formcontrol">
+			<td>
 				<div id="onlinefile">
 					<c:if test="${not empty dto.onlineInstructionsFiles}">
 						<ul>
@@ -49,21 +47,18 @@
 				</div>
 			</td>
 		</tr>
+	</tbody>
+</table>
 
-		<tr>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-		</tr>
 
+
+<table>
+	<tbody>
 		<tr>
-			<td class="formlabel">
+			<td class="field-name" width="30%">
 				<fmt:message key="instructions.offlineInstructions" />
 			</td>
-			<td class="formcontrol">
+			<td>
 				<c:out value="${dto.offlineInstructions}" escapeXml="false" />
 			</td>
 		</tr>
@@ -72,7 +67,7 @@
 			<td>
 				&nbsp;
 			</td>
-			<td class="formcontrol">
+			<td>
 				<div id="offlinefile">
 					<c:if test="${not empty dto.offlineInstructionsFiles}">
 						<ul>
@@ -103,6 +98,5 @@
 				</div>
 			</td>
 		</tr>
-
-	</table>
-</div>
+	</tbody>
+</table>
Index: lams_tool_chat/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r8d5c540b1da67b18a80b3145c81c1ce04c2c17b2 -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 8d5c540b1da67b18a80b3145c81c1ce04c2c17b2)
+++ lams_tool_chat/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -1,15 +1,22 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<lams:Tabs>
-	<lams:Tab id="1" key="button.summary" />
-	<lams:Tab id="2" key="button.instructions" />
-	<lams:Tab id="3" key="button.editActivity" />
-	<lams:Tab id="4" key="button.statistics" />
-</lams:Tabs>
+<div id="header">
 
-<div class="tabbody">
+	<!--  TITLE KEY PAGE GOES HERE -->
+
+	<lams:Tabs>
+		<lams:Tab id="1" key="button.summary" />
+		<lams:Tab id="2" key="button.instructions" />
+		<lams:Tab id="3" key="button.editActivity" />
+		<lams:Tab id="4" key="button.statistics" />
+	</lams:Tabs>
+</div>
+
+<div id="content">
 	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
 	<lams:TabBody id="2" titleKey="button.instructions" page="instructions.jsp" />
 	<lams:TabBody id="3" titleKey="button.editActivity" page="editActivity.jsp" />
-	<lams:TabBody id="4" titleKey="button.statistics" page="statistics.jsp" />	
-</div>
\ No newline at end of file
+	<lams:TabBody id="4" titleKey="button.statistics" page="statistics.jsp" />
+</div>
+
+<div id="footer"></div>
Index: lams_tool_chat/web/pages/monitoring/statistics.jsp
===================================================================
diff -u -r80866aafca40538e310fb42553c77be0a0b3f2fd -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 80866aafca40538e310fb42553c77be0a0b3f2fd)
+++ lams_tool_chat/web/pages/monitoring/statistics.jsp	(.../statistics.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -2,54 +2,51 @@
 
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
-	<table class="forms">
-		<tr>
-			<th colspan="2">
-				<c:out value="${session.sessionName}" />
-			</th>
-		</tr>
+	<table cellspacing="0">
+		<tbody>
+			<tr>
+				<th colspan="2">
+					<c:out value="${session.sessionName}" />
+				</th>
+			</tr>
 
-		<tr>
-			<td class="formlabel">
-				<fmt:message>heading.totalLearners</fmt:message>
-			</td>
-			<td class="formcontrol">
-				<p>
+			<tr>
+				<td class="field-name" width="30%">
+					<fmt:message>heading.totalLearners</fmt:message>
+				</td>
+				<td>
 					TODO.
-				</p>
-			</td>
-		</tr>
+				</td>
+			</tr>
 
-		<tr>
-			<td class="formlabel">
-				<fmt:message>heading.totalMessages</fmt:message>
-			</td>
-			<td class="formcontrol">
-				<p>
-					<c:out value="${session.postCount}" />
-				</p>
-			</td>
-		</tr>
-
-		<tr>
-			<td>
-				<fmt:message>Learner</fmt:message>
-			</td>
-			<td>
-				<fmt:message>No of Posts</fmt:message>
-			</td>
-		</tr>
-
-		<c:forEach var="user" items="${session.userDTOs}">
 			<tr>
-				<td>
-					<c:out value="${user.jabberNickname}" />
+				<td class="field-name" width="30%">
+					<fmt:message>heading.totalMessages</fmt:message>
 				</td>
 				<td>
-					<c:out value="${user.postCount}" />
+					<c:out value="${session.postCount}" />
 				</td>
 			</tr>
-		</c:forEach>
 
+			<tr>
+				<th>
+					<fmt:message>Learner</fmt:message>
+				</th>
+				<th>
+					<fmt:message>No of Posts</fmt:message>
+				</th>
+			</tr>
+
+			<c:forEach var="user" items="${session.userDTOs}">
+				<tr>
+					<td>
+						<c:out value="${user.jabberNickname}" />
+					</td>
+					<td>
+						<c:out value="${user.postCount}" />
+					</td>
+				</tr>
+			</c:forEach>
+		</tbody>
 	</table>
 </c:forEach>
Index: lams_tool_chat/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r80866aafca40538e310fb42553c77be0a0b3f2fd -r0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e
--- lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 80866aafca40538e310fb42553c77be0a0b3f2fd)
+++ lams_tool_chat/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 0ac012d04d1fa2ee4df7139645ba7fecaa8b2a6e)
@@ -2,83 +2,73 @@
 
 <c:set var="dto" value="${requestScope.monitoringDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
-	<table class="forms">
+	<table cellspacing="0">
 		<tr>
 			<th colspan="2">
 				<c:out value="${session.sessionName}" />
 			</th>
 		</tr>
 
 		<tr>
-			<td>
+			<td class="field-name" width="30%">
 				<fmt:message>heading.totalLearners</fmt:message>
 			</td>
 			<td>
-				<p class="formcontrol">
-					TODO.
-				</p>
+				??99
 			</td>
 		</tr>
 
 		<tr>
-			<td>
+			<td class="field-name" width="30%">
 				<fmt:message>heading.totalMessages</fmt:message>
 			</td>
 			<td>
-				<p class="formcontrol">
-					<c:out value="${session.postCount}" />
-				</p>
+				<c:out value="${session.postCount}" />
 			</td>
 		</tr>
 
 		<tr>
-			<td>
+			<td class="field-name" width="30%">
 				<fmt:message>heading.recentMessages</fmt:message>
 			</td>
 			<td>
 				&nbsp;
 			</td>
 		</tr>
 		<tr>
-			<td class="formcontrol" colspan="2">
+			<td colspan="2">
 				<div style="background-color: white; padding: 8px;">
-				<c:choose>
-					<c:when test="${empty session.messageDTOs}">
-						<fmt:message>message.noChatMessages</fmt:message>
-					</c:when>
-					<c:otherwise>
+					<c:choose>
+						<c:when test="${empty session.messageDTOs}">
+							<fmt:message>message.noChatMessages</fmt:message>
+						</c:when>
+						<c:otherwise>
 
-						<c:forEach var="message" items="${session.messageDTOs}">
-							<div>
-								<span style="font-weight: bold"> <c:out value="${message.from}" /></span>
-								<c:out value="${message.body}" />
-								<br />
-							</div>
-						</c:forEach>
+							<c:forEach var="message" items="${session.messageDTOs}">
+								<div>
+									<span style="font-weight: bold"> <c:out value="${message.from}" /></span>
+									<c:out value="${message.body}" />
+									<br />
+								</div>
+							</c:forEach>
 
-					</c:otherwise>
-				</c:choose>
+						</c:otherwise>
+					</c:choose>
 				</div>
 			</td>
 		</tr>
 
 		<tr>
 			<td colspan="2">
-				&nbsp;
-			</td>
-		</tr>
-
-		<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>
 						<fmt:message>summary.editMessages</fmt:message>
 					</html:submit>
 				</html:form>
-				
-				<html:form action="/monitoring" method="post" target="_blank" >
+
+				<html:form action="/monitoring" method="post" target="_blank">
 					<html:hidden property="dispatch" value="openChatClient" />
 					<html:hidden property="toolSessionID" value="${session.sessionID}" />
 					<html:submit>
@@ -88,7 +78,7 @@
 						<fmt:message>Visible</fmt:message>
 					</html:checkbox>
 				</html:form>
-							
+
 			</td>
 		</tr>
 	</table>