Updated Main and GameScreen