GPII-738: Fixing problems in headings.

http://issues.gpii.net/browse/GPII-738
@dimokas I can appreciate not wanting to make the change as it's to markup that you didn't originally write and the styling issues, but the longer we leave these things in the harder it becomes to fix. If we have time now to clean things up, we should take the opportunity.