diff --git a/notes.txt b/notes.txt
index 182ee08..2efba29 100644
--- a/notes.txt
+++ b/notes.txt
@@ -248,4 +248,6 @@ npm install --save @helgoland/map
 npm uninstall --save @helgoland/selector
 npm uninstall --save @helgoland/depiction
 npm uninstall --save @angular/forms
+npm uninstall --save @helgoland/map @helgoland/core
 
+npm i --save-dev @types/leaflet
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index da17e8b..ce89fc5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,14 +18,13 @@
         "@fortawesome/angular-fontawesome": "^0.9.0",
         "@fortawesome/fontawesome-svg-core": "^1.2.36",
         "@fortawesome/free-solid-svg-icons": "^5.15.4",
-        "@helgoland/core": "^12.0.0-beta.1",
-        "@helgoland/map": "^12.0.1",
         "@ngx-translate/http-loader": "^6.0.0",
         "babel-plugin-transform-typescript-metadata": "^0.3.2",
         "bulma": "^0.9.3",
         "chart.js": "^3.5.1",
         "chartjs-adapter-moment": "^1.0.0",
         "chartjs-plugin-zoom": "^1.1.1",
+        "class-transformer": "^0.4.0",
         "core-js": "^3.16.0",
         "leaflet": "^1.7.1",
         "moment": "^2.29.1",
@@ -39,12 +38,13 @@
         "@babel/plugin-proposal-decorators": "^7.14.5",
         "@babel/preset-env": "^7.14.8",
         "@babel/preset-typescript": "^7.14.5",
+        "@types/leaflet": "^1.7.5",
         "angular2-template-loader": "^0.6.2",
         "babel-loader": "^8.2.2",
         "css-loader": "^6.2.0",
         "dotenv": "^10.0.0",
         "file-loader": "^6.2.0",
-        "html-loader": "^2.1.2",
+        "html-loader": "^3.0.0",
         "html-webpack-plugin": "^5.3.2",
         "img-loader": "^4.0.0",
         "mini-css-extract-plugin": "^2.1.0",
@@ -553,6 +553,43 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/mini-css-extract-plugin": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.2.tgz",
+      "integrity": "sha512-ZmqShkn79D36uerdED+9qdo1ZYG8C1YsWvXu0UMJxurZnSdgz7gQKO2EGv8T55MhDqG3DYmGtizZNpM/UbTlcA==",
+      "dev": true,
+      "dependencies": {
+        "schema-utils": "^3.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.8",
+        "ajv": "^6.12.5",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/pretty-error": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
@@ -994,6 +1031,7 @@
       "version": "12.2.11",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.2.11.tgz",
       "integrity": "sha512-/3QS5YaHfm2taJYUVes076ZMpL2GRYVW3HDbHXiRNjoC9EMqQ7ahRD9RPFC8XUk709JuqzonE3bB+N5Ld3mzIA==",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.2.0"
       },
@@ -2917,9 +2955,9 @@
       }
     },
     "node_modules/@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -3094,36 +3132,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/@helgoland/core": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/@helgoland/core/-/core-12.0.2.tgz",
-      "integrity": "sha512-QjSdtO61fiDf2XcgXRMgHQuGIC3GXpArpawLHn0t7vHvEXEw69lsbutRxzdcm+LVABXoI3FpWmrDtyT8JdUwPw==",
-      "dependencies": {
-        "@angular/common": "^12.2.4",
-        "@angular/core": "^12.2.4",
-        "@ngx-translate/core": "^13.0.0",
-        "@types/geojson": "^7946.0.8",
-        "class-transformer": "^0.4.0",
-        "moment": "^2.29.1",
-        "moment-timezone": "^0.5.33",
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@helgoland/map": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/@helgoland/map/-/map-12.0.2.tgz",
-      "integrity": "sha512-FjlNScRJTksImkBLE6FMPA2vlBaWrcy9sOf4pCFIIRny4/l7k0ap8BsXJs1fEjnmacVsf0bOClZD4ksPW79d6w==",
-      "dependencies": {
-        "@angular/common": "^12.2.4",
-        "@angular/core": "^12.2.4",
-        "@types/geojson": "^7946.0.8",
-        "@types/leaflet": "^1.5.17",
-        "@types/leaflet.markercluster": "^1.4.5",
-        "leaflet": "^1.7.1",
-        "leaflet.markercluster": "^1.5.0",
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -3175,6 +3183,7 @@
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
       "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==",
+      "peer": true,
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -3345,9 +3354,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "7.28.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.1.tgz",
-      "integrity": "sha512-XhZKznR3i/W5dXqUhgU9fFdJekufbeBd5DALmkuXoeFcjbQcPk+2cL+WLHf6Q81HWAnM2vrslIHpGVyCAviRwg==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
+      "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
@@ -3373,7 +3382,8 @@
     "node_modules/@types/geojson": {
       "version": "7946.0.8",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
-      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==",
+      "dev": true
     },
     "node_modules/@types/glob": {
       "version": "7.2.0",
@@ -3401,18 +3411,11 @@
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.5.tgz",
       "integrity": "sha512-+Myo00Yb5OuvUyrH+vUwn9DRgOaBJsF/etIMdMcNhWGBMo58Mo1cxLInvCd0ZpvItju/AeDYFB/Od2pLiHB3VA==",
+      "dev": true,
       "dependencies": {
         "@types/geojson": "*"
       }
     },
-    "node_modules/@types/leaflet.markercluster": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.4.5.tgz",
-      "integrity": "sha512-R9Ql//z6muSGI5mPfr+FaKQQB7EIdQQyivYweVSdOrWr8WyNNFcSwfl+mqGYJFhRRCO/6lbZiM3scEyp9LdaFg==",
-      "dependencies": {
-        "@types/leaflet": "*"
-      }
-    },
     "node_modules/@types/minimatch": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -3426,9 +3429,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.11.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz",
-      "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==",
+      "version": "16.11.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz",
+      "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ==",
       "dev": true
     },
     "node_modules/@types/normalize-package-data": {
@@ -4559,15 +4562,15 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.4.tgz",
-      "integrity": "sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==",
+      "version": "4.17.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
+      "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001265",
-        "electron-to-chromium": "^1.3.867",
+        "caniuse-lite": "^1.0.30001271",
+        "electron-to-chromium": "^1.3.878",
         "escalade": "^3.1.1",
-        "node-releases": "^2.0.0",
+        "node-releases": "^2.0.1",
         "picocolors": "^1.0.0"
       },
       "bin": {
@@ -4756,9 +4759,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001270",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz",
-      "integrity": "sha512-TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A==",
+      "version": "1.0.30001271",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -4799,9 +4802,9 @@
       "dev": true
     },
     "node_modules/chart.js": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz",
