sidebar overhaul
Merge pull request #39 from antonow/patrick-misc-toolbar-views-2014-12-02

sidebar overhaul