Reworked EditMatchSet visuals