Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8 -rd8a2cee523843b37d53e09ade01053fac2d03ce2
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8 -rd8a2cee523843b37d53e09ade01053fac2d03ce2
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
===================================================================
diff -u -r763378f5f19a0842295daae24aaf28f801e823b7 -rd8a2cee523843b37d53e09ade01053fac2d03ce2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision 763378f5f19a0842295daae24aaf28f801e823b7)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision d8a2cee523843b37d53e09ade01053fac2d03ce2)
@@ -58,7 +58,7 @@
 	 */
 	public function populateFromDTO(dto:Object){
 		super.populateFromDTO(dto);
-		if(_activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
+		if(_activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || _activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE){
 			_maxOptions = dto.maxOptions;
 			_minOptions = dto.minOptions;
 			//TODO: This is missing in the Library packet - tell mai.
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
diff -u -rf65686830c50dda1e327b1169889198c57044815 -rd8a2cee523843b37d53e09ade01053fac2d03ce2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision f65686830c50dda1e327b1169889198c57044815)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	(.../MonitorModel.as)	(revision d8a2cee523843b37d53e09ade01053fac2d03ce2)
@@ -658,12 +658,12 @@
 				Debugger.log("isDrawnDesign: "+isDesignDrawn, Debugger.GEN, "drawDesign", "MonitorModel");
 			}
 			
-			if(ddm_activity.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE){
+			if(ddm_activity.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE && selectedTab != LearnerTabView._tabID){
 				eventArr.push(createViewUpdate("ADD_SEQUENCE", ddm_activity));
 			} else if(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0){
 				var parentAct;
 				if((parentAct = _activeSeq.getLearningDesignModel().activities.get(ddm_activity.parentUIID)) != null)
-					if(parentAct.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE)
+					if(parentAct.activityTypeID == Activity.SEQUENCE_ACTIVITY_TYPE && selectedTab != LearnerTabView._tabID)
 						eventArr.push(createViewUpdate("DRAW_ACTIVITY_SEQ", ddm_activity, tabID, drawLearner));
 			} else {
 				eventArr.push(createViewUpdate("DRAW_ACTIVITY", ddm_activity, tabID, drawLearner));
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as
===================================================================
diff -u -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4 -rd8a2cee523843b37d53e09ade01053fac2d03ce2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(.../LearnerTabView.as)	(revision d8a2cee523843b37d53e09ade01053fac2d03ce2)
@@ -499,7 +499,7 @@
 		}
 		
 		//take action depending on act type
-		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity() || a.isBranchingActivity()) {
+		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity()) {
 			newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerActivity", _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
 			
 			ACT_X = newActivity_mc._x + newActivity_mc._width;
@@ -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 || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){
+		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE || a.isBranchingActivity()){
 			//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_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rb0dd9725731ac42b9055541a49591661bbec85c5 -rd8a2cee523843b37d53e09ade01053fac2d03ce2
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rb0dd9725731ac42b9055541a49591661bbec85c5 -rd8a2cee523843b37d53e09ade01053fac2d03ce2
Binary files differ