Merge bert changes to layer menu (grouping)