Fix & grouping of objects in the tabs