improved templating, grunt, markup