Updated dependencies
Toolbar refactoring