WP-3163 More form cleanup. New field labels