Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r83fbf5159b9583cf3a97857974089884d0b66f63 -rff4a320a1090e53f7230a679055388a73ce06793
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r83fbf5159b9583cf3a97857974089884d0b66f63 -rff4a320a1090e53f7230a679055388a73ce06793
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 83fbf5159b9583cf3a97857974089884d0b66f63)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision ff4a320a1090e53f7230a679055388a73ce06793)
@@ -594,7 +594,7 @@
 					Debugger.log('activityDoubleClick CanvasBranchActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick','CanvasController');
 	   
 					_canvasModel.openBranchActivityContent(ca, true);
-					Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false);
+					Application.getInstance().getToolbar().setButtonState("support_act_btn", false, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 					LFMenuBar.getInstance().enableArrangeActivities(false);
 					
 					// invalidate design after opening tool content window
@@ -742,7 +742,7 @@
 							_canvasModel.getCanvas().ddm.removeEntries(_canvasModel.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(ca.activity.activityUIID).all);
 						
 						if (ca.activity.isReferenceActivity()) {
-							Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false);
+							Application.getInstance().getToolbar().setButtonState("support_act_btn", true, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 						}
 
 						_canvasModel.removeComplexActivity(ca);	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r524875c8f256cd60d0f22996857f8ea37261b01a -rff4a320a1090e53f7230a679055388a73ce06793
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 524875c8f256cd60d0f22996857f8ea37261b01a)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision ff4a320a1090e53f7230a679055388a73ce06793)
@@ -212,7 +212,7 @@
 			
 			canvasModel.clearAllElements();
 			createContentFolder();
-			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false);
+			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 			
 			return true;
 		}else{
@@ -801,7 +801,7 @@
 		canvasModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null;
 		
 		if (canvasModel.currentBranchingActivity == null && canvasModel.getReferenceActivityOnCanvas() == null) {
-			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false);
+			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 		}
 		if (canvasModel.activeView instanceof CanvasView) {
 			LFMenuBar.getInstance().enableArrangeActivities(true);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rc645668a11086e5356242fb747671002434381c2 -rff4a320a1090e53f7230a679055388a73ce06793
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision c645668a11086e5356242fb747671002434381c2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision ff4a320a1090e53f7230a679055388a73ce06793)
@@ -314,7 +314,7 @@
 		//_cv.ddm.referenceActivityUIID = referenceAct.activityUIID;
 		
 		// disable the reference activity button
-		Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false);
+		Application.getInstance().getToolbar().setButtonState("support_act_btn", false, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 		
 		setDirty();
 		setSelectedItem(_activitiesDisplayed.get(referenceAct.activityUIID));
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -rf1269ae0a26dba294ec02a457561b0b63447565e -rff4a320a1090e53f7230a679055388a73ce06793
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision f1269ae0a26dba294ec02a457561b0b63447565e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision ff4a320a1090e53f7230a679055388a73ce06793)
@@ -320,7 +320,7 @@
 		}
 		else if(a.activityTypeID==Activity.REFERENCE_ACTIVITY_TYPE) {
 			
-			Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false);
+			Application.getInstance().getToolbar().setButtonState("support_act_btn", false, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 			
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);