add toggle buttons
Merge branch 'add-toggle-buttons' into develop