Change order of fields in the form.

#5901 
Apparently all field order is saved in strongarm values, regardless of weight given in code.