Toolbar minor changes