WP-2351 Changing the order of a few fields