fix layer grouping to match our normal stack