MOB-358: fixing numeration on toc, various improvements
MOB-358: Working on ever present TOC
MOB-358: Working on performance of TOC