Fix screenshot  issue
Add waits