Tidy up button layout