Some refactorings for the Tool Windows in order to include the ToolBar.