fix toolbar problems