Updated template to work with handlebars