diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index e20cde9583..9c9aa44714 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -151,8 +151,8 @@
           "if": "socket:schuko=1",
           "ifnot": "socket:schuko=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</p></div>"
           }
         },
         {
@@ -163,8 +163,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</p></div>"
           },
           "hideInAnswer": true
         },
@@ -172,8 +172,8 @@
           "if": "socket:typee=1",
           "ifnot": "socket:typee=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>Europese stekker</b> met aardingspin (CEE7/4 type E)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>European wall plug</b> with ground pin (CEE7/4 type E)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>Europese stekker</b> met aardingspin (CEE7/4 type E)</p></div>"
           }
         },
         {
@@ -184,8 +184,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>Europese stekker</b> met aardingspin (CEE7/4 type E)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>European wall plug</b> with ground pin (CEE7/4 type E)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>Europese stekker</b> met aardingspin (CEE7/4 type E)</p></div>"
           },
           "hideInAnswer": true
         },
@@ -193,8 +193,8 @@
           "if": "socket:chademo=1",
           "ifnot": "socket:chademo=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p><b>Chademo</b></p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p> </p></div>"
           }
         },
         {
@@ -205,8 +205,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p><b>Chademo</b></p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p> </p></div>"
           },
           "hideInAnswer": true
         },
@@ -214,8 +214,8 @@
           "if": "socket:type1_cable=1",
           "ifnot": "socket:type1_cable=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 met kabel</b> (J1772)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 with cable</b> (J1772)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 met kabel</b> (J1772)</p></div>"
           }
         },
         {
@@ -226,8 +226,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 met kabel</b> (J1772)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 with cable</b> (J1772)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 met kabel</b> (J1772)</p></div>"
           },
           "hideInAnswer": true
         },
@@ -235,8 +235,8 @@
           "if": "socket:type1=1",
           "ifnot": "socket:type1=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>zonder</i> kabel</b> (J1772)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>without</i> cable</b> (J1772)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>zonder</i> kabel</b> (J1772)</p></div>"
           }
         },
         {
@@ -247,8 +247,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>zonder</i> kabel</b> (J1772)"
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>without</i> cable</b> (J1772)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>zonder</i> kabel</b> (J1772)</p></div>"
           },
           "hideInAnswer": true
         },
@@ -256,8 +256,8 @@
           "if": "socket:type1_combo=1",
           "ifnot": "socket:type1_combo=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p><b>Type 1 CCS</b> (aka Type 1 Combo)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p> </p></div>"
           }
         },
         {
@@ -268,8 +268,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p><b>Type 1 CCS</b> (aka Type 1 Combo)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p> </p></div>"
           },
           "hideInAnswer": true
         },
@@ -277,8 +277,8 @@
           "if": "socket:tesla_supercharger=1",
           "ifnot": "socket:tesla_supercharger=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p><b>Tesla Supercharger</b></p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p> </p></div>"
           }
         },
         {
@@ -289,8 +289,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p><b>Tesla Supercharger</b></p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p> </p></div>"
           },
           "hideInAnswer": true
         },
@@ -298,8 +298,8 @@
           "if": "socket:type2=1",
           "ifnot": "socket:type2=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p><b>Type 2</b> (mennekes)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p> </p></div>"
           }
         },
         {
@@ -310,8 +310,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p><b>Type 2</b> (mennekes)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p> </p></div>"
           },
           "hideInAnswer": true
         },
@@ -319,8 +319,8 @@
           "if": "socket:type2_combo=1",
           "ifnot": "socket:type2_combo=",
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p><b>Type 2 CCS</b> (mennekes)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p> </p></div>"
           }
         },
         {
@@ -331,8 +331,8 @@
             ]
           },
           "then": {
-            "en": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)",
-            "nl": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> "
+            "en": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p><b>Type 2 CCS</b> (mennekes)</p></div>",
+            "nl": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p> </p></div>"
           },
           "hideInAnswer": true
         }
