Fixed the colors of headings, reshuffled some headings