Issue #3301918: Use more-standard button styling, ensure there is space between it and the form items