Add whitespace to make it easier to understand on GitHub
Add collection tags and move h1 into templates