Added expand to ButtonBar