Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rd8e6bc4f6319680e6f72fb8fb68b7a9433515abc -rfd2eb12a0f90745f54413766d18f204b33f88f1e
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rd8e6bc4f6319680e6f72fb8fb68b7a9433515abc -rfd2eb12a0f90745f54413766d18f204b33f88f1e
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -rb27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0 -rfd2eb12a0f90745f54413766d18f204b33f88f1e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision b27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision fd2eb12a0f90745f54413766d18f204b33f88f1e)
@@ -444,10 +444,12 @@
 	
 	public function checkValidDesign(){
 		if(_ddm.validDesign){
-			Application.getInstance().getToolbar().setButtonState('preview_btn', true);
+			Application.getInstance().getToolbar().setButtonState('preview_btn', true);
+			Application.getInstance().getToolbar().setButtonState('preview_btn_click_target', true, false);
 			LFMenuBar.getInstance().enableExport(true);
 		}else{
-			Application.getInstance().getToolbar().setButtonState('preview_btn', false);
+			Application.getInstance().getToolbar().setButtonState('preview_btn', false);
+			Application.getInstance().getToolbar().setButtonState('preview_btn_click_target', true, true);
 			LFMenuBar.getInstance().enableExport(false);
 		}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as
===================================================================
diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -rfd2eb12a0f90745f54413766d18f204b33f88f1e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as	(.../Toolbar.as)	(revision 60db93c549c96bad95e890f34add10c4ef9d3d2e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as	(.../Toolbar.as)	(revision fd2eb12a0f90745f54413766d18f204b33f88f1e)
@@ -136,8 +136,8 @@
 			Application.getInstance().canvas.checkValidDesign();
 	}
 	
-	public function setButtonState(btnName:String, btnState:Boolean){
-		toolbarModel.setButtonState(btnName, btnState);
+	public function setButtonState(btnName:String, btnState:Boolean, btnVisible:Boolean){
+		toolbarModel.setButtonState(btnName, btnState, btnVisible);
 	}
     
     function get className():String{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as
===================================================================
diff -u -r86aae1b21277f5fc950a0303361b63fd7adde39c -rfd2eb12a0f90745f54413766d18f204b33f88f1e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as	(.../ToolbarModel.as)	(revision 86aae1b21277f5fc950a0303361b63fd7adde39c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as	(.../ToolbarModel.as)	(revision fd2eb12a0f90745f54413766d18f204b33f88f1e)
@@ -77,7 +77,7 @@
 			buttonArr[6] 	= ["optional_btn", "icon_optional"];
 			buttonArr[7] 	= ["flow_btn", "icon_flow"];
 			buttonArr[8] 	= ["group_btn", "icon_group"];
-			buttonArr[9] 	= ["preview_btn", "icon_preview"];
+			buttonArr[9] 	= ["preview_btn", "icon_preview", "preview_btn_click_target"];
 			buttonArr[10] 	= ["optional_act_btn", "icon_optional"];
 			buttonArr[11] 	= ["optional_seq_btn", "icon_optional"];
 			buttonArr[12] 	= ["gate_btn", "icon_gate"];
@@ -115,7 +115,8 @@
 	
 	public function setDefaultState(){
 		Debugger.log('setDefaultState is called: ',Debugger.GEN,'setDefaultState','Toolbar');
-		setButtonState("preview_btn", false)
+		setButtonState("preview_btn", false);
+		setButtonState("preview_btn_click_target", true);
 	}
 
 	/**
@@ -125,14 +126,15 @@
 	 * @param   btnState 
 	 * @return  
 	 */
-	public function setButtonState(btnName:String, btnState:Boolean){
+	public function setButtonState(btnName:String, btnState:Boolean, btnVisible:Boolean){
 		Debugger.log('button name in setButtonState is : '+btnName, Debugger.GEN,'setButtonState','ToolbarModel');		
 		
 		setChanged();
 		infoObj = {};
 		infoObj.updateType = "BUTTON";
-		infoObj.button = btnName
-		infoObj.buttonstate = btnState
+		infoObj.button = btnName;
+		infoObj.buttonstate = btnState;
+		infoObj.buttonvisible = btnVisible;
 		notifyObservers(infoObj);
 		
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
===================================================================
diff -u -reaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115 -rfd2eb12a0f90745f54413766d18f204b33f88f1e
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	(.../ToolbarView.as)	(revision eaa9b5ca1c61bf87f01ef2edbb3362a1b1a85115)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	(.../ToolbarView.as)	(revision fd2eb12a0f90745f54413766d18f204b33f88f1e)
@@ -63,6 +63,8 @@
 	
 	private var group_btn:Button;
 	private var preview_btn:Button;
+	private var preview_btn_click_target:Button;
+	
 	private var cancel_btn:Button;
 	
 	private var _toolbarMenu:Array;
@@ -166,6 +168,8 @@
 		group_btn.addEventListener("click", controller);
 		branch_btn.addEventListener("click", controller);
 		preview_btn.addEventListener("click", controller);
+		preview_btn_click_target.addEventListener("click", controller);
+		
 		apply_changes_btn.addEventListener("click", controller);
 		cancel_btn.addEventListener("click", controller);
 		
@@ -213,6 +217,9 @@
 		preview_btn.onRollOver = Proxy.create(this,this['showToolTip'], preview_btn, "preview_btn_tooltip");
 		preview_btn.onRollOut = Proxy.create(this,this['hideToolTip']);
 		
+		preview_btn_click_target.onRollOver = Proxy.create(this,this['showToolTip'], preview_btn, "preview_btn_tooltip");
+		preview_btn_click_target.onRollOut = Proxy.create(this,this['hideToolTip']);
+		
 		apply_changes_btn.onRollOver = Proxy.create(this,this['showToolTip'], apply_changes_btn, "apply_changes_btn_tooltip");
 		apply_changes_btn.onRollOut = Proxy.create(this,this['hideToolTip']);
 		
@@ -265,7 +272,7 @@
 		gate_btn.tabIndex = 212
 		branch_btn.tabIndex = 213
 		group_btn.tabIndex = 214
-		preview_btn.tabIndex = 215	
+		preview_btn.tabIndex = 215
 		cancel_btn.tabIndex = 216
 	}
 	
@@ -290,6 +297,13 @@
 				_toolbarMenu[i] = this.attachMovie("Button", menuList[i][0], this.getNextHighestDepth(), {label:btnLabel, icon:menuList[i][1] });
 				_toolbarMenu[i].setSize(btnWidth, 25);
 			
+				if(menuList[i][2] != null) {
+					_toolbarMenu[i].clickTarget = new Object();
+					_toolbarMenu[i].clickTarget.btn = this.attachMovie("Button", menuList[i][2], this.getNextHighestDepth(), {label:"", icon:menuList[i][1], _alpha: 0});
+					_toolbarMenu[i].clickTarget.btn.setSize(btnWidth, 25);
+				}
+				
+			
 			} else {
 				_toolbarMenu[i] = null;
 			}
@@ -298,16 +312,16 @@
 				
 				if (i == 0){
 					_toolbarMenu[i]._x  = btnOffset_X;
-					
 				} else {
-					_toolbarMenu[i]._x = getToolbarButtonXPos(_toolbarMenu, i-1, 1); //(_toolbarMenu[i-1]._x+_toolbarMenu[i-1].width)+btnOffset_X
+					_toolbarMenu[i]._x = getToolbarButtonXPos(_toolbarMenu, i-1, 1);
 				}
 				
 				_toolbarMenu[i]._y = btnOffset_Y;
-			
+				
 				if ((i >= menuList.length-4) && (i < menuList.length-2)) {
 					_toolbarMenu[i]._x = this.optional_btn._x;
 					_toolbarMenu[i]._y = (_toolbarMenu[i-1]._y+_toolbarMenu[i-1].height)+btnOffset_Y;
+					
 				}
 				
 				if (i >= menuList.length-2){
@@ -319,6 +333,11 @@
 					btn_text.removeTextField();
 				}
 				
+				if(_toolbarMenu[i].clickTarget != null) {
+					_toolbarMenu[i].clickTarget.btn._x = _toolbarMenu[i]._x;
+					_toolbarMenu[i].clickTarget.btn._y = _toolbarMenu[i]._y;
+				}
+				
 			}
 			
 			
@@ -375,13 +394,18 @@
 	private function setState(tm:ToolbarModel, infoObj:Object):Void{
 		Debugger.log('button name in setButtonState is : '+infoObj.button, Debugger.GEN,'setState','ToolbarView');		
 		this[infoObj.button].enabled = infoObj.buttonstate;
+		this[infoObj.button].visible = (infoObj.buttonvisible != null) ? infoObj.buttonvisible : true ;
 	}
 	
 	public function showToolTip(btnObj, btnTT:String):Void{
 		var Xpos = Application.TOOLBAR_X+ btnObj._x;
 		var Ypos = (Application.TOOLBAR_Y+ btnObj._y+btnObj.height)+5;
 		var ttHolder = ApplicationParent.tooltip;
 		var ttMessage = Dictionary.getValue(btnTT);
+		
+		if(btnObj == preview_btn && !btnObj.enabled)
+			ttMessage = Dictionary.getValue(btnTT + "_disabled");
+		
 		_tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos);
 		
 	}
@@ -432,6 +456,7 @@
 		branch_btn.setStyle('styleName',styleObj);
 		group_btn.setStyle('styleName', styleObj);
 		preview_btn.setStyle('styleName',styleObj);
+		preview_btn_click_target.setStyle('stylename', styleObj);
 		cancel_btn.setStyle('styleName',styleObj);
 		
 		styleObj = _tm.getStyleObject('BGPanel');