total sidebar refactoring
Merge branch 'design'