use btn-toolbar and btn-group as wrappers to fix dropdowns

@effkay Use wrappers to fix dropdowns