added toolbar and fixed styles