Various sidebar/toolbar changes
Merge pull request #10 from MtMNC/patch-3

Various sidebar/toolbar changes