fix window problems and add scenario select