Fix toolbar
Merge pull request #281 from dakota/fix-toolbar

Fix toolbar