i gotta have more sidebar
Merge branch 'sidebar'