Add pagination and alignment of match list