WP-3037 Field layout changes
WP-3037 Removing unneeded fieldsets