WP-3160 Rearranged some fields and added help text