button group tidy up