Updated ButtonGroup control and sample code