Tweaked templating section