Improve intro and a little bit of templating love