diff --git a/package-lock.json b/package-lock.json
index c4d1a7d..a760aec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1375,69 +1375,29 @@
       }
     },
     "@entur/expand": {
-      "version": "3.3.11",
-      "resolved": "https://registry.npmjs.org/@entur/expand/-/expand-3.3.11.tgz",
-      "integrity": "sha512-zlCVp++8imMSsEsdV/X/9a/k08+kuk6GzXFkf814cbKQYeAcnwAVG1vXZUtmqOENBAeFD1bNUVX4QPM0/lS7+w==",
-      "requires": {
-        "@entur/icons": "^4.1.1",
-        "@entur/tokens": "^3.3.2",
-        "@entur/typography": "^1.6.12",
-        "@entur/utils": "^0.4.3",
+      "version": "3.3.20",
+      "resolved": "https://registry.npmjs.org/@entur/expand/-/expand-3.3.20.tgz",
+      "integrity": "sha512-0FPKh+ZvivYD9M5/lCzD7Ovayszf684a1/puJurokCmfLPmEIbQzcyoVNyBF13Ypl4oI9RAzIs17+fhI4T26Lw==",
+      "requires": {
+        "@entur/icons": "^4.3.3",
+        "@entur/tokens": "^3.4.1",
+        "@entur/typography": "^1.7.0",
+        "@entur/utils": "^0.4.5",
         "classnames": "^2.3.1",
         "react-collapse": "^5.1.0"
-      },
-      "dependencies": {
-        "@entur/icons": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-4.1.1.tgz",
-          "integrity": "sha512-sErdiFO9zFqEE1S2JsApr8UAzcNzyic0iPFhZGJKbr+vPRTkljdWVOab1DtGin/0Sfs4saNH8VFD+s9DbtSAdA==",
-          "requires": {
-            "@entur/tokens": "^3.3.2",
-            "@entur/utils": "^0.4.3"
-          }
-        },
-        "@entur/utils": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.3.tgz",
-          "integrity": "sha512-56/7MF+U2LQBNMPNe9o5ll3aFlR2CLPCXUsv3Zt8QLG+SxFoisB7KpwOl0tTiO8hcj8PE96D+g83fMZ6PcYvWg==",
-          "requires": {
-            "react-polymorphic-types": "^1.1.0",
-            "tiny-warning": "^1.0.3"
-          }
-        }
       }
     },
     "@entur/form": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/@entur/form/-/form-4.4.7.tgz",
-      "integrity": "sha512-+307RxSX5SlFqMbrfU+AYJNMb7udWTVXyPrTRSIsJIIYPxuSAoOMW1OvB+uLKcqQ4oLcZpRwONlnAnoNUn3ZhA==",
-      "requires": {
-        "@entur/icons": "^3.0.0",
-        "@entur/tokens": "^3.1.0",
-        "@entur/tooltip": "^2.4.23",
-        "@entur/typography": "^1.6.7",
-        "@entur/utils": "^0.4.2",
+      "version": "5.4.4",
+      "resolved": "https://registry.npmjs.org/@entur/form/-/form-5.4.4.tgz",
+      "integrity": "sha512-0NICUDjzVfUzBJzHonAlof97hD9boPE8D4HoXOv1ZknzoCXKGZdTUtr3wv/a0GMD0RUDwavBRW+YDzyPyq4VFw==",
+      "requires": {
+        "@entur/icons": "^4.3.3",
+        "@entur/tokens": "^3.4.1",
+        "@entur/tooltip": "^2.5.16",
+        "@entur/typography": "^1.7.0",
+        "@entur/utils": "^0.4.5",
         "classnames": "^2.3.1"
-      },
-      "dependencies": {
-        "@entur/icons": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-3.5.0.tgz",
-          "integrity": "sha512-TsZ6XOt0P1pfqaovusx2Fbrv4HkVw2yLzmP/MJsFAmVVzpynpoT21/4zGWydr2vZREtjPM21p+zwPhN1ENnQKQ==",
-          "requires": {
-            "@entur/tokens": "^3.3.1",
-            "@entur/utils": "^0.4.3"
-          }
-        },
-        "@entur/utils": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.3.tgz",
-          "integrity": "sha512-56/7MF+U2LQBNMPNe9o5ll3aFlR2CLPCXUsv3Zt8QLG+SxFoisB7KpwOl0tTiO8hcj8PE96D+g83fMZ6PcYvWg==",
-          "requires": {
-            "react-polymorphic-types": "^1.1.0",
-            "tiny-warning": "^1.0.3"
-          }
-        }
       }
     },
     "@entur/gbfs-validator": {
@@ -1585,22 +1545,22 @@
       }
     },
     "@entur/icons": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-1.20.0.tgz",
