diff --git a/www/assets/js/map_leaflet.js b/www/assets/js/map_leaflet.js
index 2629ca5..e7249c3 100644
--- a/www/assets/js/map_leaflet.js
+++ b/www/assets/js/map_leaflet.js
@@ -13,7 +13,7 @@ function leafletMap() {
         center: L.latLng(46.5966, -112.0180),
         attributionControl: false
     });
-    
+
     map.maptype = "leaflet";
 
     if (localStorage.getItem("mapsource") == null) {
@@ -32,7 +32,7 @@ function leafletMap() {
         showPopup: false,
         locateOptions: {
             enableHighAccuracy: true,
-            maxZoom: 16
+            maxZoom: localStorage.getItem("trackzoom") == null ? 16 : localStorage.getItem("trackzoom")
         },
         setView: "untilPanOrZoom",
         icon: "far fa-compass",
diff --git a/www/assets/js/map_mapbox.js b/www/assets/js/map_mapbox.js
index 5f7ad7c..c07435b 100644
--- a/www/assets/js/map_mapbox.js
+++ b/www/assets/js/map_mapbox.js
@@ -29,7 +29,9 @@ function mapboxMap() {
 
     map.maptype = "mapbox";
 
-    map.addControl(new mapboxgl.NavigationControl());
+    map.addControl(new mapboxgl.NavigationControl({
+        visualizePitch: true
+    }));
 
     map.addControl(
             new mapboxgl.GeolocateControl({
@@ -38,7 +40,7 @@ function mapboxMap() {
                     timeout: 10 * 1000
                 },
                 fitBoundsOptions: {
-                    maxZoom: 16
+                    maxZoom: localStorage.getItem("trackzoom") == null ? 16 : localStorage.getItem("trackzoom")
                 },
                 trackUserLocation: true
             })
diff --git a/www/assets/js/settings.js b/www/assets/js/settings.js
index b588064..fa23369 100644
--- a/www/assets/js/settings.js
+++ b/www/assets/js/settings.js
@@ -21,6 +21,10 @@ $('.item-link[data-setting=units] select').on("change", function () {
     localStorage.setItem("units", $('.item-link[data-setting=units] select').val());
 });
 
+$('.item-link[data-setting=trackzoom] select').on("change", function () {
+    localStorage.setItem("trackzoom", $('.item-link[data-setting=trackzoom] select').val());
+});
+
 $('.item-content[data-setting=wakelock] .toggle input').on("change", function () {
     var checked = $(this).prop('checked');
     console.log(checked);
diff --git a/www/routes.js b/www/routes.js
index 20aaaee..905b9b3 100644
--- a/www/routes.js
+++ b/www/routes.js
@@ -373,6 +373,28 @@ var routes = [
                                 }
                             ]
                         },
+                        {
+                            setting: "trackzoom",
+                            title: "Zoom when tracking location",
+                            select: true,
+                            options: [
+                                {
+                                    value: 15,
+                                    label: "Low",
+                                    selected: localStorage.getItem("trackzoom") == 15
+                                },
+                                {
+                                    value: 16,
+                                    label: "Normal",
+                                    selected: localStorage.getItem("trackzoom") == null || localStorage.getItem("trackzoom") == 16
+                                },
+                                {
+                                    value: 17,
+                                    label: "High",
+                                    selected: localStorage.getItem("trackzoom") == 17
+                                }
+                            ]
+                        },
                         {
                             setting: "maptype",
                             title: "Alternative map",