Refactored quizclip ordering, extended quiz template