Add table of contents and move the sections around