QuestionnaireForm adapted

QuestionnaireForm is now a child of avatarContainer