added toolbar support