Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -ra4ca6be279b2a304529a1702dac7e650d7d59d36 -rb47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -ra4ca6be279b2a304529a1702dac7e650d7d59d36 -rb47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -ra4ca6be279b2a304529a1702dac7e650d7d59d36 -rb47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision a4ca6be279b2a304529a1702dac7e650d7d59d36)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision b47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96)
@@ -227,6 +227,7 @@
 			} else {
 				var callback:Function = Proxy.create(this,onStoreDesignResponse, callback);
 				
+				Application.getInstance().getToolbar().setButtonState("save_btn", false, true);
 				Application.getInstance().getComms().sendAndReceive(dto,"servlet/authoring/storeLearningDesignDetails",callback,false);
 			}
 		}
@@ -242,6 +243,7 @@
 	 * @return  
 	 */
 	public function onStoreDesignResponse(r, callback:Function):Void{
+		Application.getInstance().getToolbar().setButtonState("save_btn", true, true);
 		Application.getInstance().getWorkspace().getWV().clearDialog();
 		
 		if(r instanceof LFError){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as
===================================================================
diff -u -ra4ca6be279b2a304529a1702dac7e650d7d59d36 -rb47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision a4ca6be279b2a304529a1702dac7e650d7d59d36)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(.../ToolbarController.as)	(revision b47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96)
@@ -124,9 +124,9 @@
 			_app.getCanvas().toggleBranchTool();
 			
 		}else if(tgt.indexOf("preview") != -1){
-			_app.getCanvas().launchPreviewWindow();
 			Cursor.showCursor(Application.C_HOURGLASS);
 			_toolbarModel.setButtonState("preview_btn", false, true);
+			_app.getCanvas().launchPreviewWindow();
 		}else if(tgt.indexOf("cancel") != -1){
 			_app.getCanvas().finishEditOnFly(false, true);
 		}