split locator functionality in two pages