Improve toggle buttons
Tweak stylesheets