Removed unnecessary classes
Added ButtonGroup and ButtonToolbar support

Changed Button class attributes