Improved match method and added UI controlers to play again and restart game