Toolbar fix