More improvements to static TOC display