Changed templates, builder to handlebars