Refactor user form fields into partial