Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r035853516626933d59e2473b4410b1dc54bb023e -r6f1d9060e228ef70caffe407480da9e857f05ca0
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 035853516626933d59e2473b4410b1dc54bb023e)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 6f1d9060e228ef70caffe407480da9e857f05ca0)
@@ -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
===================================================================
diff -u -rb656ce2bbd8af424fa40fab8a178419311cffe87 -r6f1d9060e228ef70caffe407480da9e857f05ca0
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision b656ce2bbd8af424fa40fab8a178419311cffe87)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 6f1d9060e228ef70caffe407480da9e857f05ca0)
@@ -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');
 	}
 	
 	/*