Added table of content and reordered content