Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rbbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86 -rd343a1f8e38f854b55dd233f727727085e8a68ba
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision bbc64e3b60bf8b271c5cd2c41f122aba7d7d7c86)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision d343a1f8e38f854b55dd233f727727085e8a68ba)
@@ -26,7 +26,8 @@
       type="org.lamsfoundation.lams.tool.forum.web.forms.MessageForm"
     />
 
-<form-bean name="emptyForm" type="org.apache.struts.action.DynaActionForm"/>
+   <form-bean name="emptyForm" type="org.apache.struts.action.DynaActionForm" />
+
   </form-beans>
 
   <!-- ========== Global Exceptions Definitions =================================== -->
@@ -39,13 +40,10 @@
     <!-- B: end of global exceptions -->
 
   <!-- ========== Global Forward Definitions =================================== -->
-  	<!-- B: global forwards
-	<global-forwards>
-        <forward   name="forum.error"	path="tiles:/error.jsp"/>
-	</global-forwards>
-	 -->
-	<!-- E: global forwards -->
+  <global-forwards>
 
+</global-forwards>
+
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
 
@@ -65,16 +63,15 @@
 			scope="session" 
 			parameter="initPage" 
 			validate="false">
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
-
 		<action path="/authoring/update"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="session" 
 			parameter="updateContent" 
 			validate="false">
-			<forward name="author" path="/jsps/authoring/authoring.jsp" />
+			<forward name="author" path="tiles:/authoring/forum/main" />
 			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
 		</action>
 
@@ -84,31 +81,31 @@
 			scope="session" 
 			parameter="uploadOnlineFile" 
 			validate="false">
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<action path="/authoring/uploadOffline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="session" 
 			validate="false"
 			parameter="uploadOfflineFile" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<action path="/authoring/deleteOnline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="session" 
 			validate="false"
 			parameter="deleteOnlineFile" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<action path="/authoring/deleteOffline"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
 			name="forumForm" 
 			scope="session" 
 			validate="false"
 			parameter="deleteOfflineFile" >
-			<forward name="success" path="/jsps/authoring/authoring.jsp" />
+			<forward name="success" path="tiles:/authoring/forum/main" />
 		</action>
 		<action path="/authoring/newTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.AuthoringAction"
@@ -176,14 +173,14 @@
 			scope="session" 
 			validate="false"
 			parameter="finishTopic" >
-			<forward name="author" path="/jsps/authoring/authoring.jsp" />
+			<forward name="author" path="tiles:/authoring/forum/main" />
 			<forward name="monitor" path="tiles:/monitoring/forum/defineLater" />
 		</action>
 		<!-- ========== END: Authroing Definitions ============================== -->
 		<!-- ========== BEGIN: Learning Definitions ============================== -->
 		<action path="/learning/viewForum"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
-			parameter="viewForum" scope="request">
+			parameter="viewForum" scope="request" name="emptyForm">
 			<forward name="success" path="tiles:/learning/forum/viewForum" />
 		</action>
 		<action path="/learning/viewTopic"
@@ -239,6 +236,12 @@
 			scope="session">
 			<forward name="success" path="tiles:/learning/forum/viewTopic" />
 		</action>
+		<action path="/learning/updateMessageHideFlag"
+			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
+			parameter="updateMessageHideFlag" 
+			scope="session">
+			<forward name="success" path="tiles:/learning/forum/viewTopic" />
+		</action>	
 		<action path="/learning/deleteAttachment"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			name="messageForm" 
@@ -254,19 +257,12 @@
 		</action>
 		<!-- ========== END: Learning  Definitions ============================== -->
 		<!-- ========== START: Monitoring  Definitions ============================== -->
-		<action path="/monitoring/listContentUsers"
+		<action path="/monitoring" 
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			parameter="listContentUsers" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+		    scope="request"
+		    parameter="init" >
+			<forward name="load" path="tiles:/monitoring/forum/main" redirect="false" />	        
 		</action>
-		<action path="/monitoring/releaseMarks"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			name="emptyForm"
-			scope="request"
-			validate="false"
-			parameter="releaseMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
-		</action>
 		<action path="/monitoring/downloadMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			input="tiles:/monitoring/forum/listContentUsers"
@@ -310,44 +306,6 @@
 			parameter="updateMark" >
 			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
 		</action>
-		<action path="/monitoring/viewActivity"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			input="tiles:/monitoring/forum/viewActivity"
-			name="emptyForm"
-			scope="request"
-			validate="false"
-			parameter="viewActivity" >
-			<forward name="success" path="tiles:/monitoring/forum/viewActivity" />
-		</action>
-		<action path="/monitoring/editActivity"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			input="tiles:/monitoring/forum/editActivity"
-			name="emptyForm"
-			scope="request"
-			validate="false"			
-			parameter="editActivity" >
-			<forward name="success" path="tiles:/monitoring/forum/editActivity" />
-		</action>
-		<action path="/monitoring/updateActivity"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			input="tiles:/monitoring/forum/editActivity"
-			name="emptyForm"
-			scope="request"
-			validate="false"
-			parameter="updateActivity" >
-			<forward name="success" path="tiles:/monitoring/forum/viewActivity" />
-		</action>
-		<action path="/monitoring/viewInstructions"
-			input="tiles:/monitoring/forum/viewInstructions"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			parameter="viewInstructions" >
-			<forward name="success" path="tiles:/monitoring/forum/viewInstructions" />
-		</action>
-		<action path="/monitoring/statistic"
-			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
-			parameter="statistic" >
-			<forward name="success" path="tiles:/monitoring/forum/statistic" />
-		</action>
 		<action path="/monitoring/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="viewTopic">
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r4e52bbc28a71a298dacba22822b91975b880d5e8 -rd343a1f8e38f854b55dd233f727727085e8a68ba
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 4e52bbc28a71a298dacba22822b91975b880d5e8)
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision d343a1f8e38f854b55dd233f727727085e8a68ba)
@@ -37,11 +37,10 @@
     	<put name="footer" value="/includes/footer.jsp"/>
 	</definition>
 
