Updated locator app some more