Two waits added to increase stability of view opening