-      "integrity": "sha512-Zs/e21lEQWxXRQ2M2UtNENlR7hQAMfg+5LNfBgq4YMEwUtTvODHzfCilHsXhDJnpiX3KoSTk5es0GWGL8t5tnQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-4.3.3.tgz",
+      "integrity": "sha512-yqUxZpNlhJYRlJ/U6Dib4je+xQjhlv3leP4ruypYrZVuLdd8ieaZL427Zh3fvpwDpmJUlZCsu9vAPUXt9YUQPw==",
       "requires": {
-        "@entur/tokens": "^3.0.1",
-        "@entur/utils": "^0.4.1"
+        "@entur/tokens": "^3.4.1",
+        "@entur/utils": "^0.4.5"
       }
     },
     "@entur/layout": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-1.10.4.tgz",
-      "integrity": "sha512-pDsPRN2JVuL2hdexku39XQWnBWMubm1rCQxTuruEoJ0FQ1KMQyigaA0l4iddt4VOZBMu1pG/SbdM+U0ZtUD4JQ==",
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.1.11.tgz",
+      "integrity": "sha512-39y86FrYRfxr9udZLWAndODoRseKFp4h4/h9Cx48z3rkdGvdLiUhsim5nkEm6+zyG7cfwD0/d6wzEgR5uI8vEw==",
       "requires": {
-        "@entur/typography": "^1.6.6",
-        "@entur/utils": "^0.4.1",
-        "classnames": "^2.2.6"
+        "@entur/typography": "^1.7.0",
+        "@entur/utils": "^0.4.5",
+        "classnames": "^2.3.1"
       }
     },
     "@entur/loader": {
@@ -1626,49 +1586,20 @@
       }
     },
     "@entur/menu": {
-      "version": "3.6.6",
-      "resolved": "https://registry.npmjs.org/@entur/menu/-/menu-3.6.6.tgz",
-      "integrity": "sha512-/sahdfNYZ6jVBmf1tU9LaOeqJAZuFpqpoSRVrOuRClNn2r8EYBXwlGsZLukO1mWp2Pny+OuPsSXokb4wq5/qCg==",
-      "requires": {
-        "@entur/button": "^2.6.1",
-        "@entur/expand": "^3.3.2",
-        "@entur/icons": "^3.0.0",
-        "@entur/layout": "^2.1.0",
-        "@entur/tokens": "^3.1.0",
-        "@entur/typography": "^1.6.7",
-        "@entur/utils": "^0.4.2",
-        "@reach/menu-button": "^0.15.1",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@entur/menu/-/menu-4.1.11.tgz",
+      "integrity": "sha512-hgAln/Fj32B4gKtY61BBDkfl3yatpah4lq03Jxgzx3ShNMCUZU2ojYaBPCtH2+FjBJcWZQHgCSCjuZxKo+8l7g==",
+      "requires": {
+        "@entur/a11y": "^0.2.49",
+        "@entur/button": "^2.10.4",
+        "@entur/expand": "^3.3.20",
+        "@entur/icons": "^4.3.3",
+        "@entur/layout": "^2.1.11",
+        "@entur/tokens": "^3.4.1",
+        "@entur/typography": "^1.7.0",
+        "@entur/utils": "^0.4.5",
+        "@reach/menu-button": "^0.16.1",
         "classnames": "^2.3.1"
-      },
-      "dependencies": {
-        "@entur/icons": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/@entur/icons/-/icons-3.5.0.tgz",
-          "integrity": "sha512-TsZ6XOt0P1pfqaovusx2Fbrv4HkVw2yLzmP/MJsFAmVVzpynpoT21/4zGWydr2vZREtjPM21p+zwPhN1ENnQKQ==",
-          "requires": {
-            "@entur/tokens": "^3.3.1",
-            "@entur/utils": "^0.4.3"
-          }
-        },
-        "@entur/layout": {
-          "version": "2.1.5",
-          "resolved": "https://registry.npmjs.org/@entur/layout/-/layout-2.1.5.tgz",
-          "integrity": "sha512-9B4aCOB8rgAJX/9q33uKNLMoyEuRG9gp2b5vBeriTDL8Reju6DiyCWhVRh7nltcs3GtV188C7d5RYlyb3jZKUQ==",
-          "requires": {
-            "@entur/typography": "^1.6.12",
-            "@entur/utils": "^0.4.3",
-            "classnames": "^2.3.1"
-          }
-        },
-        "@entur/utils": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.3.tgz",
-          "integrity": "sha512-56/7MF+U2LQBNMPNe9o5ll3aFlR2CLPCXUsv3Zt8QLG+SxFoisB7KpwOl0tTiO8hcj8PE96D+g83fMZ6PcYvWg==",
-          "requires": {
-            "react-polymorphic-types": "^1.1.0",
-            "tiny-warning": "^1.0.3"
-          }
-        }
       }
     },
     "@entur/modal": {
@@ -1850,11 +1781,11 @@
       }
     },
     "@entur/utils": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.1.tgz",
