Adding: match display, ordering and formatting