diff --git a/people/static/js/map.js b/people/static/js/map.js
index a04859e..2f314c5 100644
--- a/people/static/js/map.js
+++ b/people/static/js/map.js
@@ -1,6 +1,5 @@
 const marker_fill_alpha = 1.0;
 const marker_edge_colour = 'white';
-const marker_fill_colour = 'gray';
 
 // Size of the arrow markers used on the map
 const marker_scale = 7;
@@ -36,13 +35,15 @@ function createMarker(map, marker_data) {
             strokeColor: marker_edge_colour,
             strokeWeight: marker_edge_width,
             strokeOpacity: marker_edge_alpha,
-            fillColor: marker_fill_colour,
+            fillColor: marker_data.type === 'Organisation' ? '#669933' : '#0099cc',
             fillOpacity: marker_fill_alpha,
             scale: marker_scale,
             labelOrigin: new google.maps.Point(0, -marker_label_offset)
         },
     });
 
+    marker.type = marker_data.type;
+
     marker.info = new google.maps.InfoWindow({
         content: "<div id='content'>" +
             "<h3><a href=" + marker_data.url + ">" + marker_data.name.replace('&apos;', "'") + "</a></h3>" +
@@ -72,11 +73,12 @@ function initMap() {
     const markers_data = JSON.parse(
         document.getElementById('map-markers').textContent)
 
+    let markers_loaded = false
+
     // For each data entry in the json...
     for (const marker_data of markers_data) {
         try {
             const marker = createMarker(map, marker_data);
-            marker.type =  marker_data.type;
             markers.push(marker);
 
             bounds.extend(marker.position);
@@ -85,16 +87,18 @@ function initMap() {
                 selected_marker = marker;
             }
 
+            markers_loaded = true
+
         } catch (exc) {
             // Just skip and move on to next
         }
     }
 
     map.fitBounds(bounds)
-    const max_zoom = 10
-    if (map.getZoom() > max_zoom) {
-        map.setZoom(max_zoom)
+    if (!markers_loaded) {
+        map.panTo({lat: 0, lng: 0})
     }
+    setMaxZoom()
 
     setTimeout(setMaxZoom, 100)
 
@@ -105,8 +109,8 @@ function initMap() {
  * Zoom to set level if map is zoomed in more than this.
  */
 function setMaxZoom() {
-    const max_zoom = 10
-    if (map.getZoom() > max_zoom) {
-        map.setZoom(max_zoom)
-    }
+    const max_zoom = 4
+    const min_zoom = 2
+    const zoom = Math.min(Math.max(min_zoom, map.getZoom()), max_zoom)
+    map.setZoom(zoom)
 }