Yet more glyph panel shuffling