GPII-738: Fixing problems in headings.

http://issues.gpii.net/browse/GPII-738
do we actually need all these `<label>` tags and do they really label any actual element? We may be able to collapse the contents of the labels into the heading tag.