Fix checked state and icon/label updating