Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r017e5b3d4ea2b50ef99ee7609b8e0001968f8833 -r1b2b3ea69db5a34337e617684ccc32196c4dd9c0
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r017e5b3d4ea2b50ef99ee7609b8e0001968f8833 -r1b2b3ea69db5a34337e617684ccc32196c4dd9c0
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -r1b2b3ea69db5a34337e617684ccc32196c4dd9c0
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision d065d513d8d620f940a0adb75935ebc5553cc276)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 1b2b3ea69db5a34337e617684ccc32196c4dd9c0)
@@ -787,8 +787,8 @@
 		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 || model.activeView instanceof CommonCanvasView) && isCanvasModel) {
-			var bin = model.getCanvas().bin;
+		var bin = model.getCanvas().bin;
+		if(bin._parent == this.binLayer) {
 			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/CanvasView.as
===================================================================
diff -u -raf3cd1d3045cff25723cb3794c9eca632cac55a1 -r1b2b3ea69db5a34337e617684ccc32196c4dd9c0
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision af3cd1d3045cff25723cb3794c9eca632cac55a1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 1b2b3ea69db5a34337e617684ccc32196c4dd9c0)
@@ -458,8 +458,8 @@
 		var grid_mc = Grid.drawGrid(gridLayer, Math.round(newWidth), Math.round(newHeight), V_GAP, H_GAP);
 		
 		//position bin in canvas. 
-		if(cm.activeView == this || cm.activeView instanceof CommonCanvasView) {
-			var bin = cm.getCanvas().bin;
+		var bin = cm.getCanvas().bin;
+		if(bin._parent == this) {
 			bin._x = (s.w - bin._width) - 20;
 			bin._y = (s.h - bin._height) - 20;
 		}