Improve match page, adding bot handling