Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rba9b21831a72a6e3fbfa8bfbf9aae3b25b4786e5 -r93a02624adff176042f98649f582d3c919b652d4
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rba9b21831a72a6e3fbfa8bfbf9aae3b25b4786e5 -r93a02624adff176042f98649f582d3c919b652d4
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
===================================================================
diff -u -r3029038bc804418124ff5e6ba6534a03a3382581 -r93a02624adff176042f98649f582d3c919b652d4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 3029038bc804418124ff5e6ba6534a03a3382581)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	(.../BranchingActivity.as)	(revision 93a02624adff176042f98649f582d3c919b652d4)
@@ -49,11 +49,6 @@
 		super(activityUIID);
 		_activityTypeID = activityTypeID;
 		
-		//_startXCoord = DEFAULT_STARTX;
-		//_startYCoord = DEFAULT_STARTY;
-		//_endXCoord = DEFAULT_ENDX;
-		//_endYCoord = DEFAULT_ENDY;
-		
 		_toolActivityUIID == null;
 		_defaultBranch = null;
 		
@@ -67,12 +62,12 @@
 	 */
 	public function populateFromDTO(dto:Object){
 		super.populateFromDTO(dto);
+		
 		_startXCoord = dto.startXCoord;
 		_startYCoord = dto.startYCoord;
 		_endXCoord = dto.endXCoord;
 		_endYCoord = dto.endYCoord;
 		_toolActivityUIID = dto.toolActivityUIID;
-		
 	}
 	
 	/**
@@ -89,7 +84,6 @@
 		if(_endXCoord) dto.endXCoord = _endXCoord;
 		if(_endYCoord) dto.endYCoord = _endYCoord;
 		if(_toolActivityUIID) dto.toolActivityUIID = _toolActivityUIID;
-		if(_defaultBranch) dto.defaultActivityUIID = _defaultBranch.sequenceActivity.activityUIID;
 		
 		return dto;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
===================================================================
diff -u -rd8a2cee523843b37d53e09ade01053fac2d03ce2 -r93a02624adff176042f98649f582d3c919b652d4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision d8a2cee523843b37d53e09ade01053fac2d03ce2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	(.../ComplexActivity.as)	(revision 93a02624adff176042f98649f582d3c919b652d4)
@@ -22,6 +22,8 @@
  */
 
 import org.lamsfoundation.lams.authoring.*;
+import org.lamsfoundation.lams.common.Config;
+import org.lamsfoundation.lams.common.util.Debugger;
 import org.lamsfoundation.lams.common.util.StringUtils;
 /*
 * This class represents all the complex activity types.  they are not much different, so we can handle them in one class.
@@ -83,6 +85,9 @@
 			if(_minOptions){	dto.minOptions = _minOptions;		}
 			if(_optionsInstructions){	dto.optionsInstructions = _optionsInstructions;		}
 		}
+		
+		dto.defaultActivityUIID = (_firstActivityUIID == null) ? Config.NUMERIC_NULL_VALUE : _firstActivityUIID;
+		
 		return dto;
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
===================================================================
diff -u -r52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8 -r93a02624adff176042f98649f582d3c919b652d4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 93a02624adff176042f98649f582d3c919b652d4)
@@ -22,7 +22,6 @@
  */
 
 import org.lamsfoundation.lams.authoring.*;
-import org.lamsfoundation.lams.common.Config;
 import org.lamsfoundation.lams.common.util.Debugger;
 
 /*
@@ -69,7 +68,6 @@
 			return null;
 			
 		var dto:Object = super.toData();
-		dto.defaultActivityUIID = (_firstActivityUIID == null) ? Config.NUMERIC_NULL_VALUE : _firstActivityUIID;
 
 		return dto;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r3a38afcc50644508457dd0657b7466ecdee2ec2a -r93a02624adff176042f98649f582d3c919b652d4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 3a38afcc50644508457dd0657b7466ecdee2ec2a)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 93a02624adff176042f98649f582d3c919b652d4)
@@ -54,6 +54,7 @@
 	private static var OPTION_RANGE:Number = 2;
 	
 	private static var TOOL_OUTPUTS_URL_POSTFIX:String = "outputs";
+	private static var HELP_BTN_LBL:String = "?";
 	
 	//References to components + clips 
     private var _container:MovieClip;  //The container window that holds the dialog
@@ -184,7 +185,7 @@
 		_condition_to_lbl.text = Dictionary.getValue("to_conditions_dlg_to_lbl");
 		
 		add_btn.label = Dictionary.getValue("to_conditions_dlg_add_btn_lbl");
-		help_btn.label = Dictionary.getValue("to_conditions_dlg_help_btn_lbl");
+		help_btn.label = HELP_BTN_LBL;
 		clear_all_btn.label = Dictionary.getValue("to_conditions_dlg_clear_all_btn_lbl");
 		remove_item_btn.label = Dictionary.getValue("to_conditions_dlg_remove_item_btn_lbl");