Rename sections and better headings