Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rf1b6debeb98703ac264781d1949b04e2745ebd9c -r77deb8f0850b92b8de8bbecd08f011b6450c00ea
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rf1b6debeb98703ac264781d1949b04e2745ebd9c -r77deb8f0850b92b8de8bbecd08f011b6450c00ea
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -rea5dd39341c9597a297fe0e292479b5e184196c5 -r77deb8f0850b92b8de8bbecd08f011b6450c00ea
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision ea5dd39341c9597a297fe0e292479b5e184196c5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 77deb8f0850b92b8de8bbecd08f011b6450c00ea)
@@ -409,10 +409,10 @@
 	
 	public function checkValidDesign(){
 		if(_ddm.validDesign){
-			Application.getInstance().getToolbar().setButtonState('preview_btn',true);
+			Application.getInstance().getToolbar().setButtonState('preview_btn', true);
 			LFMenuBar.getInstance().enableExport(true);
 		}else{
-			Application.getInstance().getToolbar().setButtonState('preview_btn',false);
+			Application.getInstance().getToolbar().setButtonState('preview_btn', false);
 			LFMenuBar.getInstance().enableExport(false);
 		}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as
===================================================================
diff -u -rea5dd39341c9597a297fe0e292479b5e184196c5 -r77deb8f0850b92b8de8bbecd08f011b6450c00ea
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as	(.../Toolbar.as)	(revision ea5dd39341c9597a297fe0e292479b5e184196c5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as	(.../Toolbar.as)	(revision 77deb8f0850b92b8de8bbecd08f011b6450c00ea)
@@ -21,6 +21,7 @@
  * ************************************************************************
  */
 
+import org.lamsfoundation.lams.authoring.Application
 import org.lamsfoundation.lams.authoring.tb.*
 import org.lamsfoundation.lams.common.util.*
 import mx.managers.*;
@@ -34,6 +35,8 @@
 	// View
 	private var toolbarView:ToolbarView;
 	private var toolbarView_mc:MovieClip;
+	
+	private var _prevButtonState:Array;
     
 	public static var NORMAL_MODE:Number = 0;
 	public static var EDIT_MODE:Number = 1;
@@ -99,20 +102,38 @@
 	
 	public function disableAll() {
 		Debugger.log("disabling all", Debugger.CRITICAL, "disableAll", "Toolbar");
+		
+		_prevButtonState = new Array();
 		enableAll(false);
 	}
 	
 	public function enableAll(a:Boolean) {
+		
 		if(a == null) a = true;
 		var buttons:Array = toolbarView.toolbarMenu;
 		
 		Debugger.log("disabling all", Debugger.CRITICAL, "disableAll", "Toolbar");
 		
-		
 		for(var i=0; i < buttons.length; i++) {
 		
-			setButtonState(buttons[i]._name, a);
+			if(a) { 
+				if(_prevButtonState[i] != null) {
+					setButtonState(_prevButtonState[i].name, _prevButtonState[i].value);
+				}
+					
+			} else {
+				var buttonState = new Object();
+				buttonState.name = buttons[i]._name;
+				buttonState.value = buttons[i].enabled;
+				
+				setButtonState(buttons[i]._name, a);
+				_prevButtonState.push(buttonState);
+			}
+			
 		}
+		
+		if(a) 
+			Application.getInstance().canvas.checkValidDesign();
 	}
 	
 	public function setButtonState(btnName:String, btnState:Boolean){