Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r4f3911de7b458bcf548489361221b859f4d5cfa5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as	(.../LearnerIcon.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as	(.../LearnerIcon.as)	(revision 4f3911de7b458bcf548489361221b859f4d5cfa5)
@@ -244,14 +244,6 @@
 	 * @return  
 	 */
 	private function setStyles() {
-		//var styleObj = _tm.getStyleObject('label');
-		
-		//title_lbl.setStyle('styleName',styleObj);
-		//title_lbl.setStyle('textAlign', 'center');
-		
-		//styleObj = _tm.getStyleObject('ACTPanel')
-		//act_pnl.setStyle('styleName',styleObj);
-			
     }
     
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r4f3911de7b458bcf548489361221b859f4d5cfa5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(.../MonitorController.as)	(revision 4f3911de7b458bcf548489361221b859f4d5cfa5)
@@ -480,7 +480,6 @@
 			var stateID:Number = evt.target.changeStatus_cmb.selectedItem.data;
 			switch(stateID){
 				case LessonTabView.REMOVE_CBI :
-					trace('removing...');
 					var confirmMsg:String = Dictionary.getValue('ls_remove_confirm_msg');
 					var warningMsg:String = Dictionary.getValue('ls_remove_warning_msg', [_monitorModel.getSequence().getSequenceName()]);
 					
@@ -492,27 +491,20 @@
 					break;
 				case LessonTabView.NULL_CBI :
 					// error msg
-					trace('nothing selected...');
 					break;
 				case LessonTabView.ACTIVE_CBI :
-					trace('activating...');
 					_monitorModel.activateSequence();
 					break;
 				case LessonTabView.DISABLE_CBI :
-					trace('suspending...');
 					_monitorModel.suspendSequence();
 					break;
 				case LessonTabView.ARCHIVE_CBI :
-					trace('archiving...');
 					_monitorModel.archiveSequence();
 					break;
 				case LessonTabView.UNARCHIVE_CBI :
-					trace('unarchiving...');
 					_monitorModel.unarchiveSequence();
 					break;
 				default :
-					trace('no such combo box item');
-					
 			}
 			
 			clearBusy();
@@ -528,7 +520,6 @@
 	}
 	
 	public function get appData():Object{
-		trace("called monitor application")
 		var myObj:Object = new Object();
 		myObj.compX = Application.MONITOR_X
 		myObj.compY = Application.MONITOR_Y
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r4f3911de7b458bcf548489361221b859f4d5cfa5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as	(.../MonitorView.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as	(.../MonitorView.as)	(revision 4f3911de7b458bcf548489361221b859f4d5cfa5)
@@ -32,6 +32,7 @@
 import org.lamsfoundation.lams.common.Config;
 import org.lamsfoundation.lams.common.ToolTip;
 import org.lamsfoundation.lams.common.ApplicationParent;
+
 import mx.managers.*
 import mx.containers.*
 import mx.events.*
@@ -83,12 +84,10 @@
 	private var exportPortfolio_btn:Button;
 	private var viewJournals_btn:Button;
 	private var editFly_btn:Button;
-	//private var _activityLayerComplex_mc:MovieClip;
-	//private var _activityLayer_mc:MovieClip;
 	
-	//private var _transitionPropertiesOK:Function;
     private var _monitorView:MonitorView;
 	private var _monitorModel:MonitorModel;
+	
 	//Tab Views Initialisers
 	
 	//LessonTabView
@@ -203,7 +202,6 @@
     */
 	private function showData(mm:MonitorModel):Void{
         var s:Object = mm.getSequence();
-		trace("Item Description is : "+s._learningDesignID);
 		
 	}
 	
@@ -242,10 +240,7 @@
 		
 		
 		_learnerTabLayer_mc = _monitorLearner_mc.createEmptyMovieClip("_learnerTabLayer_mc", _monitorLearner_mc.getNextHighestDepth());
-		
-		//_todoTabLayer_mc = _monitor_mc.createEmptyMovieClip("_todoTabLayer_mc", _monitor_mc.getNextHighestDepth());
-		
-				
+	
 		var tab_arr:Array = [{label:Dictionary.getValue('mtab_lesson'), data:"lesson"}, {label:Dictionary.getValue('mtab_seq'), data:"monitor"}, {label:Dictionary.getValue('mtab_learners'), data:"learners"}];
 		
 		monitorTabs_tb.dataProvider = tab_arr;
@@ -367,11 +362,8 @@
     */
 	private function setSize(mm:MonitorModel):Void{
         var s:Object = mm.getSize();
-		trace("Monitor Tab Widtht: "+s.w+" Monitor Tab Height: "+s.h);
 		bkg_pnl.setSize(s.w,s.h);
-		bkgHeader_pnl.setSize(s.w, bkgHeader_pnl._height)
-		trace("Monitor View Stage Width "+s.w+" and Monitor View Stage height "+s.h)
-		trace("Monitor View bg panel Width "+bkg_pnl.width+" and Monitor View bg panel height "+bkg_pnl.height)
+		bkgHeader_pnl.setSize(s.w, bkgHeader_pnl._height);
 		monitorLesson_scp.setSize(s.w-monitorLesson_scp._x,s.h-monitorLesson_scp._y);
 		monitorSequence_scp.setSize(s.w-monitorSequence_scp._x,s.h-monitorSequence_scp._y);
 		monitorLearner_scp.setSize(s.w-monitorLearner_scp._x,s.h-monitorLearner_scp._y);
@@ -389,7 +381,6 @@
     */
 	private function setPosition(mm:MonitorModel):Void{
         var p:Object = mm.getPosition();
-		trace("X pos set in Model is: "+p.x+" and Y pos set in Model is "+p.y)
         this._x = p.x;
         this._y = p.y;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
diff -u -r289092d9f07c88e637c6b93ac76dc40c6ef42310 -r4f3911de7b458bcf548489361221b859f4d5cfa5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 289092d9f07c88e637c6b93ac76dc40c6ef42310)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	(.../MonitorTabView.as)	(revision 4f3911de7b458bcf548489361221b859f4d5cfa5)
@@ -393,7 +393,9 @@
 		} else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kBottom,{_activity:a,_children:children,_monitorController:mc,_monitorTabView:mtv,fromModuleTab:"monitorMonitorTab",learnerContainer:_learnerContainer_mc});	
-		} else{
+		} else if(a.isBranchingActivity()){	
+			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kBottom,{_activity:a,_monitorController:mc,_monitorTabView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc});
+		} else {
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView');
 		}