Some minor cleanups (mostly in templates, mixed h1 and h2 etc.)