GPII-738: Fixing problems in headings.

http://issues.gpii.net/browse/GPII-738