Made some click related improvements
Return the view even when timing out in waitForView
Updated waitForView