Toolbar finesse

A few minor changes to make it easier customise the toolbar.