Update Game screen
Update Game screen
Merge remote-tracking branch 'origin'