Better navigation in editor
Updated to new TOC-syntax
Merge branch 'master' into demo