Improved Questionnaire, Validation and data entry form

Changes made