Add questions to templates and clean up template.js