Refactored ToolBar