-      "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.6.0.tgz",
+      "integrity": "sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ=="
     },
     "node_modules/chartjs-adapter-moment": {
       "version": "1.0.0",
@@ -4978,10 +4981,12 @@
       }
     },
     "node_modules/clean-css": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "source-map": "~0.6.0"
       },
@@ -4994,6 +4999,8 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5141,6 +5148,8 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">= 6"
       }
@@ -5506,9 +5515,9 @@
       "dev": true
     },
     "node_modules/critters/node_modules/postcss": {
-      "version": "8.3.10",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.10.tgz",
-      "integrity": "sha512-YYfvfUdWx+ECpr5Hgc6XRfsaux8LksL5ey8qTtWiuRXOpOF1YYMwAySdh0nSmwhZAFvvJ6rgiIkKVShu4x2T1Q==",
+      "version": "8.3.11",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+      "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
       "dev": true,
       "dependencies": {
         "nanoid": "^3.1.30",
@@ -6576,9 +6585,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.875",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.875.tgz",
-      "integrity": "sha512-K/rqxvLwZOshysgPOqfU1x8rfdFXyieYLdT1JYlLHkLj8gI/4Qh4Xi+KrO6kq4t3aNhp/wGSGOyR4ooYvXbvyg==",
+      "version": "1.3.878",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.878.tgz",
+      "integrity": "sha512-O6yxWCN9ph2AdspAIszBnd9v8s11hQx8ub9w4UGApzmNRnoKhbulOWqbO8THEQec/aEHtvy+donHZMlh6l1rbA==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -8371,16 +8380,16 @@
       "dev": true
     },
     "node_modules/html-loader": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-2.1.2.tgz",
-      "integrity": "sha512-XB4O1+6mpLp4qy/3qg5+1QPZ/uXvWtO64hNAX87sKHwcHkp1LJGU7V3sJ9iVmRACElAZXQ4YOO/Lbkx5kYfl9A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-3.0.0.tgz",
+      "integrity": "sha512-xcWiuZwxEs4Sh0D/I+KujHZtCdmA8hPS3nPp/bKXKO9zFouGTdgK8pt7nrh7tD2kIy1ND6OgOpXQUKa+xYIMmg==",
       "dev": true,
       "dependencies": {
-        "html-minifier-terser": "^5.1.1",
+        "html-minifier-terser": "^6.0.2",
         "parse5": "^6.0.1"
       },
       "engines": {
-        "node": ">= 10.13.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -8390,17 +8399,112 @@
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/html-loader/node_modules/clean-css": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
+      "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
+      "dev": true,
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/html-loader/node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/html-loader/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/html-loader/node_modules/html-minifier-terser": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.0.2.tgz",
+      "integrity": "sha512-AgYO3UGhMYQx2S/FBJT3EM0ZYcKmH6m9XL9c1v77BeK/tYJxGPxT1/AtsdUi4FcP8kZGmqqnItCcjFPcX9hk6A==",
+      "dev": true,
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.1.5",
+        "commander": "^8.1.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.7.2"
+      },
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/html-loader/node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "dev": true
     },
