WP-3985 Reordering of fields, and added form alter