Update layout for zpetr group matching