sidebar changes
Merge branch 'sidebar'
Committing changes