@@ -561,11 +561,11 @@
     },
     {
       "question": {
-        "en": "How much plugs of type <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> are available here?",
+        "en": "How much plugs of type <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> are available here?",
         "nl": "Hoeveel stekkers van type  <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> heeft dit oplaadpunt?"
       },
       "render": {
-        "en": "There are <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> plugs of type <b>Chademo</b> available here",
+        "en": "There are <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> plugs of type <b>Chademo</b> available here",
         "nl": "Hier zijn <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> stekkers van het type "
       },
       "freeform": {
@@ -581,11 +581,11 @@
     },
     {
       "question": {
-        "en": "What voltage do the plugs with <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
+        "en": "What voltage do the plugs with <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
         "nl": "Welke spanning levert de stekker van type <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/>"
       },
       "render": {
-        "en": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs {socket:chademo:voltage} volt",
+        "en": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs {socket:chademo:voltage} volt",
         "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> heeft een spanning van {socket:chademo:voltage} volt"
       },
       "freeform": {
@@ -596,7 +596,7 @@
         {
           "if": "socket:socket:chademo:voltage=500 V",
           "then": {
-            "en": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs 500 volt",
+            "en": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs 500 volt",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> heeft een spanning van 500 volt"
           }
         }
@@ -610,11 +610,11 @@
     },
     {
       "question": {
-        "en": "What current do the plugs with <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
+        "en": "What current do the plugs with <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
         "nl": "Welke stroom levert de stekker van type <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/>?"
       },
       "render": {
-        "en": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:current}A",
+        "en": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:current}A",
         "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> levert een stroom van maximaal {socket:chademo:current}A"
       },
       "freeform": {
@@ -625,7 +625,7 @@
         {
           "if": "socket:socket:chademo:current=120 A",
           "then": {
-            "en": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 120 A",
+            "en": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 120 A",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> levert een stroom van maximaal 120 A"
           }
         }
@@ -639,11 +639,11 @@
     },
     {
       "question": {
-        "en": "What power output does a single plug of type <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
+        "en": "What power output does a single plug of type <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
         "nl": "Welk vermogen levert een enkele stekker van type <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/>?"
       },
       "render": {
-        "en": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:output}",
+        "en": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:output}",
         "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> levert een vermogen van maximaal {socket:chademo:output}"
       },
       "freeform": {
@@ -654,7 +654,7 @@
         {
           "if": "socket:socket:chademo:output=50 kw",
           "then": {
-            "en": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 50 kw",
+            "en": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 50 kw",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> levert een vermogen van maximaal 50 kw"
           }
         }
@@ -1066,11 +1066,11 @@
     },
     {
       "question": {
-        "en": "How much plugs of type <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> are available here?",
+        "en": "How much plugs of type <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> are available here?",
         "nl": "Hoeveel stekkers van type  <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> heeft dit oplaadpunt?"
       },
       "render": {
-        "en": "There are <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> plugs of type <b>Tesla Supercharger</b> available here",
+        "en": "There are <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> plugs of type <b>Tesla Supercharger</b> available here",
         "nl": "Hier zijn <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> stekkers van het type "
       },
       "freeform": {
@@ -1086,11 +1086,11 @@
     },
     {
       "question": {
-        "en": "What voltage do the plugs with <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
+        "en": "What voltage do the plugs with <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
         "nl": "Welke spanning levert de stekker van type <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/>"
       },
       "render": {
-        "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs {socket:tesla_supercharger:voltage} volt",
+        "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs {socket:tesla_supercharger:voltage} volt",
         "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> heeft een spanning van {socket:tesla_supercharger:voltage} volt"
       },
       "freeform": {
@@ -1101,7 +1101,7 @@
         {
           "if": "socket:socket:tesla_supercharger:voltage=480 V",
           "then": {
-            "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs 480 volt",
+            "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs 480 volt",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> heeft een spanning van 480 volt"
           }
         }
@@ -1115,11 +1115,11 @@
     },
     {
       "question": {
-        "en": "What current do the plugs with <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
+        "en": "What current do the plugs with <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
         "nl": "Welke stroom levert de stekker van type <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/>?"
       },
       "render": {
-        "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:current}A",
+        "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:current}A",
         "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> levert een stroom van maximaal {socket:tesla_supercharger:current}A"
       },
       "freeform": {
@@ -1130,14 +1130,14 @@
         {
           "if": "socket:socket:tesla_supercharger:current=125 A",
           "then": {
-            "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 125 A",
+            "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 125 A",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> levert een stroom van maximaal 125 A"
           }
         },
         {
           "if": "socket:socket:tesla_supercharger:current=350 A",
           "then": {
-            "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 350 A",
+            "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 350 A",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> levert een stroom van maximaal 350 A"
           }
         }
@@ -1151,11 +1151,11 @@
     },
     {
       "question": {
-        "en": "What power output does a single plug of type <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
+        "en": "What power output does a single plug of type <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
         "nl": "Welk vermogen levert een enkele stekker van type <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/>?"
       },
       "render": {
-        "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:output}",
+        "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:output}",
         "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> levert een vermogen van maximaal {socket:tesla_supercharger:output}"
       },
       "freeform": {
@@ -1166,21 +1166,21 @@
         {
           "if": "socket:socket:tesla_supercharger:output=120 kw",
           "then": {
-            "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 120 kw",
+            "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 120 kw",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> levert een vermogen van maximaal 120 kw"
           }
         },
         {
           "if": "socket:socket:tesla_supercharger:output=150 kw",
           "then": {
-            "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 150 kw",
+            "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 150 kw",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> levert een vermogen van maximaal 150 kw"
           }
         },
         {
           "if": "socket:socket:tesla_supercharger:output=250 kw",
           "then": {
-            "en": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 250 kw",
+            "en": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 250 kw",
             "nl": "<b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> levert een vermogen van maximaal 250 kw"
           }
         }
@@ -1970,7 +1970,7 @@
         },
         {
           "question": {
-            "en": "Has a <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> connector",
+            "en": "Has a <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> connector",
             "nl": "Heeft een <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/>"
           },
           "osmTags": "socket:chademo~*"
@@ -1998,7 +1998,7 @@
         },
         {
           "question": {
-            "en": "Has a <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> connector",
+            "en": "Has a <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> connector",
             "nl": "Heeft een <b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/>"
           },
           "osmTags": "socket:tesla_supercharger~*"
@@ -2180,4 +2180,4 @@
       "eraseInvalidValues": true
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/css/index-tailwind-output.css b/css/index-tailwind-output.css
index 1f7b87e18f..a4f2972838 100644
--- a/css/index-tailwind-output.css
+++ b/css/index-tailwind-output.css
@@ -912,6 +912,10 @@ video {
   margin-right: 0px;
 }
 
+.mb-1 {
+  margin-bottom: 0.25rem;
+}
+
 .mb-4 {
   margin-bottom: 1rem;
 }
@@ -1152,14 +1156,14 @@ video {
           animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
 }
 
-.cursor-wait {
-  cursor: wait;
-}
-
 .cursor-pointer {
   cursor: pointer;
 }
 
+.cursor-wait {
+  cursor: wait;
+}
+
 .resize {
   resize: both;
 }
diff --git a/langs/layers/en.json b/langs/layers/en.json
index a6472bf0f0..3a55d9b00c 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -903,7 +903,7 @@
                         "question": "Has a <b><b>European wall plug</b> with ground pin (CEE7/4 type E)</b> <img style='width:1rem;' src='./assets/layers/charging_station/TypeE.svg'/> connector"
                     },
                     "3": {
-                        "question": "Has a <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> connector"
+                        "question": "Has a <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> connector"
                     },
                     "4": {
                         "question": "Has a <b><b>Type 1 with cable</b> (J1772)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type1_J1772.svg'/> connector"
@@ -915,7 +915,7 @@
                         "question": "Has a <b><b>Type 1 CCS</b> (aka Type 1 Combo)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type1-ccs.svg'/> connector"
                     },
                     "7": {
-                        "question": "Has a <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> connector"
+                        "question": "Has a <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> connector"
                     },
                     "8": {
                         "question": "Has a <b><b>Type 2</b> (mennekes)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type2_socket.svg'/> connector"
@@ -960,58 +960,58 @@
             "4": {
                 "mappings": {
                     "0": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</p></div>"
                     },
                     "1": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko wall plug</b> without ground pin (CEE7/4 type F)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko wall plug</b> without ground pin (CEE7/4 type F)</p></div>"
                     },
                     "2": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>European wall plug</b> with ground pin (CEE7/4 type E)</p></div>"
                     },
                     "3": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>European wall plug</b> with ground pin (CEE7/4 type E)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>European wall plug</b> with ground pin (CEE7/4 type E)</p></div>"
                     },
                     "4": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p><b>Chademo</b></p></div>"
                     },
                     "5": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> <b>Chademo</b>"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p><b>Chademo</b></p></div>"
                     },
                     "6": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 with cable</b> (J1772)</p></div>"
                     },
                     "7": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 with cable</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 with cable</b> (J1772)</p></div>"
                     },
                     "8": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>without</i> cable</b> (J1772)</p></div>"
                     },
                     "9": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>without</i> cable</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>without</i> cable</b> (J1772)</p></div>"
                     },
                     "10": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p><b>Type 1 CCS</b> (aka Type 1 Combo)</p></div>"
                     },
                     "11": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> <b>Type 1 CCS</b> (aka Type 1 Combo)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p><b>Type 1 CCS</b> (aka Type 1 Combo)</p></div>"
                     },
                     "12": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p><b>Tesla Supercharger</b></p></div>"
                     },
                     "13": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> <b>Tesla Supercharger</b>"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p><b>Tesla Supercharger</b></p></div>"
                     },
                     "14": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p><b>Type 2</b> (mennekes)</p></div>"
                     },
                     "15": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> <b>Type 2</b> (mennekes)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p><b>Type 2</b> (mennekes)</p></div>"
                     },
                     "16": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p><b>Type 2 CCS</b> (mennekes)</p></div>"
                     },
                     "17": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> <b>Type 2 CCS</b> (mennekes)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p><b>Type 2 CCS</b> (mennekes)</p></div>"
                     }
                 },
                 "question": "Which charging stations are available here?"
