some toolbar fixes
minor clean up
Merge pull request #244 from loarie/toolbar_fixes

Toolbar fixes