total refactor
added toolbar
added toolbar