Add GameWindow and fix GameBuilder