Added ButtonGroup, ButtonToolbar and cleanup

Added ButtonGroup, ButtonToolbar and cleanup