Rearrange and standardize headings