Small changes to how the form's spacing is handled