Tweaked TOC and layout.