Rearrange sections, normalise headings, fix whitespace