Added support for collapsible questions

Also updated questionnaire-update to work with the new system