Fixing some UI bugs in Toolbar.