TOC adjustments, improved navigation