Adding support for a button bar