Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -rac69d84da29ce386a9bab7c80bc5e247dfccb133 -r49513434c3a61e6463147debe6b3ae9f36801cd3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision ac69d84da29ce386a9bab7c80bc5e247dfccb133)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 49513434c3a61e6463147debe6b3ae9f36801cd3)
@@ -551,14 +551,14 @@
 		_end_value_stp.visible = !evt.target.value;
 		_condition_to_lbl.visible = !evt.target.value;
 		
-		_opt_lessThan_cb.enabled = !evt.target.value;
+		_opt_lessThan_cb.selected = false;;
 	}
 	
 	private function onLessThanSelect(evt:Object):Void {
 		_end_value_stp.visible = !evt.target.value;
 		_condition_to_lbl.visible = !evt.target.value;
 		
-		_opt_greaterThan_cb.enabled = !evt.target.value;
+		_opt_greaterThan_cb.selected = false;
 	}
 
 	public static function getOutputType(type:String):String {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r74a445235e221c4f913040bb71336c990d54db9b -r49513434c3a61e6463147debe6b3ae9f36801cd3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 74a445235e221c4f913040bb71336c990d54db9b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 49513434c3a61e6463147debe6b3ae9f36801cd3)
@@ -466,14 +466,18 @@
 	private function showBranchingControls(v:Boolean, e:Boolean){
 		branchType_lbl.visible = v;
 		branchType_cmb.visible = v;
+		
 		hideAllSteppers(false);
 		
 		var _activityTypeID:Number = _canvasModel.selectedItem.activity.activityTypeID;
 		
 		if(_activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
+			
 			showGroupBasedBranchingControls(v, e);
 			showAppliedGroupingControls(v, e);
+			
 		} else if(_activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) {
+			
 			showToolBasedBranchingControls(v, e);
 			
 			if(toolActs_cmb.visible) {
@@ -1107,8 +1111,9 @@
 	
 	private function showGroupBasedBranchingControls(v:Boolean, e:Boolean) {
 		if(!v) { 
-			_group_match_btn.visible = false; 
+			_group_match_btn.visible = false;
 			_define_monitor_cb.visible = false; 
+			
 			return; 
 		}