small changes and refactoring toolbars