WP-3037 Field layout changes