Converted to use Handlebars templates
Typos