locators minor refactoring
start up changed for ios compatibility