update GameScreen
Add images
Fix merge issue