Index: lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r931bdcc1f8f6c0be00be8d0cae6ac633eff6e677 -r39a4ece987cbb4ab50fd15fc15d2dbb210fece38
--- lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 931bdcc1f8f6c0be00be8d0cae6ac633eff6e677)
+++ lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 39a4ece987cbb4ab50fd15fc15d2dbb210fece38)
@@ -51,7 +51,7 @@
 	
 	<!-- Begin: Headers -->
 	<definition name="tiles:/header:default" path="/common/header.jsp">
-		<put name="script" value="" type="page"/>
+		<put name="headItems" value="" type="page"/>
 	</definition>
 	<!-- End: Headers -->
 
@@ -64,34 +64,50 @@
 	</definition>
 	
 	<definition name="tiles:/header:authoring" extends="tiles:/header:default">
-		<put name="script" value="/pages/authoring/script.jsp"/>
+		<put name="headItems" value="/pages/authoring/headItems.jsp"/>
 	</definition>
 	<!-- End: Authoring -->
 
 
 	<!-- Begin: Learning -->
 	<definition name="tiles:/learning/main" extends="tiles:/layout:default">
 		<put name="pageTitleKey" value="pageTitle.learning" />
-		<put name="header" value="tiles:/header:learning" />
-		<put name="body" value="/pages/learning/learning.jsp" />
+ 		<put name="header" value="tiles:/header:learning" />
+		<put name="body" value="/chat_client/chat_ui.jsp" />
 	</definition>
-	
+
+ 	
 	<definition name="tiles:/header:learning" extends="tiles:/header:default">
-		<put name="script" value="/pages/learning/script.jsp"/>
+		<put name="headItems" value="/pages/learning/headItems.jsp"/>
 	</definition>	
+
 	<!-- End: Learning -->
 
 
 	<!-- Begin: Monitoring -->
 	<definition name="tiles:/monitoring/main" extends="tiles:/layout:tab">
 		<put name="pageTitleKey" value="pageTitle.monitoring" />
-		<put name="header" value="tiles:/header:monitoring" type="definition" />
+		<put name="header" value="tiles:/header:monitoring/main" type="definition" />
 		<put name="body" value="/pages/monitoring/monitoring.jsp" />
 	</definition>
 	
-	<definition name="tiles:/header:monitoring" extends="tiles:/header:default">
-		<put name="script" value="/pages/monitoring/script.jsp"/>
+	<definition name="tiles:/monitoring/chat_client" extends="tiles:/layout:tab">
+		<put name="pageTitleKey" value="pageTitle.monitoring" />
+		<put name="header" value="tiles:/header:monitoring/chat_client" />
+		<put name="body" value="/chat_client/chat_ui.jsp" />
 	</definition>
+	
+	<definition name="tiles:/header:monitoring/main" extends="tiles:/header:default">
+		<put name="headItems" value="/pages/monitoring/headItems.jsp"/>
+	</definition>
+	
+	<!--  TODO: need to find a way, so that the headItems is optional. 
+		Also need to create a definition for chat_client, so we dont repeat in monitoring and 
+		learning.
+	-->	
+	<definition name="tiles:/header:monitoring/chat_client" extends="tiles:/header:default">
+		<put name="headItems" value="/pages/learning/headItems.jsp"/>
+	</definition>
 	<!-- End: Monitoring -->
 
 </tiles-definitions>