form2, table2: changed order in yes_no to match others similar controls