Move header h2 closer to h1

The h2 in a header element should be right underneath the header's h1. I
made the h2 margins the same on top and bottom inside headers; no more
wider margin on top.