Fixes #455 fixes consistency issues of toc placement