Use just match numbers to improve the interfaces

Allows more matchs to be visible.