Update layout, add plugins to TOC, fix start