Fix headings and tag lines
More goodness