layout tweak and TOC work