Toolbar bug

A lot of people experience this
Merge pull request #19 from dhoepelman/patch-2

Toolbar bug