diff --git a/app.json b/app.json
index c03c485..f0979a0 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "expo": {
-    "name": "rn-map",
-    "slug": "rn-map",
+    "name": "rate-map",
+    "slug": "rate-map",
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
@@ -19,7 +19,9 @@
       "**/*"
     ],
     "ios": {
-      "supportsTablet": true
+      "supportsTablet": true,
+      "bundleIdentifier": "com.rate-map.rate-map",
+      "buildNumber": "0.0.1"
     },
     "android": {
       "adaptiveIcon": {
diff --git a/screens/ExchangeRateListScreen.tsx b/screens/ExchangeRateListScreen.tsx
index 9cc364c..39127e6 100644
--- a/screens/ExchangeRateListScreen.tsx
+++ b/screens/ExchangeRateListScreen.tsx
@@ -27,6 +27,7 @@ export default function ExchangeRateList(props: any) {
     latitude: 0,
     longitude: 0,
   });
+
   const [currency, setCurrency] = useState("USD");
   const [paymentType, setPaymentType] = useState(initialPaymentType);
   const [sortColumn, setSortColumn] = useState(-1); // initial (not set) -1, 0 distance, 1 buy, 2 sell
@@ -35,6 +36,7 @@ export default function ExchangeRateList(props: any) {
   const rateData: RateState[] = useSelector((state: RootState) => {
     if (topTabName === "Exchanges") {
       let exchangeData = state.rate.exchangeCash;
+
       // Check default location has been over-ridden
       if (userLocation.latitude && userLocation.longitude) {
         let enhExchangeCash: RateState[] = addDistancePropertyToExchanges(
@@ -67,7 +69,9 @@ export default function ExchangeRateList(props: any) {
   const getUserLocation = async () => {
     try {
       const jsonValue = await AsyncStorage.getItem("userLocation");
-      return jsonValue != null ? JSON.parse(jsonValue) : null;
+      return jsonValue != null
+        ? JSON.parse(jsonValue)
+        : { latitude: 0, longitude: 0 };
     } catch (error) {
       // Handle user location not previously stored/saved
       console.log(error);
diff --git a/screens/MapRateScreen.tsx b/screens/MapRateScreen.tsx
index c0c1848..5e95572 100644
--- a/screens/MapRateScreen.tsx
+++ b/screens/MapRateScreen.tsx
@@ -295,6 +295,7 @@ export default function MapRateScreen(props: {
           markers!.map((marker) => {
             return (
               <Marker
+                pointerEvents={"auto"}
                 key={marker.id}
                 coordinate={{
                   latitude: marker.latitude,