Less cruft, fix buttons' CSS classes