Cleaning up the toolbar a little.