Final questionnaire logic applied

All dynamic content for the standard questionnaire has been completed