diff --git a/services/grafana/dashboards/apiary.json b/services/grafana/dashboards/apiary.json
index ccc5b30..b53070b 100644
--- a/services/grafana/dashboards/apiary.json
+++ b/services/grafana/dashboards/apiary.json
@@ -213,7 +213,7 @@
       "id": 7,
       "title": "Sessions by Shell",
       "type": "timeseries",
-      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 12},
+      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 22},
       "datasource": {"type": "prometheus", "uid": "prometheus"},
       "targets": [
         {
@@ -245,7 +245,7 @@
       "id": 8,
       "title": "Attempts by Country",
       "type": "geomap",
-      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 12},
+      "gridPos": {"h": 10, "w": 24, "x": 0, "y": 12},
       "datasource": {"type": "prometheus", "uid": "prometheus"},
       "targets": [
         {
@@ -302,26 +302,19 @@
             },
             "location": {
               "mode": "lookup",
-              "lookup": "country"
+              "lookup": "country",
+              "gazetteer": "public/gazetteer/countries.json"
             }
           }
         ]
       },
-      "transformations": [
-        {
-          "id": "reduce",
-          "options": {
-            "reducers": ["lastNotNull"]
-          }
-        }
-      ],
       "description": "Authentication attempts by country (geo lookup from country code)"
     },
     {
       "id": 9,
       "title": "Session Duration Distribution",
       "type": "heatmap",
-      "gridPos": {"h": 8, "w": 12, "x": 0, "y": 20},
+      "gridPos": {"h": 8, "w": 24, "x": 0, "y": 30},
       "datasource": {"type": "prometheus", "uid": "prometheus"},
       "targets": [
         {
@@ -361,7 +354,7 @@
       "id": 10,
       "title": "Commands Executed by Shell",
       "type": "timeseries",
-      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 20},
+      "gridPos": {"h": 8, "w": 12, "x": 12, "y": 22},
       "datasource": {"type": "prometheus", "uid": "prometheus"},
       "targets": [
         {