Toolbar tmpl minor change 2