minor changes to bring QuestionView up to speed
naming convention fix
Merge branch 'feature/8970' into feature/8280