Moved stuff to handlebars