WP-3986 Reordering of fields, and added form alter