+    "node_modules/html-loader/node_modules/source-map-support": {
+      "version": "0.5.20",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+      "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/html-loader/node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/html-loader/node_modules/terser": {
+      "version": "5.9.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+      "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+      "dev": true,
+      "dependencies": {
+        "commander": "^2.20.0",
+        "source-map": "~0.7.2",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-loader/node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
     "node_modules/html-minifier-terser": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
       "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "camel-case": "^4.1.1",
         "clean-css": "^4.2.3",
@@ -8422,6 +8526,8 @@
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -8431,6 +8537,8 @@
       "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
       "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -8447,7 +8555,9 @@
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "node_modules/html-webpack-plugin": {
       "version": "5.4.0",
@@ -8473,9 +8583,9 @@
       }
     },
     "node_modules/html-webpack-plugin/node_modules/clean-css": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.1.tgz",
-      "integrity": "sha512-ooQCa1/70oRfVdUUGjKpbHuxgMgm8BsDT5EBqBGvPxMoRoGXf4PNx5mMnkjzJ9Ptx4vvmDdha0QVh86QtYIk1g==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
+      "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
       "dev": true,
       "dependencies": {
         "source-map": "~0.6.0"
@@ -8494,9 +8604,9 @@
       }
     },
     "node_modules/html-webpack-plugin/node_modules/commander": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz",
-      "integrity": "sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true,
       "engines": {
         "node": ">= 12"
@@ -10030,14 +10140,6 @@
       "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz",
       "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="
     },
-    "node_modules/leaflet.markercluster": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz",
-      "integrity": "sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==",
-      "peerDependencies": {
-        "leaflet": "^1.3.1"
-      }
-    },
     "node_modules/less": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
@@ -10661,9 +10763,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.2.tgz",
-      "integrity": "sha512-ZmqShkn79D36uerdED+9qdo1ZYG8C1YsWvXu0UMJxurZnSdgz7gQKO2EGv8T55MhDqG3DYmGtizZNpM/UbTlcA==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.3.tgz",
+      "integrity": "sha512-zekavl9mZuGyk7COjsfFY/f655AX61EKE0AthXPrmDk+oZyjZ9WzO4WPjXnnO9xl8obK2kmM6rAQrBEmk+WK1g==",
       "dev": true,
       "dependencies": {
         "schema-utils": "^3.1.0"
@@ -10899,17 +11001,6 @@
         "node": "*"
       }
     },
-    "node_modules/moment-timezone": {
-      "version": "0.5.33",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
-      "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
-      "dependencies": {
-        "moment": ">= 2.9.0"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -16613,9 +16704,9 @@
       }
     },
     "node_modules/style-loader": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.0.tgz",
-      "integrity": "sha512-szANub7ksJtQioJYtpbWwh1hUl99uK15n5HDlikeCRil/zYMZgSxucHddyF/4A3qJMUiAjPhFowrrQuNMA7jwQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
       "dev": true,
       "engines": {
         "node": ">= 12.13.0"
@@ -19288,6 +19379,28 @@
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
+        "mini-css-extract-plugin": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.2.tgz",
+          "integrity": "sha512-ZmqShkn79D36uerdED+9qdo1ZYG8C1YsWvXu0UMJxurZnSdgz7gQKO2EGv8T55MhDqG3DYmGtizZNpM/UbTlcA==",
+          "dev": true,
+          "requires": {
+            "schema-utils": "^3.1.0"
+          },
+          "dependencies": {
+            "schema-utils": {
+              "version": "3.1.1",
+              "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+              "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+              "dev": true,
+              "requires": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+              }
+            }
+          }
+        },
         "pretty-error": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
@@ -19581,6 +19694,7 @@
       "version": "12.2.11",
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-12.2.11.tgz",
       "integrity": "sha512-/3QS5YaHfm2taJYUVes076ZMpL2GRYVW3HDbHXiRNjoC9EMqQ7ahRD9RPFC8XUk709JuqzonE3bB+N5Ld3mzIA==",
+      "peer": true,
       "requires": {
         "tslib": "^2.2.0"
       }
@@ -20915,9 +21029,9 @@
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -21045,36 +21159,6 @@
         "@fortawesome/fontawesome-common-types": "^0.2.36"
       }
     },
