Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java
===================================================================
diff -u -rd9e5194732537256537b5e5896cf9656f2f9a435 -rdf1dd252a471b4fdac4700b7b04691e39ea2643e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java	(.../DisplayLoadToolActivity.java)	(revision d9e5194732537256537b5e5896cf9656f2f9a435)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayLoadToolActivity.java	(.../DisplayLoadToolActivity.java)	(revision df1dd252a471b4fdac4700b7b04691e39ea2643e)
@@ -54,8 +54,10 @@
 		form.setActivityId(activity.getActivityId());
 		
 		List activityURLs = new ArrayList();
-		ActivityURL url = actionMappings.getToolURL(toolActivity, learnerProgress);
-		activityURLs.add(url);
+		String url = actionMappings.getToolURL(toolActivity, learnerProgress);
+		ActivityURL activityURL = new ActivityURL();
+		activityURL.setUrl(url);
+		activityURLs.add(activityURL);
 		form.setActivityURLs(activityURLs);
 		
 		String forward = "displayTool";
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java
===================================================================
diff -u -rd9e5194732537256537b5e5896cf9656f2f9a435 -rdf1dd252a471b4fdac4700b7b04691e39ea2643e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java	(.../DisplayOptionsActivity.java)	(revision d9e5194732537256537b5e5896cf9656f2f9a435)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivity.java	(.../DisplayOptionsActivity.java)	(revision df1dd252a471b4fdac4700b7b04691e39ea2643e)
@@ -64,13 +64,15 @@
 		form.setActivityId(activity.getActivityId());
 
 		List activityURLs = new ArrayList();
-		// TODO: Need to get order somehow
 		Set subActivities = optionsActivity.getActivities();
 		Iterator i = subActivities.iterator();
 		int completedCount = 0;
 		while (i.hasNext()) {
 			Activity subActivity = (Activity)i.next();
-			ActivityURL activityURL = actionMappings.getActivityURL(subActivity, learnerProgress);
+			ActivityURL activityURL = new ActivityURL();
+			String url = actionMappings.getActivityURL(subActivity, learnerProgress);
+			activityURL.setUrl(url);
+			activityURL.setActivityId(subActivity.getActivityId());
 			activityURL.setTitle(subActivity.getTitle());
 			activityURL.setDescription(subActivity.getDescription());
 			if (learnerProgress.getProgressState(subActivity) == LearnerProgress.ACTIVITY_COMPLETED) {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java
===================================================================
diff -u -rd9e5194732537256537b5e5896cf9656f2f9a435 -rdf1dd252a471b4fdac4700b7b04691e39ea2643e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java	(.../DisplayParallelActivity.java)	(revision d9e5194732537256537b5e5896cf9656f2f9a435)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivity.java	(.../DisplayParallelActivity.java)	(revision df1dd252a471b4fdac4700b7b04691e39ea2643e)
@@ -60,8 +60,10 @@
 		Iterator i = subActivities.iterator();
 		while (i.hasNext()) {
 			Activity subActivity = (Activity)i.next();
-			ActivityURL url = actionMappings.getActivityURL(subActivity, learnerProgress);
-			activityURLs.add(url);
+			ActivityURL activityURL = new ActivityURL(); 
+			String url = actionMappings.getActivityURL(subActivity, learnerProgress);
+			activityURL.setUrl(url);
+			activityURLs.add(activityURL);
 		}
 		if (activityURLs.size() == 0) {
 		    log.error(className+": No sub-activity URLs for activity "+activity.getActivityId());
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java
===================================================================
diff -u -rd9e5194732537256537b5e5896cf9656f2f9a435 -rdf1dd252a471b4fdac4700b7b04691e39ea2643e
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java	(.../DisplayToolActivity.java)	(revision d9e5194732537256537b5e5896cf9656f2f9a435)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivity.java	(.../DisplayToolActivity.java)	(revision df1dd252a471b4fdac4700b7b04691e39ea2643e)
@@ -49,9 +49,9 @@
 		
 		ToolActivity toolActivity = (ToolActivity)activity;
 
-		ActivityURL activityURL = actionMappings.getToolURL(toolActivity, learnerProgress);
+		String url = actionMappings.getToolURL(toolActivity, learnerProgress);
 		try {
-		    response.sendRedirect(activityURL.getUrl());
+		    response.sendRedirect(url);
 		}
 		catch (java.io.IOException e) {
 		    return mapping.findForward(actionMappings.ERROR);