Corrected button-group presentation
Adjusted menu