added the handlebars template
bugs fixes and