Merge "Button group adjustments"