Improved templating.
Using shortcuts for template rendering