Improvements to UI handling of checkboxes and disconnects