Tidy up button grouping