Improved waitForView