Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringGeneral.js,v
diff -u -r1.34 -r1.35
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	21 Apr 2014 09:57:43 -0000	1.34
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	21 Apr 2014 15:52:33 -0000	1.35
@@ -695,7 +695,9 @@
 								return false;
 							}
 						});
-					} else if (layout.floatingActivity && layout.floatingActivity.id == activityData.parentActivityID) {
+					}
+					
+					if (layout.floatingActivity && layout.floatingActivity.id == activityData.parentActivityID) {
 						// add a Tool Activity as a Floating Activity element
 						if (!layout.floatingActivity.childActivities) {
 							layout.floatingActivity.childActivities = [];
@@ -1035,7 +1037,7 @@
 			'activityUIID' 			 : activity.uiid,
 			'toolID' 				 : activity.toolID,
 			'learningLibraryID' 	 : activity.learningLibraryID,
-			'toolContentID' 	 	 : activity.toolContentID,
+			'toolContentID' 	 	 : activity.toolContentID || activity.toolID,
 			'stopAfterActivity' 	 : false,
 			'groupingSupportType' 	 : 2,
 			'applyGrouping' 		 : isGrouped,
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/authoring/authoringMenu.js,v
diff -u -r1.24 -r1.25
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	16 Apr 2014 09:16:26 -0000	1.24
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	21 Apr 2014 15:52:33 -0000	1.25
@@ -850,8 +850,8 @@
 			return;
 		}
 		
-		 window.open(LAMS_URL + 'authoring/exportToolContent.do?learningDesignID=46','Export',
-				 'width=712,height=298,resize=yes,status=yes,scrollbar=no,menubar=no,toolbar=no');
+		 window.open(LAMS_URL + 'authoring/exportToolContent.do?learningDesignID=' + layout.ld.learningDesignID,
+				 'Export','width=712,height=298,resize=yes,status=yes,scrollbar=no,menubar=no,toolbar=no');
 	}
 	
 	/*