Remove btn-group and fix display for #233