Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -ra88211844dbfb8e302fc327caf6327c894cafbcf -rff2e6cf53af41f7a9ab89b48f5c7377db2c30f63
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -ra88211844dbfb8e302fc327caf6327c894cafbcf -rff2e6cf53af41f7a9ab89b48f5c7377db2c30f63
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r029e69643ff0fb567d2d53ef9e63ba4bd035e50b -rff2e6cf53af41f7a9ab89b48f5c7377db2c30f63
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 029e69643ff0fb567d2d53ef9e63ba4bd035e50b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision ff2e6cf53af41f7a9ab89b48f5c7377db2c30f63)
@@ -1317,7 +1317,8 @@
 			
 				Debugger.log('Opening url:'+url,Debugger.GEN,'openToolActivityContent','CanvasModel');
 				
-				JsPopup.getInstance().launchPopupWindow(url, 'ToolActivityContent', 600, 800, true, true, false, false, false);
+				// TODO: Maybe add learningDesignID and serverURL to window title to handle multiple LAMS(s) running in same browser session.
+				JsPopup.getInstance().launchPopupWindow(url, 'ToolActivityContent_' + ta.toolContentID, 600, 800, true, true, false, false, false);
 			
 				// set modified (not-saved) flag so that potential changes cannot be lost.
 				ApplicationParent.extCall('setSaved', 'false');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -ra88211844dbfb8e302fc327caf6327c894cafbcf -rff2e6cf53af41f7a9ab89b48f5c7377db2c30f63
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision a88211844dbfb8e302fc327caf6327c894cafbcf)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision ff2e6cf53af41f7a9ab89b48f5c7377db2c30f63)
@@ -381,7 +381,7 @@
 			showBranchProperties(branch);
 			
 			showGeneralControls(true, !branch.sequenceActivity.readOnly);
-			showBranchControls((Activity(cm.getCanvas().ddm.getActivityByUIID(branch.sequenceActivity.parentUIID)).activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE));
+			showBranchControls((Activity(cm.getCanvas().ddm.getActivityByUIID(branch.sequenceActivity.parentUIID)).activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE));
 			
 			showGeneralInfo(false);
 			showOptionalControls(false);