Sidebar is a bit better, needs some reworking though
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx into dev
fixing conflicts