Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as,v
diff -u -r1.36 -r1.37
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	27 Feb 2008 04:33:36 -0000	1.36
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	27 Feb 2008 08:38:30 -0000	1.37
@@ -474,7 +474,7 @@
 			theIcon_mc._visible = true;
 		
 			//chose the background mc
-			if(_activity.groupingUIID > 0){
+			if(_activity.groupingUIID != null && _activity.groupingUIID > 0){
 				canvasActivityGrouped_mc._visible = true;
 				canvasActivity_mc._visible = false;
 			}else{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as,v
diff -u -r1.26 -r1.27
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	27 Feb 2008 04:33:36 -0000	1.26
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	27 Feb 2008 08:38:30 -0000	1.27
@@ -197,13 +197,19 @@
 		
 		if(_module == "monitoring") {
 			if(_canvasBranchView != null)
-				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _monitorController:_monitorController, _canvasBranchView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer, _sequenceChild:true});
+				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer, _sequenceChild:true});
 			else if(_canvasComplexView != null)
-				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _monitorController:_monitorController, _canvasComplexView: _canvasComplexView, _module:"monitoring", learnerContainer:learnerContainer, _sequenceChild:true});
+				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _monitorController:_monitorController, __monitorView: _canvasComplexView, _module:"monitoring", learnerContainer:learnerContainer, _sequenceChild:true});
 			else
 				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _monitorController:_monitorController, _monitorView:_monitorView, _module:"monitoring", learnerContainer:learnerContainer, _sequenceChild:true});
 		} else {
-			childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _canvasController:_canvasController, _canvasView:_canvasView, _sequenceChild:true});
+			if(_canvasBranchView != null)
+				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _canvasController:_canvasController, _canvasBranchView:_canvasBranchView, _sequenceChild:true});
+			else if(_canvasComplexView != null)
+				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _canvasController:_canvasController, _canvasComplexView:_canvasComplexView, _sequenceChild:true});
+			else
+				childActivity = childActivities_mc.attachMovie("CanvasActivityMin", "CanvasActivityMin"+a.activityUIID, childActivities_mc.getNextHighestDepth(), {_activity:a , _canvasController:_canvasController, _canvasView:_canvasView, _sequenceChild:true});
+			
 		}
 		//set the positioning co-ords
 		childActivity.activity.xCoord = CHILD_OFFSET_X + ((_children.length-1) * CHILD_INCRE);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as,v
diff -u -r1.32 -r1.33
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	27 Feb 2008 04:33:37 -0000	1.32
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	27 Feb 2008 08:38:30 -0000	1.33
@@ -719,7 +719,7 @@
 	private function orderDesign(activity:Activity, order:Array):Void{
 		order.push(activity);
 		
-		if(activity.isBranchingActivity() || activity.isSequenceActivity()) {
+		if(activity.isBranchingActivity() || activity.isSequenceActivity() || activity.isOptionalActivity() || activity.isOptionsWithSequencesActivity()) {
 			var children:Array = _activeSeq.getLearningDesignModel().getComplexActivityChildren(activity.activityUIID);
 			for(var i=0; i<children.length; i++) {
 				orderDesign(children[i], order);
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.165 -r1.166
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v
diff -u -r1.133 -r1.134
Binary files differ