Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -rb0054257349ffef3a3cd82ecd30eb6e5b48ad953 -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision b0054257349ffef3a3cd82ecd30eb6e5b48ad953)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
@@ -129,7 +129,8 @@
 		MovieClipUtils.doLater(Proxy.create(this, init));
 	}
 	
-	public function init():Void {
+	public function init():Void {
+		Debugger.log("type: " + _type, Debugger.CRITICAL, "init", "CanvasOptionalActivity");
 		switch(_type) {
 			case ACT_TYPE:
 				initActivityType();
@@ -196,15 +197,15 @@
 		var _newVisibleWidth:Number = null;
 				
 		for(var i=0; i < _children.length; i++) {
-			Debugger.log("opt child act: " + _children[i].activityUIID, Debugger.CRITICAL, "initActivityType", "CanvasOptionalActivity");
+			Debugger.log("opt child act: " + _children[i].activityUIID, Debugger.CRITICAL, "initSequenceType", "CanvasOptionalActivity");
 			
 			if(_children[i].isSequenceActivity()) {
-				if(fromModuleTab == "monitorMonitorTab")
+				if(fromModuleTab == "monitorMonitorTab") {
 					children_mc[i] = childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
-				else
+				} else {
 					children_mc[i] = (_canvasBranchView != null) ? childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _canvasController:_canvasController, _canvasBranchView:_canvasBranchView})
-																  : childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _canvasController:_canvasController, _canvasView:_canvasView});
-			
+																	: childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _canvasController:_canvasController, _canvasView:_canvasView});
+				}
 				//set the positioning co-ords
 				children_mc[i].activity.xCoord = CHILD_OFFSET_X;
 				children_mc[i].activity.yCoord = CHILD_OFFSET_Y + (i * CHILD_INCRE);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as
===================================================================
diff -u -r853036d1bfb199ee42a2e1d785590509d4b3b9de -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision 853036d1bfb199ee42a2e1d785590509d4b3b9de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
@@ -150,7 +150,8 @@
 			_activity = initObj.activity;
 		}
 		
-		_canvasModel = CanvasModel(_canvasController.getModel());
+		if(_canvasController != null)
+			_canvasModel = CanvasModel(_canvasController.getModel());
 		
 		Debugger.log("firstActivityUIID:  " + ComplexActivity(_activity).firstActivityUIID, Debugger.CRITICAL, "init", "CanvasSequenceActivity");
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision 8499a7e0ba9d82c35d27fa14f41428003fe427ce)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	(.../CanvasSuperModel.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
@@ -109,7 +109,7 @@
 		Debugger.log("Locking all Complex Activities", Debugger.GEN, "lockAllComplexActivities", "CanvasModel");
 		var k:Array = _activitiesDisplayed.values();
 		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
+			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE){
 				k[i].locked = true;
 			}
 		}
@@ -120,7 +120,7 @@
 		Debugger.log("Unlocking all Complex Activities", Debugger.GEN, "unlockAllComplexActivities", "CanvasModel");
 		var k:Array = _activitiesDisplayed.values();
 		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
+			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE){
 				k[i].locked = (k[i].activity.readOnly) ? true : false;
 			}
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as
===================================================================
diff -u -re2fcbae966f671de6b2c8fc2457543e33cf4d7b7 -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision e2fcbae966f671de6b2c8fc2457543e33cf4d7b7)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
@@ -510,7 +510,7 @@
 			
 			ACT_X = newActivity_mc._x + newActivity_mc._width;
 			
-		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
+		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){
 			//get the children
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerComplexActivity", _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -raf26890a57ea13484e2f9e9acba607a320fe9724 -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision af26890a57ea13484e2f9e9acba607a320fe9724)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
@@ -243,7 +243,7 @@
 		
 		transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
 		//branchLayer = this.createEmptyMovieClip("_branchLayer_mc", this.getNextHighestDepth());
-		
+		
 		activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
 		
 		// creates learner icon on initial draw
@@ -278,14 +278,19 @@
 			
 			//Remove all the movies drawn on the transition and activity movieclip holder
 			this._learnerContainer_mc.removeMovieClip();
-			this.transitionLayer.removeMovieClip();
+			this.transitionLayer.removeMovieClip();
+			
 			this.activityLayer.removeMovieClip();
+			
 			this.transparentCover.removeMovieClip();
 			
 			//Recreate both Transition holder and Activity holder Movieclips
 			transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
+			
 			activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
+			
 			_learnerContainer_mc = this.createEmptyMovieClip("_learnerContainer_mc", this.getNextHighestDepth());
+			
 			transparentCover = this.attachMovie("Panel", "_transparentCover_mc", this.getNextHighestDepth(), {_visible: false, enabled: false, _alpha: 50});
 			transparentCover.onPress = null;
 		
@@ -354,12 +359,12 @@
 			newActivity_mc = activityLayer.createChildAtDepth("CanvasGateActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring"});
 		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
-			newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});
+			newActivity_mc = activityLayer.createChildAtDepth("CanvasParallelActivity", DepthManager.kTop, {_activity:a,_children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});
 		} else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
-			newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kBottom, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});	
+			newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kTop, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc});	
 		} else if(a.isBranchingActivity()){	
-			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false});
+			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false});
 		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');
 		}
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
===================================================================
diff -u -raf26890a57ea13484e2f9e9acba607a320fe9724 -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as	(.../CommonCanvasView.as)	(revision af26890a57ea13484e2f9e9acba607a320fe9724)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as	(.../CommonCanvasView.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
@@ -247,7 +247,7 @@
 	public function get activityLayers():Array {
 		var arr = new Array();
 		arr.push(activityLayer);
-		arr.push(activityComplexLayer);
+		if(activityComplexLayer != null) arr.push(activityComplexLayer);
 		
 		return arr;
 	}
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r04312a491c2548738782967098dad6b53ff78a56 -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r04312a491c2548738782967098dad6b53ff78a56 -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4
Binary files differ