Tidy up button classes