Looking at Toolbar

Changes appear to be merged properly.
Next step: reparent toolbar object.
Merge pull request #22 from JALsnipe/master

Looking at Toolbar