-    "@helgoland/core": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/@helgoland/core/-/core-12.0.2.tgz",
-      "integrity": "sha512-QjSdtO61fiDf2XcgXRMgHQuGIC3GXpArpawLHn0t7vHvEXEw69lsbutRxzdcm+LVABXoI3FpWmrDtyT8JdUwPw==",
-      "requires": {
-        "@angular/common": "^12.2.4",
-        "@angular/core": "^12.2.4",
-        "@ngx-translate/core": "^13.0.0",
-        "@types/geojson": "^7946.0.8",
-        "class-transformer": "^0.4.0",
-        "moment": "^2.29.1",
-        "moment-timezone": "^0.5.33",
-        "tslib": "^2.1.0"
-      }
-    },
-    "@helgoland/map": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/@helgoland/map/-/map-12.0.2.tgz",
-      "integrity": "sha512-FjlNScRJTksImkBLE6FMPA2vlBaWrcy9sOf4pCFIIRny4/l7k0ap8BsXJs1fEjnmacVsf0bOClZD4ksPW79d6w==",
-      "requires": {
-        "@angular/common": "^12.2.4",
-        "@angular/core": "^12.2.4",
-        "@types/geojson": "^7946.0.8",
-        "@types/leaflet": "^1.5.17",
-        "@types/leaflet.markercluster": "^1.4.5",
-        "leaflet": "^1.7.1",
-        "leaflet.markercluster": "^1.5.0",
-        "tslib": "^2.1.0"
-      }
-    },
     "@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -21111,6 +21195,7 @@
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
       "integrity": "sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==",
+      "peer": true,
       "requires": {
         "tslib": "^2.0.0"
       }
@@ -21243,9 +21328,9 @@
       "dev": true
     },
     "@types/eslint": {
-      "version": "7.28.1",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.1.tgz",
-      "integrity": "sha512-XhZKznR3i/W5dXqUhgU9fFdJekufbeBd5DALmkuXoeFcjbQcPk+2cL+WLHf6Q81HWAnM2vrslIHpGVyCAviRwg==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
+      "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
@@ -21271,7 +21356,8 @@
     "@types/geojson": {
       "version": "7946.0.8",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz",
-      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="
+      "integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==",
+      "dev": true
     },
     "@types/glob": {
       "version": "7.2.0",
@@ -21299,18 +21385,11 @@
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.7.5.tgz",
       "integrity": "sha512-+Myo00Yb5OuvUyrH+vUwn9DRgOaBJsF/etIMdMcNhWGBMo58Mo1cxLInvCd0ZpvItju/AeDYFB/Od2pLiHB3VA==",
+      "dev": true,
       "requires": {
         "@types/geojson": "*"
       }
     },
-    "@types/leaflet.markercluster": {
-      "version": "1.4.5",
-      "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.4.5.tgz",
-      "integrity": "sha512-R9Ql//z6muSGI5mPfr+FaKQQB7EIdQQyivYweVSdOrWr8WyNNFcSwfl+mqGYJFhRRCO/6lbZiM3scEyp9LdaFg==",
-      "requires": {
-        "@types/leaflet": "*"
-      }
-    },
     "@types/minimatch": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@@ -21324,9 +21403,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.11.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz",
-      "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==",
+      "version": "16.11.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.4.tgz",
+      "integrity": "sha512-TMgXmy0v2xWyuCSCJM6NCna2snndD8yvQF67J29ipdzMcsPa9u+o0tjF5+EQNdhcuZplYuouYqpc4zcd5I6amQ==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -22260,15 +22339,15 @@
       }
     },
     "browserslist": {
-      "version": "4.17.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.4.tgz",
-      "integrity": "sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==",
+      "version": "4.17.5",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz",
+      "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001265",
-        "electron-to-chromium": "^1.3.867",
+        "caniuse-lite": "^1.0.30001271",
+        "electron-to-chromium": "^1.3.878",
         "escalade": "^3.1.1",
-        "node-releases": "^2.0.0",
+        "node-releases": "^2.0.1",
         "picocolors": "^1.0.0"
       }
     },
@@ -22409,9 +22488,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001270",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001270.tgz",
-      "integrity": "sha512-TcIC7AyNWXhcOmv2KftOl1ShFAaHQYcB/EPL/hEyMrcS7ZX0/DvV1aoy6BzV0+16wTpoAyTMGDNAJfSqS/rz7A==",
+      "version": "1.0.30001271",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001271.tgz",
+      "integrity": "sha512-BBruZFWmt3HFdVPS8kceTBIguKxu4f99n5JNp06OlPD/luoAMIaIK5ieV5YjnBLH3Nysai9sxj9rpJj4ZisXOA==",
       "dev": true
     },
     "canonical-path": {
@@ -22445,9 +22524,9 @@
       "dev": true
     },
     "chart.js": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.5.1.tgz",
-      "integrity": "sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.6.0.tgz",
+      "integrity": "sha512-iOzzDKePL+bj+ccIsVAgWQehCXv8xOKGbaU2fO/myivH736zcx535PGJzQGanvcSGVOqX6yuLZsN3ygcQ35UgQ=="
     },
     "chartjs-adapter-moment": {
       "version": "1.0.0",
@@ -22584,10 +22663,12 @@
       }
     },
     "clean-css": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
-      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
+      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "source-map": "~0.6.0"
       },
@@ -22596,7 +22677,9 @@
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         }
       }
     },
