Fixed some table formatting and table of contents