Clean up presentation of NewMatch control