Fixed element locators with new IDs