move to handlebars and nicer markup