Issue #1953770 by amateescu: Move the field-specific settings form elements at the top of the form.