added ToolBarArea
merged conflicts