Stabilized toolbar
Merge pull request #165 from norberhuis/StableToolbar

Stabilized toolbar