Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
===================================================================
diff -u -r240f5a89847764532283243060c07572f88cc5cf -r0008a92961ecc6d41f1722f1b46eddf8f3a3b65d
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java	(.../ActivityPortfolio.java)	(revision 240f5a89847764532283243060c07572f88cc5cf)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java	(.../ActivityPortfolio.java)	(revision 0008a92961ecc6d41f1722f1b46eddf8f3a3b65d)
@@ -44,6 +44,7 @@
     /* The link to the tool page from the main export page */
     private String toolLink;
     private boolean headingNoPage;
+    private boolean floating;
     private Set<String> competencesCovered = new TreeSet<String>();
 
     /**
@@ -69,6 +70,7 @@
 	toolLink = null;
 	childPortfolios = null;
 	headingNoPage = false;
+	floating = false;
     }
 
     /**
@@ -153,7 +155,19 @@
     public void setHeadingNoPage(boolean headingNoPage) {
 	this.headingNoPage = headingNoPage;
     }
+    
+    /**
+     * Identifies this portfolio as of a Floating Activity
+     * @return
+     */
+    public boolean isFloating() {
+	return floating;
+    }
 
+    public void setFloating(boolean floating) {
+	this.floating = floating;
+    }
+
     public Set<String> getCompetencesCovered() {
 	return competencesCovered;
     }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
===================================================================
diff -u -re4c92abe243b6367ad45115df3e1f5ecec5e5de7 -r0008a92961ecc6d41f1722f1b46eddf8f3a3b65d
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	(.../PortfolioBuilder.java)	(revision e4c92abe243b6367ad45115df3e1f5ecec5e5de7)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	(.../PortfolioBuilder.java)	(revision 0008a92961ecc6d41f1722f1b46eddf8f3a3b65d)
@@ -108,6 +108,8 @@
 	this.user = user;
 	this.lesson = lesson;
 	this.progress = progress;
+	
+	
     }
 
     /** Prepares to process children */
@@ -124,6 +126,7 @@
 	    activityListStack.push(currentPortfolioList);
 	    currentPortfolioList = new ArrayList<ActivityPortfolio>();
 	}
+	
 	return true;
     }
 
@@ -166,6 +169,7 @@
 	if (complexPortfolio != null && !flattenLearnerBranching) {
 	    currentPortfolioList.add(complexPortfolio);
 	}
+
     }
 
     @Override
@@ -241,10 +245,6 @@
 	}
 
     }
-    
-    public void startFloatingActivity(FloatingActivity activity) throws LearningDesignProcessorException {}
-	
-	public void endFloatingActivity(FloatingActivity activity) throws LearningDesignProcessorException {}
 
     /**
      * A system tool may be a simple or a complex activity, so the logic is in a method called by both
@@ -355,6 +355,7 @@
 	p.setActivityId(activity.getActivityId());
 	p.setActivityName(activity.getTitle());
 	p.setActivityDescription(activity.getDescription());
+	p.setFloating(activity.isFloatingActivity());
 	return p;
     }
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
diff -u -re4c92abe243b6367ad45115df3e1f5ecec5e5de7 -r0008a92961ecc6d41f1722f1b46eddf8f3a3b65d
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision e4c92abe243b6367ad45115df3e1f5ecec5e5de7)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(.../LearningWebUtil.java)	(revision 0008a92961ecc6d41f1722f1b46eddf8f3a3b65d)
@@ -225,7 +225,7 @@
 			progress = learnerService.completeActivity(learnerId, currentActivity,progress);
 		}
 	
-		if ( progress == null )
+		if ( currentActivity.isFloating() )
 			return actionMappings.getCloseForward(currentActivity, lesson.getLessonId());
 		
 		LearningWebUtil.putActivityInRequest(request, progress.getNextActivity(), learnerService);
Index: lams_learning/web/exportPortfolio/main.jsp
===================================================================
diff -u -r240f5a89847764532283243060c07572f88cc5cf -r0008a92961ecc6d41f1722f1b46eddf8f3a3b65d
--- lams_learning/web/exportPortfolio/main.jsp	(.../main.jsp)	(revision 240f5a89847764532283243060c07572f88cc5cf)
+++ lams_learning/web/exportPortfolio/main.jsp	(.../main.jsp)	(revision 0008a92961ecc6d41f1722f1b46eddf8f3a3b65d)
@@ -103,7 +103,9 @@
 				<c:if test="${status.first}">
 					<UL>
 				</c:if>
-	
+				<c:if test="${actport.floating}">
+					<div style="margin-top: 2px">&nbsp;</div>
+				</c:if>
 				<lams:ExportPortOutput actport="${actport}"/>
 				<c:if test="${status.last}">
 					</UL>
Index: lams_learning/web/progress.jsp
===================================================================
diff -u -re281eb1df5a9a5e146f7298389cb1e5a21aaa0ef -r0008a92961ecc6d41f1722f1b46eddf8f3a3b65d
--- lams_learning/web/progress.jsp	(.../progress.jsp)	(revision e281eb1df5a9a5e146f7298389cb1e5a21aaa0ef)
+++ lams_learning/web/progress.jsp	(.../progress.jsp)	(revision 0008a92961ecc6d41f1722f1b46eddf8f3a3b65d)
@@ -48,7 +48,7 @@
 		<UL style="margin-right:0">
 	</c:if>
 	<c:if test="${activity.floating}">
-		<p>&nbsp;</p>
+		<div style="margin-top: 2px">&nbsp;</div>
 	</c:if>
 	<lams:ProgressOutput activity="${activity}"/>
 	<c:if test="${status.last}">