Added GroupButton, removed ButtonGroup and CategoryButton.