Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -ra0391f9239dd0b510838649eb1b1c7c207412ff3 -r0359c6e95e64a4080512a533a78f185eb42f5ddc
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -ra0391f9239dd0b510838649eb1b1c7c207412ff3 -r0359c6e95e64a4080512a533a78f185eb42f5ddc
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -r6b6d09c3963a2e944c0cb122c85479fb1f5f5ae3 -r0359c6e95e64a4080512a533a78f185eb42f5ddc
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 6b6d09c3963a2e944c0cb122c85479fb1f5f5ae3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 0359c6e95e64a4080512a533a78f185eb42f5ddc)
@@ -262,8 +262,10 @@
 			var tgt_mc;
 			if(_activity.isGateActivity() && !_sequenceChild)
 				tgt_mc = stopSign_mc;			
-			else if(_activity.groupingUIID > 0)
+			else if(_activity.groupingUIID > 0 && !_activity.isBranchingActivity())
 				tgt_mc = canvasActivityGrouped_mc;
+			else if(_activity.groupingUIID > 0 && _activity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE)
+				tgt_mc = canvasActivityGrouped_mc;
 			else
 				tgt_mc = canvasActivity_mc;
 				
@@ -520,15 +522,32 @@
 			theIcon_mc._visible = true;
 		
 			//chose the background mc
-			if(_activity.groupingUIID != null && _activity.groupingUIID > 0){
-				if(_sequenceChild)  {
-					fade_mc._height = 37;
-					act_pnl._height = 37.5;
+			if(_activity.groupingUIID != null && _activity.groupingUIID > 0) {
+				
+				if(_activity.isBranchingActivity() && _activity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
+					canvasActivityGrouped_mc._visible = true;
+					canvasActivity_mc._visible = false;
+					
+					if(_sequenceChild)  {
+						fade_mc._height = 37;
+						act_pnl._height = 37.5;
+					}
+				
+				} else if(!_activity.isBranchingActivity()) {
+					canvasActivityGrouped_mc._visible = true;
+					canvasActivity_mc._visible = false;
+					
+					if(_sequenceChild)  {
+						fade_mc._height = 37;
+						act_pnl._height = 37.5;
+					}
+				
+				} else {
+					canvasActivity_mc._visible = true;
+					canvasActivityGrouped_mc._visible = false;
 				}
-				canvasActivityGrouped_mc._visible = true;
 				
-				canvasActivity_mc._visible = false;
-			}else{
+			} else {
 				if(_sequenceChild) {
 					fade_mc._height = 40;
 					act_pnl._height = 40.5;
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rde65d00b5bf887f55beabea327159f0df35f0933 -r0359c6e95e64a4080512a533a78f185eb42f5ddc
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rde65d00b5bf887f55beabea327159f0df35f0933 -r0359c6e95e64a4080512a533a78f185eb42f5ddc
Binary files differ