@@ -22712,7 +22795,9 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "dev": true
+      "dev": true,
+      "optional": true,
+      "peer": true
     },
     "commondir": {
       "version": "1.0.1",
@@ -23001,9 +23086,9 @@
           "dev": true
         },
         "postcss": {
-          "version": "8.3.10",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.10.tgz",
-          "integrity": "sha512-YYfvfUdWx+ECpr5Hgc6XRfsaux8LksL5ey8qTtWiuRXOpOF1YYMwAySdh0nSmwhZAFvvJ6rgiIkKVShu4x2T1Q==",
+          "version": "8.3.11",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+          "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
           "dev": true,
           "requires": {
             "nanoid": "^3.1.30",
@@ -23810,9 +23895,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.875",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.875.tgz",
-      "integrity": "sha512-K/rqxvLwZOshysgPOqfU1x8rfdFXyieYLdT1JYlLHkLj8gI/4Qh4Xi+KrO6kq4t3aNhp/wGSGOyR4ooYvXbvyg==",
+      "version": "1.3.878",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.878.tgz",
+      "integrity": "sha512-O6yxWCN9ph2AdspAIszBnd9v8s11hQx8ub9w4UGApzmNRnoKhbulOWqbO8THEQec/aEHtvy+donHZMlh6l1rbA==",
       "dev": true
     },
     "emoji-regex": {
@@ -25162,20 +25247,95 @@
       "dev": true
     },
     "html-loader": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-2.1.2.tgz",
-      "integrity": "sha512-XB4O1+6mpLp4qy/3qg5+1QPZ/uXvWtO64hNAX87sKHwcHkp1LJGU7V3sJ9iVmRACElAZXQ4YOO/Lbkx5kYfl9A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-3.0.0.tgz",
+      "integrity": "sha512-xcWiuZwxEs4Sh0D/I+KujHZtCdmA8hPS3nPp/bKXKO9zFouGTdgK8pt7nrh7tD2kIy1ND6OgOpXQUKa+xYIMmg==",
       "dev": true,
       "requires": {
-        "html-minifier-terser": "^5.1.1",
+        "html-minifier-terser": "^6.0.2",
         "parse5": "^6.0.1"
       },
       "dependencies": {
+        "clean-css": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
+          "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
+          "dev": true,
+          "requires": {
+            "source-map": "~0.6.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
+        },
+        "commander": {
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+          "dev": true
+        },
+        "html-minifier-terser": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.0.2.tgz",
+          "integrity": "sha512-AgYO3UGhMYQx2S/FBJT3EM0ZYcKmH6m9XL9c1v77BeK/tYJxGPxT1/AtsdUi4FcP8kZGmqqnItCcjFPcX9hk6A==",
+          "dev": true,
+          "requires": {
+            "camel-case": "^4.1.2",
+            "clean-css": "^5.1.5",
+            "commander": "^8.1.0",
+            "he": "^1.2.0",
+            "param-case": "^3.0.4",
+            "relateurl": "^0.2.7",
+            "terser": "^5.7.2"
+          }
+        },
         "parse5": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
           "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
           "dev": true
+        },
+        "source-map-support": {
+          "version": "0.5.20",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+          "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
+        },
+        "terser": {
+          "version": "5.9.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+          "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.7.2",
+            "source-map-support": "~0.5.20"
+          },
+          "dependencies": {
+            "commander": {
+              "version": "2.20.3",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+              "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+              "dev": true
+            }
+          }
         }
       }
     },
@@ -25184,6 +25344,8 @@
       "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
       "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
       "dev": true,
+      "optional": true,
+      "peer": true,
       "requires": {
         "camel-case": "^4.1.1",
         "clean-css": "^4.2.3",
@@ -25198,13 +25360,17 @@
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "dev": true,
+          "optional": true,
+          "peer": true
         },
         "terser": {
           "version": "4.8.0",
           "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
           "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
           "dev": true,
+          "optional": true,
+          "peer": true,
           "requires": {
             "commander": "^2.20.0",
             "source-map": "~0.6.1",
@@ -25215,7 +25381,9 @@
               "version": "2.20.3",
               "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
               "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-              "dev": true
+              "dev": true,
+              "optional": true,
+              "peer": true
             }
           }
         }
@@ -25235,9 +25403,9 @@
       },
       "dependencies": {
         "clean-css": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.1.tgz",
-          "integrity": "sha512-ooQCa1/70oRfVdUUGjKpbHuxgMgm8BsDT5EBqBGvPxMoRoGXf4PNx5mMnkjzJ9Ptx4vvmDdha0QVh86QtYIk1g==",
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz",
+          "integrity": "sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==",
           "dev": true,
           "requires": {
             "source-map": "~0.6.0"
@@ -25252,9 +25420,9 @@
           }
         },
         "commander": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz",
-          "integrity": "sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA==",
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
           "dev": true
         },
         "html-minifier-terser": {
@@ -26416,12 +26584,6 @@
       "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.7.1.tgz",
       "integrity": "sha512-/xwPEBidtg69Q3HlqPdU3DnrXQOvQU/CCHA1tcDQVzOwm91YMYaILjNp7L4Eaw5Z4sOYdbBz6koWyibppd8Zqw=="
     },
