Toolbar problems fixed