improve match view and reload