Removed some unnecessary HTML code, made the generated code more dynamic (question / option dependent(, improved template code by adding template syntax consistency