diff --git a/assets/themes/velopark/velopark.json b/assets/themes/velopark/velopark.json
index 1adabe369..ac28f1404 100644
--- a/assets/themes/velopark/velopark.json
+++ b/assets/themes/velopark/velopark.json
@@ -1,4 +1,5 @@
 {
+
   "id": "velopark",
   "title": {
     "en": "Velopark to OpenStreetMap synchronisation tool",
@@ -26,7 +27,7 @@
   "defaultBackgroundId": "photo",
   "hideFromOverview": true,
   "layers": [
-    {
+     {
       "id": "velopark_maproulette",
       "description": "Maproulette challenge containing velopark data",
       "source": {
@@ -34,7 +35,7 @@
         "geoJson": "https://maproulette.org/api/v2/challenge/view/43282"
       },
       "title": {
-        "render": "Velopark parking <b>{mr_velopark_id}</b>"
+        "render": "Velopark parking <span class='literal-code'>{mr_velopark_id}</span>"
       },
       "name": {
         "en": "Velopark data",
@@ -47,19 +48,6 @@
         }
       ],
       "tagRenderings": [
-        {
-          "id": "Explanation",
-          "render": {
-            "en": "This is data from <b>Velopark</b>. ",
-            "nl": "Dit datapunt komt van <b>Velopark</b>"
-          }
-        },
-        {
-          "id": "velopark-id-display",
-          "render": {
-            "*": "<span class='literal-code'>{ref:velopark}</span>"
-          }
-        },
         {
           "id": "velopark-link",
           "render": {
@@ -70,9 +58,14 @@
                 "en": "See on velopark (webpage)",
                 "nl": "Bekijk op Velopark (webpagina)"
               }
+            },
+            "before": {
+              "en": "This is data from <b>Velopark</b>. ",
+              "nl": "Dit datapunt komt van <b>Velopark</b>"
             }
           }
         },
+
         {
           "id": "login",
           "render": {
@@ -84,8 +77,8 @@
         {
           "id": "closest_parkings",
           "render": {
-            "en": "There are {_nearby_bicycle_parkings:count} bicycle parkings within 25m known in OpenStreetMap. ",
-            "nl": "Er zijn {_nearby_bicycle_parkings:count} fietsparkings gekend binnen 25m in OpenStreetMap. "
+            "en": "<h3>Nearby parkings</h3>There are {_nearby_bicycle_parkings:count} bicycle parkings within 25m known in OpenStreetMap.",
+            "nl": "<h3>Parkings in de buurt</h3>Er zijn {_nearby_bicycle_parkings:count} fietsparkings gekend binnen 25m in OpenStreetMap."
           }
         },
         {
@@ -103,6 +96,13 @@
             }
           }
         },
+        {
+          "id": "title_create_new",
+          "render": {
+            "en": "<h3>Add a parking to OpenStreetMap</h3>Use this if the bicycle parking is missing in OpenStreetMap (there is no blue or green pin)",
+            "nl": "<h3>Parking toevoegen aan OpenStreetMap</h3>Gebruik dit als er nog geen blauwe of groene parkeerplaats-pin staat op de juiste plaats."
+          }
+        },
         {
           "id": "import_point",
           "render": {
@@ -118,6 +118,13 @@
             }
           }
         },
+        {
+          "id": "title_manually_copy",
+          "render": {
+            "en": "<h3>Manually link</h3>Does the bicycle parking exist in OpenStreetMap but is it further then 25m away? Then: <ol><li>Copy the following URL: <span class='literal-code'>{ref:velopark}</span></li><li>Select the correct bicycle parking on the map</li><li>Paste the URL into the question <i>What is the URL of the data path in Velopark?</i></li><li>Mark this item as handled with the button below:</li></ul>",
+            "nl": "<h3>Manueel linken</h3>"
+          }
+        },
         {
           "id": "close_mr",
           "render": {
@@ -131,6 +138,14 @@
             }
           }
         },
+        {
+          "id": "title_error",
+          "render": {
+            "en": "<h3>Closing without importing or linking</h3>",
+            "nl": "<h3>Afsluiten zonder importeren of linken</h3>"
+
+          }
+        },
         {
           "id": "close_mr_incorrect",
           "render": {
@@ -149,8 +164,14 @@
             }
           }
         },
-        "{nearby_images(open,readonly)}",
         {
+          "id": "title_debug",
+          "render": {
+            "en": "<h3>Extra information</h3>",
+            "nl": "<h3>Extra informatie</h3>"
+          }
+        },
+         {
           "id": "show-data-velopark",
           "render": {
             "special": {
@@ -171,7 +192,8 @@
               "text": "Inspect raw data on velopark.be"
             }
           }
-        }
+        },
+        "{nearby_images(open,readonly)}"
       ],
       "lineRendering": [],
       "filter": [
@@ -241,6 +263,7 @@
       "builtin": [
         "bike_parking"
       ],
+      "hideTagRenderingsWithLabels": ["images","leftover-questions"],
       "override": {
         "id": "bike_parking_with_velopark_ref",
         "=presets": [],
@@ -294,6 +317,10 @@
               }
             ]
           }
+        ],
+        "+tagRenderings": ["questions"],
+        "tagRenderings+": [
+          "images"
         ]
       }
     },
@@ -301,9 +328,14 @@
       "builtin": [
         "bike_parking"
       ],
+      "hideTagRenderingsWithLabels": ["images","leftover-questions"],
       "override": {
         "doCount": false,
-        "minzoom": 14
+        "minzoom": 14,
+        "+tagRenderings": ["questions"],
+        "tagRenderings+": [
+          "images"
+        ]
       }
     },
     {
@@ -312,13 +344,16 @@
         "bike_repair_station",
         "bicycle_rental"
       ],
+      "hideTagRenderingsWithLabels": ["leftover-questions"],
       "override": {
+        "+tagRenderings": ["questions"],
         "doCount": false,
         "minzoom": 18
       }
     }
   ],
   "overrideAll": {
+    "popupInFloatover": "title",
     "+tagRenderings": [
       {
         "id": "velopark-ref",
@@ -340,11 +375,16 @@
           "path": "./assets/themes/velopark/velopark.svg",
           "class": "medium"
         },
+        "classes": "flex w-full ",
         "render": {
           "special": {
             "type": "link",
             "href": "{ref:velopark}",
             "text": "{ref:velopark}"
+          },
+          "before": {
+            "en": "This bicycle parking is on OpenStreetMap and is linked to Velopark:",
+            "nl": "Deze fietsenstalling staat op OpenStreetMap en is gelinkt naar Velopark:"
           }
         }
       },