Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r7da4eb99b105fef928be8501f19e41f7bb3211ce
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 7da4eb99b105fef928be8501f19e41f7bb3211ce)
@@ -55,8 +55,6 @@
 
     String currentTab;
 
-    String dispatch;
-
     String sessionMapID;
 
     Long deleteFileUuid;
@@ -87,14 +85,6 @@
 	this.currentTab = currentTab;
     }
 
-    public String getDispatch() {
-	return dispatch;
-    }
-
-    public void setDispatch(String dispatch) {
-	this.dispatch = dispatch;
-    }
-
     public String getInstructions() {
 	return instructions;
     }
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/LearningForm.java
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r7da4eb99b105fef928be8501f19e41f7bb3211ce
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/LearningForm.java	(.../LearningForm.java)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/LearningForm.java	(.../LearningForm.java)	(revision 7da4eb99b105fef928be8501f19e41f7bb3211ce)
@@ -33,7 +33,6 @@
 
     private static final long serialVersionUID = -4728946254882237144L;
 
-    String dispatch;
     Long chatUserUID;
     Long toolSessionID;
     String mode;
@@ -55,14 +54,6 @@
 	this.chatUserUID = chatUserUID;
     }
 
-    public String getDispatch() {
-	return dispatch;
-    }
-
-    public void setDispatch(String dispatch) {
-	this.dispatch = dispatch;
-    }
-
     public Long getToolSessionID() {
 	return toolSessionID;
     }
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/MonitoringForm.java
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r7da4eb99b105fef928be8501f19e41f7bb3211ce
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/MonitoringForm.java	(.../MonitoringForm.java)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/MonitoringForm.java	(.../MonitoringForm.java)	(revision 7da4eb99b105fef928be8501f19e41f7bb3211ce)
@@ -30,7 +30,6 @@
 
     private static final long serialVersionUID = 9096908688391850595L;
 
-    String dispatch;
     boolean teacherVisible;
     Long toolSessionID;
 
@@ -55,14 +54,7 @@
 	this.messageUID = messageUID;
     }
 
-    public String getDispatch() {
-	return dispatch;
-    }
 
-    public void setDispatch(String dispatch) {
-	this.dispatch = dispatch;
-    }
-
     public Long getToolSessionID() {
 	return toolSessionID;
     }
Index: lams_tool_chat/web/WEB-INF/web.xml
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r7da4eb99b105fef928be8501f19e41f7bb3211ce
--- lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/WEB-INF/web.xml	(.../web.xml)	(revision 7da4eb99b105fef928be8501f19e41f7bb3211ce)
@@ -133,43 +133,7 @@
 	</error-page>
 
 	<jsp-config>
-
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Index: lams_tool_chat/web/pages/learning/submissionDeadline.jsp
===================================================================
diff -u -r903574fa3e87a5a85057a975acfe6ccfba0b9de0 -r7da4eb99b105fef928be8501f19e41f7bb3211ce
--- lams_tool_chat/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 903574fa3e87a5a85057a975acfe6ccfba0b9de0)
+++ lams_tool_chat/web/pages/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7da4eb99b105fef928be8501f19e41f7bb3211ce)
@@ -12,6 +12,16 @@
 			<fmt:message key="activity.title" />
 		</title>
 		<link href="${tool}includes/css/chat.css" rel="stylesheet" type="text/css">
+		<link href="<lams:LAMSURL/>css/defaultHTML_learner.css" rel="stylesheet" type="text/css">
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript">
+		var MODE = "${MODE}", TOOL_SESSION_ID = '${param.toolSessionID}', APP_URL = '<lams:WebAppURL />', LEARNING_ACTION = "<c:url value='learning/learning.do'/>", LAMS_URL = '<lams:LAMSURL/>';
+		</script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
+		<script type="text/javascript" src="<lams:WebAppURL />includes/javascript/learning.js"></script>
+			
 		
 	</lams:head>