Looking at Toolbar

Changes appear to be merged properly.
Next step: reparent toolbar object.