Modified locators in order to run in portal env