Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r6e921f0eba97c377550ad11dbe6e86fb825c3067 -r14d55ca063e2dbf81358c6438405a0fed9902c9a
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 6e921f0eba97c377550ad11dbe6e86fb825c3067)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 14d55ca063e2dbf81358c6438405a0fed9902c9a)
@@ -122,7 +122,7 @@
 	public function init(m:Observable, c:Controller){
 
 		super(m, c);
-        
+		
 		//Set up parameters for the grid
 		H_GAP = 10;
 		V_GAP = 10;
@@ -328,7 +328,7 @@
 		// end-point connector hub
 		cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: hubEndDir_x , _y: _endy, branchConnector:true})
 												: activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _monitorController:MonitorController(getController()), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true});
-		
+	
 		this.onEnterFrame = hitConnectorHubs;
 		
 	}
@@ -380,12 +380,12 @@
 			
 		setSize(model);
 		
-		var tm:TransitionManager = new TransitionManager(this);
-		tm.startTransition({type:mx.transitions.Zoom, 
-						direction:0, duration:1, easing:mx.transitions.easing.Bounce.easeOut});
-		tm.addEventListener("allTransitionsInDone", finishedOpen);
-		
-
+		if ((model instanceof CanvasModel) || (model instanceof MonitorModel && model.inBranchView == false)) {
+			var tm:TransitionManager = new TransitionManager(this);
+			tm.startTransition({type:mx.transitions.Zoom, 
+							direction:0, duration:1, easing:mx.transitions.easing.Bounce.easeOut});
+			tm.addEventListener("allTransitionsInDone", finishedOpen);
+		}
 	}
 	
 	public function finishedOpen(evt:Object):Void {
@@ -409,9 +409,12 @@
 	}
 	
 	private function close():Void {
-		if(model instanceof CanvasModel) model.getCanvas().hideBin();
-		model.selectedItem = null;
+		if(model instanceof CanvasModel) model.getCanvas().hideBin(); //typo
+			model.selectedItem = null;
 		
+		if (model instanceof MonitorModel)
+			model.inBranchView = false;
+			
 		var bkeys:Array = model.branchesDisplayed.keys();
 		
 		for(var i=0; i<bkeys.length; i++) {
@@ -429,8 +432,10 @@
 					 
 		if(model instanceof CanvasModel)
 			model.getCanvas().closeBranchView();
-		else
+		else {
+			model.getMonitor().getMV().getMonitorTabView().showAssets(true);
 			model.getMonitor().closeBranchView();
+		}
 		
 		Debugger.log("model.activeView :  " + model.activeView, Debugger.CRITICAL, "close", "CanvasBranchView");
 		
@@ -944,11 +949,11 @@
 		_isOpen = a;
 	}
 	
-	public function getParentScrollVPosition():Number {
+	/*public function getParentScrollVPosition():Number {
 		return (_parent instanceof CanvasBranchView) ? CanvasBranchView(_parent).getScrollVPosition() : CanvasView(_parent).getScrollVPosition();
 	}
 	
 	public function getScrollVPosition():Number {
 		return canvas_scp.vPosition;
-	}
+	}*/
 }
\ No newline at end of file