QuestionGroup to Question
Corrected answer bugs, refactored form errors