Changed more usages of Button to ButtonGroup