fix order of button bar