Add InputGroup, Cleanup ButtonToolbar