Updated handlebars & fixed bug