Map view and view model converted
Removed Locator