ButtonGroup refactoring.