Separate toolbars and extract ToolbarBase