Replaced widget with ToggleButton to get better UX