Added grouping of tabs in current window