Fixed up headings issues