Some changes to GameWindow