Index: lams_learning/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r8823e60698e6fd2968077c46540d6cd9453d4666 -rbf77e0e7ce264dac574577c0d61cc94caad9a1fb
--- lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision 8823e60698e6fd2968077c46540d6cd9453d4666)
+++ lams_learning/web/WEB-INF/struts/struts-config.xml	(.../struts-config.xml)	(revision bf77e0e7ce264dac574577c0d61cc94caad9a1fb)
@@ -86,21 +86,6 @@
   <!-- ========== Action Mapping Definitions =================================== -->
    <action-mappings>
     <action
-      path="/DisplayOptionsActivity"
-      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
-      name="optionsActivityForm"
-      scope="request"
-      input="/Activity.do"
-      unknown="false"
-      validate="false"
-    >
-      <forward
-        name="displayOptions"
-        path=".optionsActivity"
-        redirect="false"
-      />
-    </action>
-    <action
       path="/gate"
       type="org.lamsfoundation.lams.learning.web.action.GateAction"
       parameter="method"
@@ -121,6 +106,21 @@
       />
     </action>
     <action
+      path="/DisplayOptionsActivity"
+      type="org.lamsfoundation.lams.learning.web.action.DisplayOptionsActivityAction"
+      name="optionsActivityForm"
+      scope="request"
+      input="/Activity.do"
+      unknown="false"
+      validate="false"
+    >
+      <forward
+        name="displayOptions"
+        path=".optionsActivity"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/grouping"
       type="org.lamsfoundation.lams.learning.web.action.GroupingAction"
       name="GroupingForm"
@@ -269,8 +269,6 @@
     <action
       path="/exportPortfolio"
       type="org.lamsfoundation.lams.learning.export.web.action.ExportPortfolioAction"
-      name="activityForm"
-      scope="request"
       unknown="false"
       validate="false"
     >
@@ -282,10 +280,20 @@
         scope="request"
       />
       <forward
+        name="displayPrintVersion"
+        path="/exportPortfolioPrintVersion.jsp"
+        redirect="false"
+      />
+      <forward
         name="displayPortfolio"
         path="/exportPortfolio.jsp"
         redirect="false"
       />
+      <forward
+        name="loadExportPage"
+        path="/exportWaitingPage.jsp"
+        redirect="false"
+      />
     </action>
     <action
       path="/ChooseActivity"