Improved display of page content and TOC toolbar