Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -radc0dfff0e9b6456008da9b252defac5714ed4d1 -raf3cd1d3045cff25723cb3794c9eca632cac55a1
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -radc0dfff0e9b6456008da9b252defac5714ed4d1 -raf3cd1d3045cff25723cb3794c9eca632cac55a1
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r4ff6091246a044e1ca1032611f344a63ef72aef0 -raf3cd1d3045cff25723cb3794c9eca632cac55a1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 4ff6091246a044e1ca1032611f344a63ef72aef0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision af3cd1d3045cff25723cb3794c9eca632cac55a1)
@@ -787,7 +787,7 @@
 		grid_mc = Grid.drawGrid(gridLayer,Math.round(s.w),Math.round(s.h),V_GAP,H_GAP);
 		
 		//position bin in canvas.  
-		if(model.activeView == this && isCanvasModel) {
+		if((model.activeView == this || model.activeView instanceof CommonCanvasView) && isCanvasModel) {
 			var bin = model.getCanvas().bin;
 			bin._x = (s.w - bin._width) - 10;
 			bin._y = (s.h - bin._height) - 10;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as
===================================================================
diff -u -radc0dfff0e9b6456008da9b252defac5714ed4d1 -raf3cd1d3045cff25723cb3794c9eca632cac55a1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	(.../CanvasComplexView.as)	(revision adc0dfff0e9b6456008da9b252defac5714ed4d1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	(.../CanvasComplexView.as)	(revision af3cd1d3045cff25723cb3794c9eca632cac55a1)
@@ -199,6 +199,9 @@
 		model.currentBranchingActivity = (_prevActiveView.activity.isBranchingActivity()) ? _prevActiveView.activity : null;
 
 		model.removeObserver(this);
+		
+		_complexActivity.refresh();
+
 		this.removeMovieClip();
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -r47545d87ebe3a0fde51c85720b8e0693ad471843 -raf3cd1d3045cff25723cb3794c9eca632cac55a1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 47545d87ebe3a0fde51c85720b8e0693ad471843)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision af3cd1d3045cff25723cb3794c9eca632cac55a1)
@@ -458,7 +458,7 @@
 		var grid_mc = Grid.drawGrid(gridLayer, Math.round(newWidth), Math.round(newHeight), V_GAP, H_GAP);
 		
 		//position bin in canvas. 
-		if(cm.activeView == this) {
+		if(cm.activeView == this || cm.activeView instanceof CommonCanvasView) {
 			var bin = cm.getCanvas().bin;
 			bin._x = (s.w - bin._width) - 20;
 			bin._y = (s.h - bin._height) - 20;