Minor fixes to toolbar