Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r37af5b14c1ca675771b0e28c941c75d338427b8c -r4e049aced5079eff1ff599aa4572624cc0314e59
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 37af5b14c1ca675771b0e28c941c75d338427b8c)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 4e049aced5079eff1ff599aa4572624cc0314e59)
@@ -26,10 +26,6 @@
       type="org.lamsfoundation.lams.learning.web.form.TestDblSubmitForm"
     />
     <form-bean
-      name="notebookForm"
-      type="org.lamsfoundation.lams.learning.web.form.NotebookForm"
-    />
-    <form-bean
       name="optionsActivityForm"
       type="org.lamsfoundation.lams.learning.web.form.OptionsActivityForm"
     />
@@ -93,52 +89,35 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/notebook/DisplayEntry"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayNotebookEntry"
-      name="notebookForm"
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
+      name="optionsActivityForm"
       scope="request"
+      input="/Activity.do"
       unknown="false"
       validate="false"
     >
       <forward
-        name="displayEntry"
-        path=".journalDetail"
+        name="displayOptions"
+        path=".optionsActivity"
         redirect="false"
       />
     </action>
     <action
-      path="/DisplayActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayActivity"
+      path="/LoadToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.LoadToolActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
-    </action>
-    <action
-      path="/DisplayLoadToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayLoadToolActivity"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
       <forward
         name="displayTool"
         path=".loadToolActivity"
         redirect="false"
       />
     </action>
     <action
-      path="/DisplayToolActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivity"
-      name="activityForm"
-      scope="request"
-      unknown="false"
-      validate="false"
-    >
-    </action>
-    <action
       path="/test/DummyTool"
       type="org.lamsfoundation.lams.learning.web.action.DummyToolAction"
       name="dummyToolForm"
@@ -159,74 +138,63 @@
       />
     </action>
     <action
-      path="/DisplayParallelActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivity"
+      path="/CompleteActivity"
+      type="org.lamsfoundation.lams.learning.web.action.CompleteActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="displayParallel"
-        path=".parallelActivity"
-        redirect="false"
-      />
     </action>
     <action
-      path="/DisplayOptionsActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivity"
-      name="optionsActivityForm"
+      path="/DisplayToolActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayToolActivityAction"
+      name="activityForm"
       scope="request"
-      input="/Activity.do"
       unknown="false"
       validate="false"
     >
-      <forward
-        name="displayOptions"
-        path=".optionsActivity"
-        redirect="false"
-      />
     </action>
     <action
-      path="/CompleteActivity"
-      type="org.lamsfoundation.lams.learning.web.action.CompleteActivity"
+      path="/DisplayActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
     </action>
     <action
-      path="/notebook/SaveEntry"
-      type="org.lamsfoundation.lams.learning.web.action.SaveNotebookEntry"
-      name="notebookForm"
+      path="/test/DblSubmit"
+      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
+      name="testDblSubmitForm"
       scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="displayEntry"
-        path="/DisplayEntry"
-        redirect="true"
+        name="display"
+        path="/test/dblSubmitTest.jsp"
+        redirect="false"
       />
     </action>
     <action
-      path="/test/DblSubmit"
-      type="org.lamsfoundation.lams.learning.web.action.TestDblSubmitAction"
-      name="testDblSubmitForm"
+      path="/DisplayParallelActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayParallelActivityAction"
+      name="activityForm"
       scope="request"
       unknown="false"
       validate="false"
     >
       <forward
-        name="display"
-        path="/test/dblSubmitTest.jsp"
+        name="displayParallel"
+        path=".parallelActivity"
         redirect="false"
       />
     </action>
     <action
       path="/ChooseActivity"
-      type="org.lamsfoundation.lams.learning.web.action.ChooseActivity"
+      type="org.lamsfoundation.lams.learning.web.action.ChooseActivityAction"
       name="activityForm"
       scope="request"
       unknown="false"