-      "integrity": "sha512-g5H29RH8gFbN4DPjfNBqSyiTIvIze374AsIMURgTCvo7asljizS9XhLacAORmeHwInCw9ErBN2pua1BG1aVpYA==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/@entur/utils/-/utils-0.4.5.tgz",
+      "integrity": "sha512-pgKnKvcHSd1aqSUUxBvlhwk/qwTC4hqrTyVQvfrYm+yV06sIcU1kInQEyc+TzU70gzelbsduiSmEpGMIV+jvcQ==",
       "requires": {
-        "react-polymorphic-types": "^1.0.3",
+        "react-polymorphic-types": "^1.1.0",
         "tiny-warning": "^1.0.3"
       }
     },
@@ -2813,11 +2744,11 @@
       "dev": true
     },
     "@reach/auto-id": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.15.3.tgz",
-      "integrity": "sha512-lbLUI9mrn74qVis141ib0Rsyhgk+gzUMtpplRmjy06cUWDFZyiBATNWMUxN5T+0fU4tpfgcjkAuPeTCCGThKtQ==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/auto-id/-/auto-id-0.16.0.tgz",
+      "integrity": "sha512-5ssbeP5bCkM39uVsfQCwBBL+KT8YColdnMN5/Eto6Rj7929ql95R3HZUOkKIvj7mgPtEb60BLQxd1P3o6cjbmg==",
       "requires": {
-        "@reach/utils": "0.15.3",
+        "@reach/utils": "0.16.0",
         "tslib": "^2.3.0"
       },
       "dependencies": {
@@ -2829,11 +2760,11 @@
       }
     },
     "@reach/descendants": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/descendants/-/descendants-0.15.3.tgz",
-      "integrity": "sha512-vuCBG7Uru6IEJ2wvTd7L2xumbYzv2UYBduZ0E1FEABqyUo78eTIZbRcwIN73IxMcivjWipBPlcLLkpFtJKMPew==",
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/@reach/descendants/-/descendants-0.16.1.tgz",
+      "integrity": "sha512-3WZgRnD9O4EORKE31rrduJDiPFNMOjUkATx0zl192ZxMq3qITe4tUj70pS5IbJl/+v9zk78JwyQLvA1pL7XAPA==",
       "requires": {
-        "@reach/utils": "0.15.3",
+        "@reach/utils": "0.16.0",
         "tslib": "^2.3.0"
       },
       "dependencies": {
@@ -2884,14 +2815,14 @@
       }
     },
     "@reach/dropdown": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/dropdown/-/dropdown-0.15.3.tgz",
-      "integrity": "sha512-nNBJnozc0M+x89dIjqaoQAoymrfYZmaIEJ1Ti3VIcodFh1JWrXsq1qAY10stlK4YRTX8UdXevzSt29bAHZ+pwg==",
-      "requires": {
-        "@reach/auto-id": "0.15.3",
-        "@reach/descendants": "0.15.3",
-        "@reach/popover": "0.15.3",
-        "@reach/utils": "0.15.3",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/dropdown/-/dropdown-0.16.2.tgz",
+      "integrity": "sha512-l4nNiX6iUpMdHQNbZMhgW5APtw0AUwJuRnkqE93vkjvdtrYl/sNJy1Jr6cGG7TrZIABLSOsfwbXU3C+qwJ3ftQ==",
+      "requires": {
+        "@reach/auto-id": "0.16.0",
+        "@reach/descendants": "0.16.1",
+        "@reach/popover": "0.16.2",
+        "@reach/utils": "0.16.0",
         "tslib": "^2.3.0"
       },
       "dependencies": {
@@ -2903,13 +2834,13 @@
       }
     },
     "@reach/menu-button": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/menu-button/-/menu-button-0.15.3.tgz",
-      "integrity": "sha512-cg9ta5z6JoYv7p+UDMrEhBAgj2O59L9bs8cPjpef1P8DtzXxTJLx9X7jOPTQr8ooUt5jYM+Mw9J6K5vKe7rEYw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/menu-button/-/menu-button-0.16.2.tgz",
+      "integrity": "sha512-p4n6tFVaJZHJZEznHWy0YH2Xr3I+W7tsQWAT72PqKGT+uryGRdtgEQqi76f/8cRaw/00ueazBk5lwLG7UKGFaA==",
       "requires": {
-        "@reach/dropdown": "0.15.3",
-        "@reach/popover": "0.15.3",
-        "@reach/utils": "0.15.3",
+        "@reach/dropdown": "0.16.2",
+        "@reach/popover": "0.16.2",
+        "@reach/utils": "0.16.0",
         "prop-types": "^15.7.2",
         "tiny-warning": "^1.0.3",
         "tslib": "^2.3.0"
@@ -2928,13 +2859,13 @@
       "integrity": "sha512-Ba7HmkFgfQxZqqaeIWWkNK0rEhpxVQHIoVyW1YDSkGsGIXzcaW4deC8B0pZrNSSyLTdIk7y+5olKt5+g0GmFIQ=="
     },
     "@reach/popover": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/popover/-/popover-0.15.3.tgz",
