Tidy up match & multi layout, and improve '?' sizing and placement for match.