diff --git a/templates/public/edit.html.twig b/templates/public/edit.html.twig
index 6f3868b..52a0cc0 100644
--- a/templates/public/edit.html.twig
+++ b/templates/public/edit.html.twig
@@ -8,6 +8,13 @@
 
         <div class="card shadow-sm">
             <div class="card-body">
+
+
+                <fieldset class="d-none">
+                            <pre>
+                                {{ dump(commerce_overpass.tags_converted )}}
+                            </pre>
+                </fieldset>
                 <h1 class="card-title h2 mb-4">
                     {{ 'display.welcome'|trans }}
                     {% set main_tag = commerce.mainTag is defined and commerce.mainTag is not empty ? commerce.mainTag : (commerce_overpass.tags_converted.main_tag is defined ? commerce_overpass.tags_converted.main_tag : null) %}
@@ -19,31 +26,41 @@
                 <div id="map" style="height: 400px; width: 100%;" class="rounded mb-4"></div>
 
                 {% if commerce_overpass is not empty %}
-                    <pre>
-    {% if commerce_overpass.tags_converted is defined %}
-        {{ commerce_overpass.tags_converted |json_encode }}
-    {% endif %}
-    </pre>
 
                     <form action="{{ path('app_public_submit', {'osm_object_id': commerce_overpass['@attributes'].id, 'version': commerce_overpass['@attributes'].version, 'changesetID': commerce_overpass['@attributes'].changeset }) }}"
                           method="post" class="needs-validation">
-                        {% include 'public/edit/address.html.twig' %}
-                        <input type="hidden" name="osm_kind" value="{{ osm_kind }}">
 
-                        <div class="row g-3 mb-4">
+                        <div id="main_name" class="row g-3 mb-4">
                             <div class="col-12 col-md-4">
                                 <label for="commerce_tag_value__name"
                                        class="form-label">{{ 'display.keys.name'|trans }}</label>
                             </div>
                             <div class="col-12 col-md-8">
-                                <input type="text" class="form-control" name="commerce_tag_value__name"
-                                       value="{% if commerce_overpass.tags_converted.name is defined %}{{ commerce_overpass.tags_converted.name }}{% elseif commerce_overpass['@attributes'].name is defined %}{{ commerce_overpass['@attributes'].name }}{% endif %}">
+                                <input type="text" class="form-control"
+                                       name="commerce_tag_value__name"
+                                       value="{% if commerce_overpass.tags_converted.name is defined %}{{ commerce_overpass.tags_converted.name }}{% endif %}">
+
                             </div>
                         </div>
 
+                        {% include 'public/edit/address.html.twig' %}
+                        <input type="hidden" name="osm_kind" value="{{ osm_kind }}">
+                        <fieldset class="input-group mb-2 phone-group">
 
-                        <div id="images" class="d-none">
-                        </div>
+
+                            <div class="input-group mb-2">
+                <span class="input-group-text" style="width: 10rem;">
+                    <i class="bi bi-phone me-2"></i>
+                    Téléphone
+                                    </span>
+                                <input type="text" class="form-control"
+                                       id="commerce_tag_value__contact:phone"
+                                       name="commerce_tag_value__contact:phone"
+                                       value="{{ commerce_overpass.tags_converted['contact:phone'] ?? '' }}"
+                                       placeholder="+33 1 23 45 67 89">
+                            </div>
+
+                        </fieldset>
                         <div id="images">
                             {% if commerce_overpass.tags_converted.image is defined and commerce_overpass.tags_converted.image|length > 0 %}
                                 <img class="img-fluid img-thumbnail mb-3" style="height: 500px; width: auto;"
@@ -81,8 +98,6 @@
                             {% include 'public/edit/restaurant.html.twig' %}
                         {% endif %}
 
-
-
                         {% if hide_filled_inputs and  (commerce_overpass.tags_converted.opening_hours) is defined and commerce_overpass.tags_converted.opening_hours is empty %}
                             <span class="deja-rempli d-none">
                                    opening_hours {{ 'display.already_filled'|trans }}
@@ -98,7 +113,7 @@
                                 </span>
 
                         {% endif %}
-                        {% include 'public/edit/wheelchair.html.twig' %}
+
 
                         {% if hide_filled_inputs and (commerce_overpass.tags_converted.ask_angela) is defined and commerce_overpass.tags_converted.ask_angela is not empty %}
                             <span class="deja-rempli d-none ">
@@ -106,26 +121,11 @@
                                 </span>
                         {% endif %}
                         {% include 'public/edit/ask_angela.html.twig' %}
-
-                        <fieldset class="input-group mb-2 phone-group">
+                        {% include 'public/edit/wheelchair.html.twig' %}
 
 
-                            <div class="input-group mb-2">
-                <span class="input-group-text" style="width: 10rem;">
-                    <i class="bi bi-phone me-2"></i>
-                    Téléphone
-                                    </span>
-                                <input type="text" class="form-control"
-                                       id="commerce_tag_value__contact:phone"
-                                       name="commerce_tag_value__contact:phone"
-                                       value="{{ commerce_overpass.tags_converted['contact:phone'] ?? '' }}"
-                                       placeholder="+33 1 23 45 67 89">
-                            </div>
-
-                        </fieldset>
 
                         {% include 'public/edit/social_media.html.twig' %}
-                        {% include 'public/edit/wheelchair.html.twig' %}
 
                         {% include 'public/edit/tags.html.twig' %}
 
@@ -191,8 +191,9 @@
                             <a href="https://www.openstreetmap.org/{{ commerce.osmKind }}/{{ commerce_overpass['@attributes'].id }}"
                                class="btn btn-outline-secondary">
                                 <i class="bi bi-globe"></i> {{ 'display.view_on_osm'|trans }}
-                                <img src="{{ asset('img/logo-osm.png') }}" alt="OpenStreetMap"
-                                     class="img-fluid thumbnail">
+                                <i class="bi bi-map"></i>
+{#                                <img src="{{ asset('img/logo-osm.png') }}" alt="logo OpenStreetMap"#}
+{#                                     class="img-fluid thumbnail">#}
                             </a>
                             <button onclick="openInJOSM('{{ commerce.osmKind }}', '{{ commerce_overpass['@attributes'].id }}')"
                                     title="Ouvrir dans JOSM"
diff --git a/templates/public/edit/wheelchair.html.twig b/templates/public/edit/wheelchair.html.twig
index 86c3158..a78552b 100644
--- a/templates/public/edit/wheelchair.html.twig
+++ b/templates/public/edit/wheelchair.html.twig
@@ -1,4 +1,5 @@
 <div id="wheelchair" class="d-none mt-4">
+    wheeeeeeeeeeeeeeeeel
     <h2><i class="bi bi-person-wheelchair"></i> {{ 'display.wheelchair'|trans }}</h2>
     <div class="row mb-3 p-4">
         <div class="col-12">