Major refactoring of Volunteer and VolunteerEditForm