toolbar improvements