Another tweak to toolbar code