Fixed infinite loop. Now using wait_for_condition() instead
Updated some names of locators. Added a new one