Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rb6b484dd76f5fe10f92b1162ce5000158afd2128 -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rb6b484dd76f5fe10f92b1162ce5000158afd2128 -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
Binary files differ
Index: lams_flash/src/central/flash/lams_authoring.fla
===================================================================
diff -u -rbae936e653f3445e03bb70c49d7a42acf8e09e6f -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
===================================================================
diff -u -ra51a3578f817472254bb2e84b301122a6d8268cd -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision a51a3578f817472254bb2e84b301122a6d8268cd)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 44e31ab62e679f0c173f0269d7ee6d306ca6eb2c)
@@ -47,7 +47,8 @@
 	
 	public function init():Void{
 		_drawnLineStyle = 0xEA00FF;
-		arrow_mc.setStyle("backgroundColor", "0xEA00FF");
+		//arrow_mc.setStyle("backgroundColor", "0xEA00FF");
+		arrow_mc.setStyle("backgroundColor", "0xAFCE63");
 		draw();
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -rb6b484dd76f5fe10f92b1162ce5000158afd2128 -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision b6b484dd76f5fe10f92b1162ce5000158afd2128)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 44e31ab62e679f0c173f0269d7ee6d306ca6eb2c)
@@ -49,6 +49,8 @@
 	
 	public static var GATE_ACTIVITY_HEIGHT:Number =28;
 	public static var GATE_ACTIVITY_WIDTH:Number = 28;
+	public static var BRANCH_ICON_HEIGHT:Number = 30;
+	public static var BRANCH_ICON_WIDTH:Number = 30;
 	public static var ICON_WIDTH:Number = 25;
 	public static var ICON_HEIGHT:Number = 25;
 	
@@ -93,6 +95,8 @@
 	private var branchIcon_mc:MovieClip;
 	private var stopSign_mc:MovieClip;
 	private var branchSign_mc:MovieClip;
+	private var start_branch_icon_mc:MovieClip;
+	private var finish_branch_icon_mc:MovieClip;
 	
 	private var clickTarget_mc:MovieClip;
 	
@@ -130,10 +134,13 @@
 		
 		//let it wait one frame to set up the components.
 		//this has to be set b4 the do later :)
-		if((_activity.isGateActivity() || _connector) && !_sequenceChild){
+		if((_activity.isGateActivity()) && !_sequenceChild){
 			_visibleHeight = CanvasActivity.GATE_ACTIVITY_HEIGHT;
 			_visibleWidth = CanvasActivity.GATE_ACTIVITY_WIDTH;
-		}else if(_activity.isGroupActivity()){
+		} else if(_branchConnector) {
+			_visibleHeight = CanvasActivity.BRANCH_ICON_HEIGHT;
+			_visibleWidth = CanvasActivity.BRANCH_ICON_WIDTH;
+		} else if(_activity.isGroupActivity()){
 			_visibleHeight = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_HEIGHT : CanvasActivity.TOOL_ACTIVITY_HEIGHT;
 			_visibleWidth = (_sequenceChild) ? CanvasActivity.TOOL_MIN_ACTIVITY_WIDTH : CanvasActivity.TOOL_ACTIVITY_WIDTH;
 		}else{
@@ -185,6 +192,8 @@
 	private function showAssets(isVisible:Boolean){
 		groupIcon_mc._visible = isVisible;
 		branchIcon_mc._visible = isVisible;
+		start_branch_icon_mc._visible = isVisible;
+		finish_branch_icon_mc._visible = isVisible;
 		title_lbl._visible = isVisible;
 		icon_mc._visible = isVisible;
 		stopSign_mc._visible = isVisible;
@@ -381,9 +390,13 @@
 			}
 			
 		} else if(_branchConnector) {
-			branchSign_mc._visible = true;
-			branchSign_mc._x = 0;
-			branchSign_mc._y = 0;
+			start_branch_icon_mc._visible = true;
+			start_branch_icon_mc._x = 1;
+			start_branch_icon_mc._y = 1;
+			
+			finish_branch_icon_mc._visible = true;
+			finish_branch_icon_mc._x = 1;
+			finish_branch_icon_mc._x = 1;
 		} else {
 			
 			//chose the icon:
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rc82d1d71f00be6e302d869d9b7099363b509456f -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision c82d1d71f00be6e302d869d9b7099363b509456f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 44e31ab62e679f0c173f0269d7ee6d306ca6eb2c)
@@ -855,4 +855,7 @@
 		evt.target.scrollContent.setupContent();
 	}
 	
+	public function get tempSelectedItem():Object {
+		return _tempSelectedItem;
+	}
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as
===================================================================
diff -u -rc82d1d71f00be6e302d869d9b7099363b509456f -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision c82d1d71f00be6e302d869d9b7099363b509456f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision 44e31ab62e679f0c173f0269d7ee6d306ca6eb2c)
@@ -49,7 +49,7 @@
 	
 	private var CHILD_OFFSET_X : Number = 5;
 	private var CHILD_OFFSET_Y : Number = 5;
-	private var CHILD_INCRE : Number = 55.5;
+	private var CHILD_INCRE : Number = 59.5;
 	
 	//this is set by the init object
 	private var _canvasController:CanvasController;
@@ -189,8 +189,11 @@
 		//set the positioning co-ords
 		childActivity.activity.xCoord = CHILD_OFFSET_X + ((_children.length-1) * CHILD_INCRE);
 		childActivity.activity.yCoord = CHILD_OFFSET_Y;
-		childActivity._visible = true;	
+		childActivity._visible = true;
 		
+		if(childActivity.activity.activityUIID == _canvasModel.selectedItem.activity.activityUIID)
+			childActivity.setSelected(true);
+		
 		children_mc.push(childActivity);
 		a.orderID = _children.length;
 		
@@ -309,6 +312,12 @@
 		_x = _activity.xCoord;
 		_y = _activity.yCoord;
 		
+		/**
+		Debugger.log("tempSelectedItem: " + _canvasController.tempSelectedItem.activity.activityUIID, Debugger.CRITICAL, "CanvasSequenceActivity");
+		if(this.activity.activityUIID == _canvasController.tempSelectedItem.activity.activityUIID)
+			this.setSelected(true);
+		*/
+		
 		if(_activity.runOffline){
 			bgNegative = "true"
 			setStyles();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -rc82d1d71f00be6e302d869d9b7099363b509456f -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision c82d1d71f00be6e302d869d9b7099363b509456f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 44e31ab62e679f0c173f0269d7ee6d306ca6eb2c)
@@ -1307,9 +1307,10 @@
 		
 		_canvasModel.selectedItem.refresh();
 		
-		if (_canvasModel.selectedItem.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || _canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE) {
-			_canvasModel.selectedItem.init();
-		}
+		if (_canvasModel.selectedItem.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE)
+			_canvasModel.selectedItem.init();
+		else if (_canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE)
+			_canvasModel.selectedItem.updateChildren();
 		
 		setModified();