Revamp button group code to remove need for extra divs