Allow for clearing of selection and better handling of button selection changing behind our backs.