WP-3163 Rearranged fields and add help text