Fix Toolbar fix