Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r46db2307a85a778b040a1f76ae6791f0d1d0c5a6 -re1f36676f5f48096f943ba518c8699e3ec4b8e12
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r46db2307a85a778b040a1f76ae6791f0d1d0c5a6 -re1f36676f5f48096f943ba518c8699e3ec4b8e12
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r1e9e05de4e775da14f011fed79edde7c1661f712 -re1f36676f5f48096f943ba518c8699e3ec4b8e12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 1e9e05de4e775da14f011fed79edde7c1661f712)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision e1f36676f5f48096f943ba518c8699e3ec4b8e12)
@@ -274,7 +274,9 @@
 		
 		transparentCover = content.createClassObject(Panel, "_transparentCover_mc", content.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50});
 		transparentCover.onPress = null;
-			
+		
+		branchContent = content.createEmptyMovieClip("_branch_content_mc", content.getNextHighestDepth());
+		
 		bkg_pnl.onRelease = function(){
 			Application.getInstance().getCanvas().getCanvasView().getController().canvasRelease(this);
 		}
@@ -804,8 +806,8 @@
 			if(_isBranchChild) 
 				Debugger.log("bc cx: " + cx + " // bc cy: " + cy, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
 			
-			canvas_scp._x = (_isBranchChild) ? -cx : -cx + hSpace;
-			canvas_scp._y = (_isBranchChild) ? -cy : -cy + vSpace; //+ getParentScrollVPosition() ;
+			canvas_scp._x = (_isBranchChild) ? -cx : -cx + hSpace + cm.getCanvas().view.getScrollPaneHPosition();
+			canvas_scp._y = (_isBranchChild) ? -cy : -cy + vSpace + cm.getCanvas().view.getScrollPaneVPosition();
 			
 			close_mc._x = bkg_pnl._x + bkg_pnl.width - close_mc._width - 10;
 			close_mc._y = bkg_pnl._y + 10;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -red9f070b260cd96e225c1f5bfcf6fe357f90645b -re1f36676f5f48096f943ba518c8699e3ec4b8e12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision ed9f070b260cd96e225c1f5bfcf6fe357f90645b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision e1f36676f5f48096f943ba518c8699e3ec4b8e12)
@@ -74,12 +74,11 @@
 		
 		//Create the view
 		_canvasView_mc = _target_mc.createChildAtDepth("canvasView",DepthManager.kTop);		
-
+		
         //Cast toolkit view clip as ToolkitView and initialise passing in model
 		canvasView = CanvasView(_canvasView_mc);
 		canvasView.init(canvasModel,undefined,x,y,w,h);
-        
-        
+
         //Get reference to application and design data model
 		app = Application.getInstance();
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r4a6ae174dc7df52f7e7be6f515be3af40f118759 -re1f36676f5f48096f943ba518c8699e3ec4b8e12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 4a6ae174dc7df52f7e7be6f515be3af40f118759)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision e1f36676f5f48096f943ba518c8699e3ec4b8e12)
@@ -518,6 +518,7 @@
 	
 	public function closeBranchView() {
 		var parentBranching:CanvasActivity = null;
+		
 		if(canvasModel.activeView.activity.parentUIID != null)
 			parentBranching = CanvasActivity(canvasModel.activitiesDisplayed.get(_ddm.getActivityByUIID(canvasModel.activeView.activity.parentUIID).parentUIID));
 		
@@ -548,7 +549,8 @@
 		var cy:Number = ba._y + ba.getVisibleHeight()/2;
 		var isVisible:Boolean = (visible == null) ? true : visible;
 		
-		var target:MovieClip = (canvasModel.activeView instanceof CanvasBranchView) ? canvasModel.activeView.content : _canvasView_mc.content;
+		var target:MovieClip = (canvasModel.activeView instanceof CanvasBranchView) ? canvasModel.activeView.branchContent : _canvasView_mc.branchContent;
+		
 		
 		var _branchView_mc:MovieClip = target.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible});	
 		var branchView:CanvasBranchView = CanvasBranchView(_branchView_mc);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -re1f36676f5f48096f943ba518c8699e3ec4b8e12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision ed0751bf76b6e95126836f3d8a51c7f60277a742)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision e1f36676f5f48096f943ba518c8699e3ec4b8e12)
@@ -157,7 +157,7 @@
 		//get the content path for the sp
 		content = canvas_scp.content;
 		
-		bkg_pnl = content.createClassObject(Panel, "bkg_pnl", getNextHighestDepth());
+		bkg_pnl = content.createClassObject(Panel, "bkg_pnl", content.getNextHighestDepth());
 		gridLayer = content.createEmptyMovieClip("_gridLayer_mc", content.getNextHighestDepth());
 		transitionLayer = content.createEmptyMovieClip("_transitionLayer_mc", content.getNextHighestDepth());
 		
@@ -167,6 +167,8 @@
 		transparentCover = content.createClassObject(Panel, "_transparentCover_mc", content.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50});
 		transparentCover.onPress = null;
 		
+		branchContent = content.createEmptyMovieClip("_branch_content_mc", content.getNextHighestDepth());
+		
 		titleBar = _canvasView.attachMovie("DesignTitleBar", "titleBar", _canvasView.getNextHighestDepth())
 		
 		var styleObj = _tm.getStyleObject('label');
@@ -522,4 +524,12 @@
     public function defaultController (model:Observable):Controller {
         return new CanvasController(model);
     }
+	
+	public function getScrollPaneVPosition():Number {
+		return canvas_scp.vPosition;
+	}
+	
+	public function getScrollPaneHPosition():Number {
+		return canvas_scp.hPosition;
+	}
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
===================================================================
diff -u -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4 -re1f36676f5f48096f943ba518c8699e3ec4b8e12
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as	(.../CommonCanvasView.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as	(.../CommonCanvasView.as)	(revision e1f36676f5f48096f943ba518c8699e3ec4b8e12)
@@ -52,8 +52,9 @@
 	
     private var bkg_pnl:Panel;
 	
-	private var _content_mc:MovieClip;
-  
+	private var _content_mc:MovieClip;
+	private var _branch_content_mc:MovieClip;
+	
 	private var _gridLayer_mc:MovieClip;
     private var _transitionLayer_mc:MovieClip;
 	private var _activityLayer_mc:MovieClip;
@@ -196,6 +197,14 @@
 	public function set content(a:MovieClip):Void {
 		_content_mc = a;
 	}
+	
+	public function get branchContent():MovieClip {
+		return _branch_content_mc;
+	}
+	
+	public function set branchContent(a:MovieClip):Void {
+		_branch_content_mc = a;
+	}
 	
 	public function get activityLayer():MovieClip {
 		return _activityLayer_mc;