more sidebar
Merge branch 'sidebar'