Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -re1c507a1e1171f32fbcfe0370a184ccaea623ff1 -r976deca023b114ae00e73ad6583f6c8174b25372
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -re1c507a1e1171f32fbcfe0370a184ccaea623ff1 -r976deca023b114ae00e73ad6583f6c8174b25372
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
diff -u -ra8ac7a5ebf51910461bd95e31ec50506841100a4 -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision a8ac7a5ebf51910461bd95e31ec50506841100a4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	(.../Activity.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -22,6 +22,7 @@
  */
 
 import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.authoring.br.CanvasBranchView;
 import org.lamsfoundation.lams.common.dict.*
 import org.lamsfoundation.lams.common.*
 import org.lamsfoundation.lams.common.util.*
@@ -166,7 +167,8 @@
 	private var _readOnly:Boolean;
 	
 	private var _viewID:Boolean;
-	
+
+	private var _branchView:CanvasBranchView;
      
     //Constructor
 	 /**
@@ -786,4 +788,13 @@
 		else
 			return null;
 	}
+	
+	public function get branchView():CanvasBranchView {
+		return _branchView;
+	}
+	
+	public function set branchView(a:CanvasBranchView):Void {
+		_branchView = a;
+	}
+	
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
===================================================================
diff -u -r93a02624adff176042f98649f582d3c919b652d4 -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 93a02624adff176042f98649f582d3c919b652d4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -145,6 +145,5 @@
 	public function get defaultBranch():Branch {
 		return _defaultBranch;
 	}
-	
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r7fb6b41326c14398bde6d88690e65ebd166a1e44 -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 7fb6b41326c14398bde6d88690e65ebd166a1e44)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -609,7 +609,7 @@
 			return false;
 		
 		if(a.isBranchingActivity())
-			cm.activitiesDisplayed.get(a.activityUIID).branchView.removeMovieClip();
+			a.branchView.removeMovieClip();
 		
 		var r = cm.activitiesDisplayed.remove(a.activityUIID);
 		r.removeMovieClip();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r9fce0caf6fe2935fae201bc27121005c83f2c62e -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 9fce0caf6fe2935fae201bc27121005c83f2c62e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -392,7 +392,6 @@
 				else ComplexActivity(sequenceAct).firstActivityUIID = actToAdd.activityUIID;							
 				
 				if(!(canvasModel.activeView instanceof CanvasComplexView)) {
-					CanvasOptionalActivity(canvasModel.activitiesDisplayed.get(sequenceAct.parentUIID)).removeAllChildren();
 					canvasModel.removeActivity(sequenceAct.parentUIID); 
 				}
 			}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -rbfb4d9a9b1992d55a06627289b169c9188ab12ff -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision bfb4d9a9b1992d55a06627289b169c9188ab12ff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -125,7 +125,6 @@
 	private var bgNegative:String = "original";
 	private var authorMenu:ContextMenu;
 	
-	private var _branchView:CanvasBranchView;
 	private var _setupBranchView:Boolean;
 	
 	private var _sequenceChild:Boolean;
@@ -638,9 +637,9 @@
 		_x = x;
 		_y = y;
 		
-		if(branchView != null) {
-			branchView._x = _x + getVisibleWidth()/2;
-			branchView._y = _y + getVisibleHeight()/2;
+		if(activity.branchView != null) {
+			activity.branchView._x = _x + getVisibleWidth()/2;
+			activity.branchView._y = _y + getVisibleHeight()/2;
 		}
 		
 	}
@@ -756,17 +755,9 @@
     }
 	
 	private function destroy() {
-		branchView.removeMovieClip();
+		activity.branchView.removeMovieClip();
 	}
 	
-	public function get branchView():CanvasBranchView {
-		return _branchView;
-	}
-	
-	public function set branchView(a:CanvasBranchView):Void {
-		_branchView = a;
-	}
-	
 	public function get setupBranchView():Boolean {
 		return _setupBranchView;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r9fce0caf6fe2935fae201bc27121005c83f2c62e -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 9fce0caf6fe2935fae201bc27121005c83f2c62e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -532,9 +532,9 @@
 		Debugger.log("parentUIID: " + canvasModel.activeView.activity.parentUIID, Debugger.CRITICAL, "closeBranchView", "CanvasHelper");
 		
 		Debugger.log("is parentBranching: " + parentBranching.activity.isBranchingActivity(), Debugger.CRITICAL, "closeBranchView", "CanvasHelper");
-		Debugger.log("parent branchView: " + parentBranching.branchView, Debugger.CRITICAL, "closeBranchView", "CanvasHelper");
+		Debugger.log("parent branchView: " + parentBranching.activity.branchView, Debugger.CRITICAL, "closeBranchView", "CanvasHelper");
 		
-		canvasModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.branchView : canvasView;
+		canvasModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.activity.branchView : canvasView;
 		canvasModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null;
 		
 		Debugger.log("activeView: " + canvasModel.activeView, Debugger.CRITICAL, "closeBranchView", "CanvasHelper");
@@ -571,7 +571,7 @@
 		
 		canvasModel.addObserver(branchView);
 		
-		ba.branchView = branchView;
+		ba.activity.branchView = branchView;
 		
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r9fce0caf6fe2935fae201bc27121005c83f2c62e -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 9fce0caf6fe2935fae201bc27121005c83f2c62e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -343,8 +343,6 @@
 		ca.activity.orderID = null;
 		ca.activity.parentActivityID = (activeView instanceof CanvasBranchView) ? activeView.defaultSequenceActivity.activityID : null;
 		
-		CanvasOptionalActivity(_activitiesDisplayed.get(parentID)).removeAllChildren();
-		
 		if(!(activeView instanceof CanvasComplexView)) removeActivity(parentID);
 		
 		haltRefresh(false);
@@ -472,7 +470,6 @@
 		if(activeView instanceof CanvasComplexView && activeView.openActivity.activity.activityUIID == sequence.parentUIID) {
 			activeView.updateActivity();
 		} else {
-			CanvasOptionalActivity(_activitiesDisplayed.get(sequence.parentUIID)).removeAllChildren();
 			removeActivity(sequence.parentUIID);
 		}
 		
@@ -1117,10 +1114,10 @@
 		Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "CanvasModel");
 		Debugger.log("currentBranchingActivity UIID: " + currentBranchingActivity.activity.activityUIID, Debugger.CRITICAL, "openBranchActivityContent", "CanvasModel");
 		
-		if(ba.branchView != null || ba.branchView != undefined) {
-			activeView = (visible) ? ba.branchView : activeView;
-			ba.branchView.setOpen(visible);
-			ba.branchView.open();
+		if(ba.activity.branchView != null || ba.activity.branchView != undefined) {
+			activeView = (visible) ? ba.activity.branchView : activeView;
+			ba.activity.branchView.setOpen(visible);
+			ba.activity.branchView.open();
 		} else { _cv.openBranchView(currentBranchingActivity, visible); }
 		
 		_lastBranchActionType = null;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -r9fce0caf6fe2935fae201bc27121005c83f2c62e -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 9fce0caf6fe2935fae201bc27121005c83f2c62e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -155,9 +155,8 @@
 		
 		showStatus(false);
 		
-		removeAllChildren();
+		removeAllChildren();		
 		
-		
 		for (var i=0; i < _children.length; i++)		{
 			if(fromModuleTab == "monitorMonitorTab"){
 				if(_canvasBranchView != null) {
@@ -255,9 +254,8 @@
 		for(var j=0; j<children_mc.length; j++) {
 			var childActMC = (children_mc[j] instanceof CanvasActivity) ? CanvasActivity(children_mc[j]) : CanvasSequenceActivity(children_mc[j]);
 			if(childActMC instanceof CanvasSequenceActivity) childActMC.removeAllChildren();
-			else if(childActMC.activity.isBranchingActivity() && childActMC.branchView != null) {
-				Debugger.log("removing branch view: " + childActMC.activity.activityUIID, Debugger.CRITICAL, "removeAllChildren", "CanvasOptionalActivity");
-				childActMC.branchView.removeMovieClip();
+			else if(childActMC.activity.isBranchingActivity() && childActMC.activity.branchView != null) {
+				//childActMC.activity.branchView.removeMovieClip();
 			}
 			
 			childActMC.removeMovieClip();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as
===================================================================
diff -u -r9fce0caf6fe2935fae201bc27121005c83f2c62e -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision 9fce0caf6fe2935fae201bc27121005c83f2c62e)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -243,9 +243,8 @@
 		for(var j=0; j<children_mc.length; j++) {
 			var childActMC:CanvasActivity = CanvasActivity(children_mc[j]);
 			
-			if(childActMC.activity.isBranchingActivity() && childActMC.branchView != null) {
-				Debugger.log("removing branch view: " + childActMC.activity.activityUIID, Debugger.CRITICAL, "removeAllChildren", "CanvasSequenceActivity");
-				childActMC.branchView.removeMovieClip();
+			if(childActMC.activity.isBranchingActivity() && childActMC.activity.branchView != null) {
+				//childActMC.activity.branchView.removeMovieClip();
 			}
 			
 			childActMC.removeMovieClip();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -re1c507a1e1171f32fbcfe0370a184ccaea623ff1 -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision e1c507a1e1171f32fbcfe0370a184ccaea623ff1)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -635,7 +635,7 @@
 			_transitionsDisplayed.get(trans_keys[i]).removeMovieClip();
 		for(var i=0; i<act_keys.length; i++) {
 			if(_activitiesDisplayed.get(act_keys[i]).activity.isBranchingActivity())
-				_activitiesDisplayed.get(act_keys[i]).branchView.removeMovieClip();
+				_activitiesDisplayed.get(act_keys[i]).activity.branchView.removeMovieClip();
 			_activitiesDisplayed.get(act_keys[i]).removeMovieClip();
 			
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
diff -u -rb40e4c230f8a3da407404dc14d08bba5ac2062e2 -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision b40e4c230f8a3da407404dc14d08bba5ac2062e2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(.../Monitor.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -491,7 +491,7 @@
         branchView.addEventListener('load', Proxy.create(this, viewLoaded));
 		
 		monitorModel.addObserver(branchView);
-		ba.branchView = branchView;
+		ba.activity.branchView = branchView;
 		
 		var actToPush = monitorModel.getMonitor().ddm.getActivityByUIID(ba.activity.activityUIID);
 		Debugger.log("Pushing activity: "+actToPush.title+" to the stack", Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
@@ -506,7 +506,7 @@
 		if(monitorModel.activeView.activity.parentUIID != null) 
 			parentBranching = CanvasActivity(monitorModel.activitiesDisplayed.get(_ddm.getActivityByUIID(monitorModel.activeView.activity.parentUIID).parentUIID));
 
-		monitorModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.branchView : monitorView.getMonitorTabView();
+		monitorModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.activity.branchView : monitorView.getMonitorTabView();
 		monitorModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null;
 		
 		var poppedActivityUIID:Number = monitorModel.openBranchingActivities.pop();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -r5d29d189919e6df70a34b2ad05f2b25ee4692ca5 -r976deca023b114ae00e73ad6583f6c8174b25372
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 5d29d189919e6df70a34b2ad05f2b25ee4692ca5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision 976deca023b114ae00e73ad6583f6c8174b25372)
@@ -1079,12 +1079,12 @@
 		
 		Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel");
 		
-		if(ba.branchView != null) {
-			activeView = (visible) ? ba.branchView : activeView;
+		if(ba.activity.branchView != null) {
+			activeView = (visible) ? ba.activity.branchView : activeView;
 			
-			ba.branchView.setOpen(visible);
+			ba.activity.branchView.setOpen(visible);
 			
-			ba.branchView.open();
+			ba.activity.branchView.open();
 			
 			setDirty();