Clean up button CSS

Lots of CSS de-duplication