refactoring toolbar