#516- Re-factoring code to use the same model in the survey page list and the various question forms.