@@ -1082,35 +1082,35 @@
                 "render": "<b><b>European wall plug</b> with ground pin (CEE7/4 type E)</b> <img style='width:1rem;' src='./assets/layers/charging_station/TypeE.svg'/> outputs at most {socket:typee:output}"
             },
             "13": {
-                "question": "How much plugs of type <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> are available here?",
-                "render": "There are <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> plugs of type <b>Chademo</b> available here"
+                "question": "How much plugs of type <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> are available here?",
+                "render": "There are <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> plugs of type <b>Chademo</b> available here"
             },
             "14": {
                 "mappings": {
                     "0": {
-                        "then": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs 500 volt"
+                        "then": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs 500 volt"
                     }
                 },
-                "question": "What voltage do the plugs with <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
-                "render": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs {socket:chademo:voltage} volt"
+                "question": "What voltage do the plugs with <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
+                "render": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs {socket:chademo:voltage} volt"
             },
             "15": {
                 "mappings": {
                     "0": {
-                        "then": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 120 A"
+                        "then": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 120 A"
                     }
                 },
-                "question": "What current do the plugs with <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
-                "render": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:current}A"
+                "question": "What current do the plugs with <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
+                "render": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:current}A"
             },
             "16": {
                 "mappings": {
                     "0": {
-                        "then": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 50 kw"
+                        "then": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most 50 kw"
                     }
                 },
-                "question": "What power output does a single plug of type <b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
-                "render": "<b><b>Chademo</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:output}"
+                "question": "What power output does a single plug of type <b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> offer?",
+                "render": "<b>Chademo</b> <img style='width:1rem;' src='./assets/layers/charging_station/Chademo_type4.svg'/> outputs at most {socket:chademo:output}"
             },
             "17": {
                 "question": "How much plugs of type <b><b>Type 1 with cable</b> (J1772)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type1_J1772.svg'/> are available here?",
@@ -1239,44 +1239,44 @@
                 "render": "<b><b>Type 1 CCS</b> (aka Type 1 Combo)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type1-ccs.svg'/> outputs at most {socket:type1_combo:output}"
             },
             "29": {
-                "question": "How much plugs of type <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> are available here?",
-                "render": "There are <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> plugs of type <b>Tesla Supercharger</b> available here"
+                "question": "How much plugs of type <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> are available here?",
+                "render": "There are <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> plugs of type <b>Tesla Supercharger</b> available here"
             },
             "30": {
                 "mappings": {
                     "0": {
-                        "then": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs 480 volt"
+                        "then": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs 480 volt"
                     }
                 },
-                "question": "What voltage do the plugs with <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
-                "render": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs {socket:tesla_supercharger:voltage} volt"
+                "question": "What voltage do the plugs with <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
+                "render": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs {socket:tesla_supercharger:voltage} volt"
             },
             "31": {
                 "mappings": {
                     "0": {
-                        "then": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 125 A"
+                        "then": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 125 A"
                     },
                     "1": {
-                        "then": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 350 A"
+                        "then": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 350 A"
                     }
                 },
-                "question": "What current do the plugs with <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
-                "render": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:current}A"
+                "question": "What current do the plugs with <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
+                "render": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:current}A"
             },
             "32": {
                 "mappings": {
                     "0": {
-                        "then": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 120 kw"
+                        "then": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 120 kw"
                     },
                     "1": {
-                        "then": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 150 kw"
+                        "then": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 150 kw"
                     },
                     "2": {
-                        "then": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 250 kw"
+                        "then": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most 250 kw"
                     }
                 },
-                "question": "What power output does a single plug of type <b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
-                "render": "<b><b>Tesla Supercharger</b></b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:output}"
+                "question": "What power output does a single plug of type <b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> offer?",
+                "render": "<b>Tesla Supercharger</b> <img style='width:1rem;' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> outputs at most {socket:tesla_supercharger:output}"
             },
             "33": {
                 "question": "How much plugs of type <b><b>Type 2</b> (mennekes)</b> <img style='width:1rem;' src='./assets/layers/charging_station/Type2_socket.svg'/> are available here?",
@@ -3383,4 +3383,4 @@
     "watermill": {
         "name": "Watermill"
     }
-}
+}
\ No newline at end of file
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index a4be84c4f4..97668f8abd 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1036,58 +1036,58 @@
             "4": {
                 "mappings": {
                     "0": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</p></div>"
                     },
                     "1": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/CEE7_4F.svg'/> <b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/CEE7_4F.svg'/><p><b>Schuko stekker</b> zonder aardingspin (CEE7/4 type F)</p></div>"
                     },
                     "2": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>Europese stekker</b> met aardingspin (CEE7/4 type E)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>Europese stekker</b> met aardingspin (CEE7/4 type E)</p></div>"
                     },
                     "3": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/TypeE.svg'/> <b>Europese stekker</b> met aardingspin (CEE7/4 type E)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/TypeE.svg'/><p><b>Europese stekker</b> met aardingspin (CEE7/4 type E)</p></div>"
                     },
                     "4": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p> </p></div>"
                     },
                     "5": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Chademo_type4.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Chademo_type4.svg'/><p> </p></div>"
                     },
                     "6": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 met kabel</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 met kabel</b> (J1772)</p></div>"
                     },
                     "7": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 met kabel</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 met kabel</b> (J1772)</p></div>"
                     },
                     "8": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>zonder</i> kabel</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>zonder</i> kabel</b> (J1772)</p></div>"
                     },
                     "9": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1_J1772.svg'/> <b>Type 1 <i>zonder</i> kabel</b> (J1772)"
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1_J1772.svg'/><p><b>Type 1 <i>zonder</i> kabel</b> (J1772)</p></div>"
                     },
                     "10": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p> </p></div>"
                     },
                     "11": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type1-ccs.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type1-ccs.svg'/><p> </p></div>"
                     },
                     "12": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p> </p></div>"
                     },
                     "13": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Tesla-hpwc-model-s.svg'/><p> </p></div>"
                     },
                     "14": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p> </p></div>"
                     },
                     "15": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_socket.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_socket.svg'/><p> </p></div>"
                     },
                     "16": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p> </p></div>"
                     },
                     "17": {
-                        "then": "<img class='w-12 mx-4' src='./assets/layers/charging_station/Type2_CCS.svg'/> "
+                        "then": "<div class='flex gap-4'><img class='w-12' src='./assets/layers/charging_station/Type2_CCS.svg'/><p> </p></div>"
                     }
                 }
             },
@@ -3781,4 +3781,4 @@
             "render": "Watermolens"
         }
     }
-}
+}
\ No newline at end of file