Minor updates to waitForView and clickOnScreen