Move tabbed toc heading into default template

Fixes #1185
Fixes for tabbed TOC

Re-fixes #1185