Tidied up display of matches (and related elements).