refactoring
added Toolbar