MCQ: Finish template, some refactor