-	<definition name="tiles:monitoring:layout" path="/includes/tablayout.jsp">
+	<definition name="tiles:tab:layout" path="/includes/tablayout.jsp">
     	<put name="pageTitleKey" value=""/>
     	<put name="body" value=""/>
-    	<put name="tab" value="/jsps/monitoring/tabmenu.jsp"/>
-    	<put name="header" value="/includes/header.jsp"/>
+    	<put name="header" value=""/>
     	<put name="footer" value="/includes/footer.jsp"/>
 	</definition>
 
@@ -56,6 +55,12 @@
 	<!-- E: Generic -->
 	
 	<!-- B: Authoring -->
+	<definition name="tiles:/authoring/forum/main" extends="tiles:tab:layout">
+    	<put name="pageTitleKey" value="page.title.authoring.init"/>
+    	<put name="header" value="/includes/authoringHeader.jsp"/>
+    	<put name="body" value="/jsps/authoring/authoring.jsp"/>
+	</definition>
+	
 	<definition name="tiles:/monitoring/forum/defineLater" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.definelater"/>
     	<put name="body" value="/jsps/monitoring/definelater.jsp"/>
@@ -105,54 +110,27 @@
     	<put name="pageTitleKey" value="title.message.edit"/>
     	<put name="body" value="/jsps/learning/edit.jsp"/>
 	</definition>
-	<!-- E: Authoring -->
+	<!-- E: Learning -->
 	
 	<!-- B: Monitoring -->
 	
-	<definition name="tiles:/monitoring/forum/main" extends="tiles:monitoring:layout">
+	<definition name="tiles:/monitoring/forum/main" extends="tiles:tab:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.init"/>
+		<put name="header" value="/includes/header.jsp"/>    	
     	<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
 	</definition>
-	
-	<definition name="tiles:/monitoring/forum/init" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.init"/>
-    	<put name="body" value="/jsps/monitoring/monitoring.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/monitoring/forum/listContentUsers" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.content.userlist"/>
-    	<put name="body" value="/jsps/monitoring/contentuserlist.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/viewAllMarks" extends="tiles:monitoring:layout">
+	<definition name="tiles:/monitoring/forum/viewAllMarks" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
     	<put name="body" value="/jsps/monitoring/viewallmarks.jsp"/>
 	</definition>
 	<definition name="tiles:/monitoring/forum/viewUserMark" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
     	<put name="body" value="/jsps/monitoring/usermarklist.jsp"/>
 	</definition>
-	<definition name="tiles:/monitoring/forum/editUserMark" extends="tiles:monitoring:layout">
+	<definition name="tiles:/monitoring/forum/editUserMark" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.edit.user.mark"/>
     	<put name="body" value="/jsps/monitoring/updatemarks.jsp"/>
 	</definition>
-	<definition name="tiles:/monitoring/forum/viewActivity" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.activity"/>
-    	<put name="body" value="/jsps/monitoring/viewactivity.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/editActivity" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.edit.activity"/>
-    	<put name="body" value="/jsps/monitoring/editactivity.jsp"/>
-	</definition>
-	<definition name="tiles:/monitoring/forum/viewInstructions" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.instructions"/>
-    	<put name="body" value="/jsps/monitoring/instructions.jsp"/>
-	</definition>
-	
-	<definition name="tiles:/monitoring/forum/statistic" extends="tiles:monitoring:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.statistic"/>
-    	<put name="body" value="/jsps/monitoring/statistic.jsp"/>
-	</definition>
-	
 	<definition name="tiles:/monitoring/forum/viewTopic" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
     	<put name="body" value="/jsps/monitoring/viewtopic.jsp"/>
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -r28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f -rd343a1f8e38f854b55dd233f727727085e8a68ba
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision d343a1f8e38f854b55dd233f727727085e8a68ba)
@@ -49,6 +49,10 @@
 	         <filter-class>
 			   org.lamsfoundation.lams.web.filter.LocaleFilter
 	         </filter-class>
+	        <init-param>
+            	<param-name>encoding</param-name>
+	            <param-value>UTF-8</param-value>
+	        </init-param>
 	</filter>
 
     <filter-mapping>
@@ -209,7 +213,7 @@
 		<!--   FCKEditor Tag Library -->
 		<!--  ======================================================== -->	
 		<taglib>
-		    <taglib-uri>tags-fck-editor</taglib-uri>
+		    <taglib-uri>fck-editor</taglib-uri>
 		    <taglib-location>/WEB-INF/fckeditor/tlds/FCKeditor.tld</taglib-location>
 		</taglib>
 		<!--  ======================================================== -->