Updated locators, added fixes for edit profile