Template Structure fixes to quizzes