Fixing buttons toggle
Merge 'fix/buttons'