-      "integrity": "sha512-T5A1gZGXfl4vDqK6kb7tyxgKWur4QsoKwHJ0LcJZ9JDYtiUDbdBDw+yRHwvuExx48Glc8BYcdy6X6BF2n21FuA==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/popover/-/popover-0.16.2.tgz",
+      "integrity": "sha512-IwkRrHM7Vt33BEkSXneovymJv7oIToOfTDwRKpuYEB/BWYMAuNfbsRL7KVe6MjkgchDeQzAk24cYY1ztQj5HQQ==",
       "requires": {
-        "@reach/portal": "0.15.3",
-        "@reach/rect": "0.15.3",
-        "@reach/utils": "0.15.3",
+        "@reach/portal": "0.16.2",
+        "@reach/rect": "0.16.0",
+        "@reach/utils": "0.16.0",
         "tabbable": "^4.0.0",
         "tslib": "^2.3.0"
       },
@@ -2947,11 +2878,12 @@
       }
     },
     "@reach/portal": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.15.3.tgz",
-      "integrity": "sha512-9VkVEQIF9gK73uK1f9MYhrJivd0dpxhkBEb2zwVCIEGvKVxadmRNmCjgcWexGjA0UeCjIhEjQQehs/IZHNLPdw==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/@reach/portal/-/portal-0.16.2.tgz",
+      "integrity": "sha512-9ur/yxNkuVYTIjAcfi46LdKUvH0uYZPfEp4usWcpt6PIp+WDF57F/5deMe/uGi/B/nfDweQu8VVwuMVrCb97JQ==",
       "requires": {
-        "@reach/utils": "0.15.3",
+        "@reach/utils": "0.16.0",
+        "tiny-warning": "^1.0.3",
         "tslib": "^2.3.0"
       },
       "dependencies": {
@@ -2963,12 +2895,12 @@
       }
     },
     "@reach/rect": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/rect/-/rect-0.15.3.tgz",
-      "integrity": "sha512-ZKakUC14DoCbccc7ymARXCzfpaRMTvbaAibBw64/sg/Vm7W+bi+P3mu5QMQkGNxFKXaKu/szx+r9RzM4ld/IfQ==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/rect/-/rect-0.16.0.tgz",
+      "integrity": "sha512-/qO9jQDzpOCdrSxVPR6l674mRHNTqfEjkaxZHluwJ/2qGUtYsA0GSZiF/+wX/yOWeBif1ycxJDa6HusAMJZC5Q==",
       "requires": {
         "@reach/observe-rect": "1.2.0",
-        "@reach/utils": "0.15.3",
+        "@reach/utils": "0.16.0",
         "prop-types": "^15.7.2",
         "tiny-warning": "^1.0.3",
         "tslib": "^2.3.0"
@@ -2982,9 +2914,9 @@
       }
     },
     "@reach/utils": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.15.3.tgz",
-      "integrity": "sha512-HFyjw8LZ4/RRk5bcMpDAeEc3aOeLR/vWRDsljlE3cHI5GfFlZcG3DDLSW8C2ba74RCFp/4X3Nz0nOrd4JdkZ1w==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@reach/utils/-/utils-0.16.0.tgz",
+      "integrity": "sha512-PCggBet3qaQmwFNcmQ/GqHSefadAFyNCUekq9RrWoaU9hh/S4iaFgf2MBMdM47eQj5i/Bk0Mm07cP/XPFlkN+Q==",
       "requires": {
         "tiny-warning": "^1.0.3",
         "tslib": "^2.3.0"
diff --git a/package.json b/package.json
index 0abc217..911a200 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,11 @@
   "private": true,
   "dependencies": {
     "@entur/button": "2.10.4",
-    "@entur/form": "4.4.7",
+    "@entur/form": "5.4.4",
     "@entur/gbfs-validator": "0.3.0",
-    "@entur/icons": "1.20.0",
-    "@entur/layout": "1.10.4",
-    "@entur/menu": "3.6.6",
+    "@entur/icons": "4.3.3",
+    "@entur/layout": "2.1.11",
+    "@entur/menu": "4.1.11",
     "@entur/modal": "1.6.9",
     "@entur/table": "4.5.21",
     "@entur/tokens": "3.4.1",