Template and Comments fixed

I think I've fixed the comments along with this new template. One thing I've learned - the "MainOrArchivePage" tag in templates can make things a bit tricky...