-    "leaflet.markercluster": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz",
-      "integrity": "sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==",
-      "requires": {}
-    },
     "less": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
@@ -26888,9 +27050,9 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.2.tgz",
-      "integrity": "sha512-ZmqShkn79D36uerdED+9qdo1ZYG8C1YsWvXu0UMJxurZnSdgz7gQKO2EGv8T55MhDqG3DYmGtizZNpM/UbTlcA==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.3.tgz",
+      "integrity": "sha512-zekavl9mZuGyk7COjsfFY/f655AX61EKE0AthXPrmDk+oZyjZ9WzO4WPjXnnO9xl8obK2kmM6rAQrBEmk+WK1g==",
       "dev": true,
       "requires": {
         "schema-utils": "^3.1.0"
@@ -27064,14 +27226,6 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
     },
-    "moment-timezone": {
-      "version": "0.5.33",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.33.tgz",
-      "integrity": "sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==",
-      "requires": {
-        "moment": ">= 2.9.0"
-      }
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -31448,9 +31602,9 @@
       }
     },
     "style-loader": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.0.tgz",
-      "integrity": "sha512-szANub7ksJtQioJYtpbWwh1hUl99uK15n5HDlikeCRil/zYMZgSxucHddyF/4A3qJMUiAjPhFowrrQuNMA7jwQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
+      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
       "dev": true,
       "requires": {}
     },
diff --git a/package.json b/package.json
index a91949f..ebe745f 100644
--- a/package.json
+++ b/package.json
@@ -24,12 +24,13 @@
     "@babel/plugin-proposal-decorators": "^7.14.5",
     "@babel/preset-env": "^7.14.8",
     "@babel/preset-typescript": "^7.14.5",
+    "@types/leaflet": "^1.7.5",
     "angular2-template-loader": "^0.6.2",
     "babel-loader": "^8.2.2",
     "css-loader": "^6.2.0",
     "dotenv": "^10.0.0",
     "file-loader": "^6.2.0",
-    "html-loader": "^2.1.2",
+    "html-loader": "^3.0.0",
     "html-webpack-plugin": "^5.3.2",
     "img-loader": "^4.0.0",
     "mini-css-extract-plugin": "^2.1.0",
@@ -54,14 +55,13 @@
     "@fortawesome/angular-fontawesome": "^0.9.0",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@helgoland/core": "^12.0.0-beta.1",
-    "@helgoland/map": "^12.0.1",
     "@ngx-translate/http-loader": "^6.0.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "bulma": "^0.9.3",
     "chart.js": "^3.5.1",
     "chartjs-adapter-moment": "^1.0.0",
     "chartjs-plugin-zoom": "^1.1.1",
+    "class-transformer": "^0.4.0",
     "core-js": "^3.16.0",
     "leaflet": "^1.7.1",
     "moment": "^2.29.1",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7b0158d..86fc05f 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -2,11 +2,6 @@ import { Component, VERSION, AfterViewInit } from "@angular/core";
 import '../styles.scss';
 // import '../../node_modules/leaflet/dist/leaflet.css';
 
-// import { ParameterFilter, Phenomenon, Station } from '@helgoland/core';
-// import { LayerOptions } from '@helgoland/map';
-// import { Marker, MapOptions, Control, icon, LatLngBoundsExpression } from 'leaflet';
-// // optional, to adapt leaflet markers
-
 // Marker.prototype.options.icon = icon({
 //     iconRetinaUrl: 'assets/img/marker-icon-2x.png',
 //     iconUrl: 'assets/img/marker-icon.png',
diff --git a/src/app/components/legend-entry/legend-entry.component.html b/src/app/components/legend-entry/legend-entry.component.html
index d976a33..0203326 100644
--- a/src/app/components/legend-entry/legend-entry.component.html
+++ b/src/app/components/legend-entry/legend-entry.component.html
@@ -37,8 +37,18 @@
             </div>
             <div class="legendicons">
                 <!-- <span class="fa" [ngClass]="{'fa-eye-slash': datasetOption?.visible, 'fa-eye': !datasetOption?.visible}" (click)="toggleVisibility(); $event.stopPropagation();"></span> -->
-                <fa-icon [icon]="datasetOption?.visible ? faEye : faEyeSlash"
-                    (click)="toggleVisibility(); $event.stopPropagation();"></fa-icon>
+                <!-- <fa-icon [icon]="datasetOption?.visible ? faEye : faEyeSlash"
+                    (click)="toggleVisibility(); $event.stopPropagation();"></fa-icon> -->
+
+                <label class="is-checkbox is-small is-info" (click)="$event.stopPropagation();">
+                    <input type="checkbox" [checked]="datasetOption.visible" (change)="toggleVisibility(); $event.stopPropagation();">
+                    <span>Visibility</span> 
+                 
+                    <span class="icon checkmark">
+                        <!-- <fa-icon [icon]="faCheck"></fa-icon> -->
+                        <fa-icon [icon]="datasetOption?.visible ? faCheck : faTimes"></fa-icon>
+                      </span>
+                    </label> 
             </div>
 
             <div class="collapseLegendEntry small-label">
