Minor tweaks to toolbar