Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -r126d84999e520648cb187e465cb4aaa3baad222e
--- lams_monitoring/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_monitoring/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 126d84999e520648cb187e465cb4aaa3baad222e)
@@ -44,24 +44,29 @@
   <global-forwards>
       <forward
       	name="error"
-      	path="/error.jsp"
+      	path=".systemError"
       />
 </global-forwards>
 
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/toolBranching"
-      type="org.lamsfoundation.lams.monitoring.web.ToolOutputBranchingAction"
+      path="/grouping"
+      type="org.lamsfoundation.lams.monitoring.web.GroupingAJAXAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="viewBranches"
-        path=".viewBranches"
+        name="chosenGrouping"
+        path="/grouping/chosenGrouping.jsp"
         redirect="false"
       />
+      <forward
+        name="viewGroups"
+        path=".viewGroups"
+        redirect="false"
+      />
     </action>
     <action
       path="/gate"
@@ -94,37 +99,38 @@
       />
     </action>
     <action
-      path="/complexProgress"
-      type="org.lamsfoundation.lams.monitoring.web.ComplexLearnerProgressAction"
+      path="/groupedBranching"
+      type="org.lamsfoundation.lams.monitoring.web.GroupBasedBranchingAJAXAction"
+      parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="complexProgress"
-        path=".complexProgress"
+        name="groupedSelection"
+        path="/branching/groupedSelection.jsp"
         redirect="false"
       />
       <forward
-        name="parallelProgress"
-        path="/parallelProgress.jsp"
+        name="viewBranches"
+        path=".viewBranches"
         redirect="false"
       />
     </action>
     <action
-      path="/grouping"
-      type="org.lamsfoundation.lams.monitoring.web.GroupingAJAXAction"
+      path="/chosenBranching"
+      type="org.lamsfoundation.lams.monitoring.web.ChosenBranchingAJAXAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="chosenGrouping"
-        path="/grouping/chosenGrouping.jsp"
+        name="chosenSelection"
+        path="/branching/chosenSelection.jsp"
         redirect="false"
       />
       <forward
-        name="viewGroups"
-        path=".viewGroups"
+        name="viewBranches"
+        path=".viewBranches"
         redirect="false"
       />
     </action>
@@ -146,59 +152,53 @@
         redirect="false"
       />
       <forward
-      	name="timeChart"
-      	path="/timeChart.jsp"
-      	redirect="false" 
+        name="timeChart"
+        path="/timeChart.jsp"
+        redirect="false"
       />
     </action>
     <action
-      path="/chosenBranching"
-      type="org.lamsfoundation.lams.monitoring.web.ChosenBranchingAJAXAction"
+      path="/toolBranching"
+      type="org.lamsfoundation.lams.monitoring.web.ToolOutputBranchingAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="chosenSelection"
-        path="/branching/chosenSelection.jsp"
-        redirect="false"
-      />
-      <forward
         name="viewBranches"
         path=".viewBranches"
         redirect="false"
       />
     </action>
     <action
-      path="/groupedBranching"
-      type="org.lamsfoundation.lams.monitoring.web.GroupBasedBranchingAJAXAction"
+      path="/sequence"
+      type="org.lamsfoundation.lams.monitoring.web.SequenceAction"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
-        name="groupedSelection"
-        path="/branching/groupedSelection.jsp"
+        name="viewSequence"
+        path=".viewSequence"
         redirect="false"
       />
-      <forward
-        name="viewBranches"
-        path=".viewBranches"
-        redirect="false"
-      />
     </action>
     <action
-      path="/sequence"
-      type="org.lamsfoundation.lams.monitoring.web.SequenceAction"
-      parameter="method"
+      path="/complexProgress"
+      type="org.lamsfoundation.lams.monitoring.web.ComplexLearnerProgressAction"
       unknown="false"
       validate="false"
     >
       <forward
-        name="viewSequence"
-        path=".viewSequence"
+        name="complexProgress"
+        path=".complexProgress"
         redirect="false"
       />
+      <forward
+        name="parallelProgress"
+        path="/parallelProgress.jsp"
+        redirect="false"
+      />
     </action>
 
     <!-- If you have non XDoclet actions, define them in a file called struts-actions.xml and place it in your merge directory. -->