diff --git a/src/app/components/legend-entry/legend-entry.component.ts b/src/app/components/legend-entry/legend-entry.component.ts
index 94efb29..5213540 100644
--- a/src/app/components/legend-entry/legend-entry.component.ts
+++ b/src/app/components/legend-entry/legend-entry.component.ts
@@ -6,8 +6,9 @@ import { TimeInterval } from '../../../shared/models/timespan';
 import { DatasetApiService } from '../../services/dataset-api.service';
 import { InternalIdHandler, InternalDatasetId } from '../../../common/components/services/internal-id-handler.service';
 import { DatasetOptions } from '../../../shared/models/options';
-import { faEye, faEyeSlash, faChevronRight } from '@fortawesome/free-solid-svg-icons';
+import { faEye, faEyeSlash, faCheck, faTimes, faChevronRight } from '@fortawesome/free-solid-svg-icons';
 import { FirstLastValue } from '../../../shared/models/dataset';
+import { GeoJSON } from 'leaflet';
 
 @Component({
     selector: 'geomon-legend-entry',
@@ -24,6 +25,8 @@ export class LegendEntryComponent {
     faEye = faEye;
     faEyeSlash = faEyeSlash;
     faChevronRight = faChevronRight;
+    faCheck = faCheck;
+    faTimes = faTimes;
 
     public firstValue: FirstLastValue;
     public lastValue: FirstLastValue;
diff --git a/src/app/views/map-view/map-view.component.ts b/src/app/views/map-view/map-view.component.ts
index 55f6232..9b30a87 100644
--- a/src/app/views/map-view/map-view.component.ts
+++ b/src/app/views/map-view/map-view.component.ts
@@ -1,8 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { ParameterFilter } from '@helgoland/core';
 import { GeomonPlatform } from './../../../shared/models/platform';
-// import { LayerOptions } from '@helgoland/map';
 import { LayerOptions } from '../../map/map-options';
 import { Marker, MapOptions, Control, icon, LatLngBoundsExpression } from 'leaflet';
 
@@ -55,9 +53,9 @@ export class MapViewComponent implements OnInit {
     public layerControlOptions: Control.LayersOptions = { position: 'bottomleft' };
     public cluster = false;
     public loadingStations: boolean;
-    public stationFilter: ParameterFilter = {
-        // phenomenon: '8'
-    };
+    // public stationFilter: ParameterFilter = {
+    //     // phenomenon: '8'
+    // };
     public statusIntervals = false;
     public mapOptions: MapOptions = {
         center: [48.208174, 16.373819],
diff --git a/src/common/components/components.module.ts b/src/common/components/components.module.ts
index 7d731d2..6b0b374 100644
--- a/src/common/components/components.module.ts
+++ b/src/common/components/components.module.ts
@@ -1,12 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-// import { HelgolandCoreModule } from '@helgoland/core';
-// import { HelgolandMapModule } from '@helgoland/map';
+
 import { LocateButtonComponent } from './locate-button/locate-button.component';
 import { ZoomControlComponent } from './zoom-control/zoom.component';
-// import { LocateService } from '@helgoland/map';
-// import { MapCache } from '@helgoland/map';
 import { MapService } from './services/map.service';
 import { LocateService } from './services/locate.service';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
diff --git a/src/general/checkbox.scss b/src/general/checkbox.scss
new file mode 100644
index 0000000..7370329
--- /dev/null
+++ b/src/general/checkbox.scss
@@ -0,0 +1,161 @@
+// These are here just for codepen compatibility
+$primary: hsl(171, 100%, 41%);
+$link: hsl(217, 71%, 53%);
+$info: #47cf73; // hsl(120,73%,75%);
+
+$success: hsl(141, 71%, 48%);
+$warning: hsl(48, 100%, 67%);
+$danger: hsl(348, 100%, 61%);
+$white: hsl(0, 0%, 100%);
+$black: hsl(0, 0%, 4%);
+$dark: hsl(0, 0%, 21%);
+$light: hsl(0, 0%, 96%);
+$text: $dark;
+$button-static-color: #7a7a7a !default;
+$button-static-background-color: #f5f5f5 !default;
+$button-static-border-color: #dbdbdb !default;
+$button-border-width: 1px !default;
+$button-padding-vertical: calc(0.375em - #{$button-border-width}) !default;
+$button-padding-horizontal: 0.75em !default;
+$radius-small: 3px;
+
+$size-small: 0.75rem;
+$size-medium: 1.25rem;
+$size-large: 1.5rem;
+
+@mixin button-small {
+    font-size: $size-small;
+}
+@mixin button-medium {
+    font-size: $size-medium;
+}
+@mixin button-large {
+    font-size: $size-large;
+}
+
+// Here starts the real code
+label.is-checkbox {
+    background: $link;
+    &.is-primary {
+        background: $grey-light;
+    }
+    &.is-info {
+        background: $info;
+    }
+    &.is-danger {
+        background: $danger;
+    }
+    &.is-warning {
+        background: $warning;
+        color: $text;
+        .checkmark:before {
+            background: rgba($light, 0.8);
+        }
+    }
+    &.is-success {
+        background: $success;
+    }
+    &.is-static {
+        background-color: $button-static-background-color;
+        border-color: $button-static-border-color;
+        color: $button-static-color;
+        box-shadow: none;
+        pointer-events: none;
+        .checkmark:before {
+            background: rgba($button-static-color, 0.3);
+        }
+    }
+    border: $button-border-width solid transparent;
+    color: $white;
+    text-align: center;
+    white-space: nowrap;
+    display: inline-flex;
+    justify-content: center;
+    // &.is-primary {
+    //   background: $primary;
+    // }
+    padding: $button-padding-vertical $button-padding-horizontal;
+    border-radius: $radius-small;
+    cursor: pointer;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    .checkmark {
+        color: inherit;
+        position: relative;
+        i {
+            z-index: 1;
+        }
+        &:before {
+            content: "";
+            position: absolute;
+            right: 0;
+            left: 0;
+            top: 0;
+            bottom: 0;
+            z-index: 0;
+            border-radius: $radius-small;
+            // background: rgba($dark, 0.3);
+            // border: 1px solid rgba($dark, 0.2);
+        }
+    }
+
+    input[type="checkbox"] {
+        position: absolute;
+        visibility: hidden;
+        cursor: pointer;
+        // &:checked ~ .checkmark {
+        //     color: inherit;
+        // }
+    }
+
+    &.is-rounded {
+        border-radius: 9999px;
+        .checkmark:before {
+            border-radius: 9999px;
+        }
+    }
+
+    &:hover {
+        box-shadow: inset 0px 0px 9999px rgba(black, 0.05);
+    }
+    &:active {
+        box-shadow: inset 0px 0px 9999px rgba(black, 0.1);
+    }
+    &.is-small {
+        @include button-small;
+    }
+    &.is-medium {
+        @include button-medium;
+    }
+    &.is-large {
+        @include button-large;
+    }
+
+    .icon {
+        &,
+        &.is-small,
+        &.is-medium,
+        &.is-large {
+            height: 1.5em;
+            width: 1.5em;
+            margin-left: -0.35em;
+            margin-right: 0.35em;
+        }
+
+        &:first-child:not(:last-child) {
+            margin-right: 0.1875em;
+            margin-left: calc(-01.375em - #{$button-border-width});
+        }
+        &:last-child:not(:first-child) {
+            margin-left: 0.1875em;
+
+            margin-right: calc(-0.375em - #{$button-border-width});
+        }
+        &:first-child:last-child {
+            margin-left: calc(-0.575em - #{$button-border-width});
+        }
+    }
+}
diff --git a/src/shared/models/platform.ts b/src/shared/models/platform.ts
index 2c67b7a..263d5ad 100644
--- a/src/shared/models/platform.ts
+++ b/src/shared/models/platform.ts
@@ -1,3 +1,5 @@
+import { GeoJSON } from 'leaflet';
+
 export class GeomonPlatform {
 
     constructor(
diff --git a/src/shared/models/station.ts b/src/shared/models/station.ts
index 51d90e2..26562d6 100644
--- a/src/shared/models/station.ts
+++ b/src/shared/models/station.ts
@@ -1,4 +1,4 @@
-
+import { GeoJSON } from 'leaflet';
 
 export interface Station {
     id: string;
diff --git a/src/styles.scss b/src/styles.scss
index 020b7c7..de33c18 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -21,7 +21,7 @@
 // 1. Import the initial variables
 @import "~bulma/sass/utilities/_all.sass";
 
-
+@import './general/checkbox.scss';
 
 // 2. Set your own initial (brand) variables
 // Update the blue shade, used for links
@@ -36,12 +36,13 @@ $beige-lighter: #EFF0EB;
 $mouse-grey: #6c6e6b;
 $select-green: #03a678;
 
+
 // Update Bulma's global variables
 // Update the sans-serif font family
 $family-sans-serif: "Roboto", sans-serif;
 
 // 3. Set the derived variables
-$grey-dark: $brown;
+// $grey-dark: $brown;
 $is-dark: $mouse-grey;
 // $grey-light: $beige-light;
 // $primary: $purple;
@@ -153,6 +154,7 @@ ul {
 @import "~bulma/sass/elements/box.sass";
 @import "~bulma/sass/elements/button.sass";
 @import "~bulma/sass/elements/container.sass";
+@import "~bulma/sass/elements/content.sass";
 @import "~bulma/sass/elements/title.sass";
 @import "~bulma/sass/elements/icon.sass";
 @import "~bulma/sass/form/_all.sass";