design cleanup.
Merge branch 'sidebar'