Toolbar refactoring.