diff --git a/images/base-layer.svg b/images/base-layer.svg
index 9b48ec7f..bc1cd780 100644
--- a/images/base-layer.svg
+++ b/images/base-layer.svg
@@ -79,7 +79,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a1" />
+         id="key-0" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -87,7 +87,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a2" />
+         id="key-1" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -95,7 +95,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a3" />
+         id="key-2" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -103,7 +103,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a4" />
+         id="key-3" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -111,7 +111,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a5" />
+         id="key-4" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -119,7 +119,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a6" />
+         id="key-5" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -127,7 +127,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a7" />
+         id="key-6" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -135,7 +135,7 @@
          y="-360.50003"
          height="63.779526"
          width="95.669289"
-         id="b1" />
+         id="key-7" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -143,7 +143,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b2" />
+         id="key-8" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -151,7 +151,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b3" />
+         id="key-9" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -159,7 +159,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b4" />
+         id="key-10" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -167,7 +167,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b5" />
+         id="key-11" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -175,7 +175,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b6" />
+         id="key-12" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -183,7 +183,7 @@
          y="-293.17719"
          height="63.779526"
          width="111.61417"
-         id="c1" />
+         id="key-13" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -191,7 +191,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c2" />
+         id="key-14" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -199,7 +199,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c3" />
+         id="key-15" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -207,7 +207,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c4" />
+         id="key-16" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -215,7 +215,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c5" />
+         id="key-17" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -223,7 +223,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c6" />
+         id="key-18" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -231,7 +231,7 @@
          y="-225.85435"
          height="63.779526"
          width="143.50394"
-         id="d1" />
+         id="key-19" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -239,7 +239,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d2" />
+         id="key-20" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -247,7 +247,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d3" />
+         id="key-21" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -255,7 +255,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d4" />
+         id="key-22" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -263,7 +263,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d5" />
+         id="key-23" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -271,7 +271,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d6" />
+         id="key-24" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -279,7 +279,7 @@
          y="-158.53151"
          height="63.779526"
          width="79.724411"
-         id="e1" />
+         id="key-25" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -287,7 +287,7 @@
          y="-158.53151"
          height="63.779526"
          width="79.724411"
-         id="e2" />
+         id="key-26" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -295,7 +295,7 @@
          y="-158.53151"
          height="63.779526"
          width="79.724411"
-         id="e3" />
+         id="key-27" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -303,7 +303,7 @@
          y="-158.53151"
          height="63.779526"
          width="79.724411"
-         id="e4" />
+         id="key-28" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -311,7 +311,7 @@
          y="-158.53151"
          height="63.779526"
          width="131.10236"
-         id="e5" />
+         id="key-29" />
       <rect
          rx="3.4856062"
          ry="3.5433071"
@@ -319,7 +319,7 @@
          y="-91.071709"
          height="41.667309"
          width="131.10236"
-         id="f1" />
+         id="key-30" />
       <text
          y="-435.0346495"
          x="-163.006457"
@@ -813,7 +813,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a8" />
+         id="key-0" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -821,7 +821,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a9" />
+         id="key-1" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -829,7 +829,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a10" />
+         id="key-2" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -837,7 +837,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a11" />
+         id="key-3" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -845,7 +845,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a12" />
+         id="key-4" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -853,7 +853,7 @@
          y="-427.82285"
          height="63.779526"
          width="63.779526"
-         id="a13" />
+         id="key-5" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -861,7 +861,7 @@
          y="-427.82285"
          height="63.779526"
          width="95.669289"
-         id="a14" />
+         id="key-6" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -869,7 +869,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b7" />
+         id="key-7" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -877,7 +877,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b8" />
+         id="key-8" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -885,7 +885,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b9" />
+         id="key-9" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -893,7 +893,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b10" />
+         id="key-10" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -901,7 +901,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b11" />
+         id="key-11" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -909,7 +909,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b12" />
+         id="key-12" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -917,7 +917,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b13" />
+         id="key-13" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -925,7 +925,7 @@
          y="-360.50003"
          height="63.779526"
          width="63.779526"
-         id="b14" />
+         id="key-14" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -933,7 +933,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c7" />
+         id="key-15" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -941,7 +941,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c8" />
+         id="key-16" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -949,7 +949,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c9" />
+         id="key-17" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -957,7 +957,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c10" />
+         id="key-18" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -965,7 +965,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c11" />
+         id="key-19" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -973,7 +973,7 @@
          y="-293.17719"
          height="63.779526"
          width="63.779526"
-         id="c12" />
+         id="key-20" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -981,7 +981,7 @@
          y="-293.17719"
          height="63.779526"
          width="111.61417"
-         id="c13" />
+         id="key-21" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -989,7 +989,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d7" />
+         id="key-22" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -997,7 +997,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d8" />
+         id="key-23" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1005,7 +1005,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d9" />
+         id="key-24" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1013,7 +1013,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d10" />
+         id="key-25" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1021,7 +1021,7 @@
          y="-225.85435"
          height="63.779526"
          width="63.779526"
-         id="d11" />
+         id="key-26" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1029,7 +1029,7 @@
          y="-225.85435"
          height="63.779526"
          width="143.50394"
-         id="d12" />
+         id="key-27" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1037,7 +1037,7 @@
          y="-158.53151"
          height="63.779526"
          width="124.37008"
-         id="e6" />
+         id="key-28" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1045,7 +1045,7 @@
          y="-158.53151"
          height="63.779526"
          width="79.724411"
-         id="e7" />
+         id="key-29" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1053,7 +1053,7 @@
          y="-158.53151"
          height="63.779526"
          width="79.724411"
-         id="e8" />
+         id="key-30" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1061,7 +1061,7 @@
          y="-158.53151"
          height="63.779526"
          width="79.724411"
-         id="e9" />
+         id="key-31" />
       <rect
          rx="3.5433071"
          ry="3.5433071"
@@ -1069,7 +1069,7 @@
          y="-158.53151"
          height="63.779526"
          width="127.55905"
-         id="e10" />
+         id="key-32" />
       <rect
          rx="3.493542"
          ry="3.5433071"
@@ -1077,7 +1077,7 @@
          y="-91.071663"
          height="41.667309"
          width="124.37009"
-         id="f2" />
+         id="key-33" />
       <text
          y="-435.0346495"
          x="485.418723"