Updated Questionnaire Controller and Index View