New logic for toggle buttons
Merge branch 'toggle_all'