more updates to template manager and handlebars templates