Fixed TOC and changed layout and filenames