refactoring, some fixes
aded handlebars template
remove trash