Block-level form fields should use $form-margin, not $form-label-margin