cleaned up the toolbar a bit