Updated locators

Tested this both on stage and dev. All pass!