WIP update button/ToggleButton select behavior