Merge branch 'main' into spie06

automatic
2025-06-19 09:03:11 +02:00 · 2025-06-19 09:00:11 +02:00 · 2025-06-19 08:54:21 +02:00 · 2025-06-19 08:34:13 +02:00 · 2025-06-19 07:38:55 +02:00 · 2025-06-19 07:32:30 +02:00
102 changed files with 2181 additions and 6943 deletions
--- a/config.yaml
+++ b/config.yaml
@@ -33,41 +33,15 @@ menu_items:
    title: Agenda dispositifs
    link: /app/agenda/
    icon: hero:outline/calendar
-  # - name: directory
-  #   title: Répertoire solutions
-  #   link: /app/directory/
-  #   icon: hero:outline/document-text
+  - name: directory
+    title: Répertoire solutions
+    link: /app/directory/
+    icon: hero:outline/document-text
  - name: support
    title: Support
    link: /app/support/
    icon: hero:outline/support

-journey_tabs:
-  - name: all
-    title: Tous modes
-    enabled: true
-  - name: public-transit
-    title: Transports
-    enabled: true
-  - name: directory
-    title: Solutions locales
-    module: directory
-  - name: carpool
-    title: Covoiturage
-    enabled: true
-  - name: organized-carpool
-    title: Covoiturage solidaire
-    module: organized_carpool
-  - name: solidarity-transport
-    title: Transport solidaire
-    module: solidarity_transport
-  - name: vehicles
-    title: Véhicules
-    module: vehicles
-  # - name: others
-  #   title: Autres
-  #   enabled: true
-
 views:
  generic:
    files:
@@ -78,7 +52,6 @@ views:
      - web/layouts/dashboard/_partials/agenda-widget.html
      - web/layouts/dashboard/_partials/beneficiaries-widget.html
      - web/layouts/dashboard/_partials/bookings-widget.html
-      - web/layouts/dashboard/_partials/drivers-map-widget.html
      - web/layouts/dashboard/dashboard.html
  beneficiaries:
    list:
@@ -98,10 +71,13 @@ views:
        - web/layouts/beneficiaries/_partials/beneficiary-events.html
        - web/layouts/beneficiaries/_partials/beneficiary-files.html
        - web/layouts/beneficiaries/_partials/beneficiary-organizations.html
+        - web/layouts/beneficiaries/_partials/beneficiary-diags.html
        - web/layouts/beneficiaries/_partials/beneficiary-wallet.html
        - web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
-        - web/layouts/beneficiaries/_partials/beneficiary-organized-carpool.html
        - web/layouts/beneficiaries/display.html
+    create_diag:
+      files:
+        - web/layouts/beneficiaries/create-diag.html
    update:
      files:
        - web/layouts/_partials/address_autocomplete.html
@@ -133,10 +109,14 @@ views:
    booking_display:
      files:
        - web/layouts/vehicles/booking-display.html
+        - web/layouts/vehicles_management/_partials/booking-diags.html
    bookings_list:
      files:
        - web/layouts/vehicles_management/_partials/bookings-list.html
        - web/layouts/vehicles/bookings-list.html
+    create_booking_diag:
+      files:
+        - web/layouts/vehicles/create-booking-diag.html
  vehicles_management:
    overview:
      files:
@@ -145,7 +125,6 @@ views:
        - web/layouts/vehicles_management/overview.html
    bookings_list:
      files:
-        - web/layouts/vehicles_management/_partials/booking_filters.html
        - web/layouts/vehicles_management/_partials/bookings-list.html
        - web/layouts/vehicles_management/bookings-list.html
    fleet_add:
@@ -157,6 +136,7 @@ views:
      files:
        - web/layouts/vehicles_management/_partials/calendar.html
        - web/layouts/vehicles_management/fleet-display.html
+        - web/layouts/vehicles_management/_partials/vehicle-diags.html
    fleet_update:
      files:
        - web/layouts/_partials/address_autocomplete.html
@@ -166,9 +146,16 @@ views:
    booking_display:
      files:
        - web/layouts/vehicles_management/booking-display.html
+        - web/layouts/vehicles_management/_partials/booking-diags.html
    delete_booking:
      files:
        - web/layouts/vehicles_management/delete-booking.html
+    create_vehicle_diag:
+      files:
+        - web/layouts/vehicles_management/create-vehicle-diag.html
+    create_booking_diag:
+      files:
+        - web/layouts/vehicles_management/create-booking-diag.html
  agenda:
    list:
      files:
@@ -210,18 +197,11 @@ views:
        - web/layouts/_partials/orb_address_autocomplete.html
        - web/layouts/journeys/_partials/journeys-all.html
        - web/layouts/journeys/_partials/journeys-others.html
-        - web/layouts/journeys/_partials/journeys-vehicles.html
-        - web/layouts/journeys/_partials/journeys-local-solutions.html
        - web/layouts/journeys/_partials/journeys-carpool.html
-        - web/layouts/journeys/_partials/journeys-public-transit-transitous.html
+        - web/layouts/journeys/_partials/journeys-public-transit-motis.html
        - web/layouts/journeys/_partials/journeys-solidarity-transport.html
        - web/layouts/journeys/_partials/journeys-organized-carpools.html
-        - web/layouts/journeys/_partials/saved-searches.html
        - web/layouts/journeys/search.html
-    search_compact:
-      files:
-        - web/layouts/_partials/orb_address_autocomplete.html
-        - web/layouts/journeys/search-compact.html
    list:
      files:
        - web/layouts/journeys/group_management.html
@@ -253,12 +233,28 @@ views:
    display_group:
      files:
        - web/layouts/group_module/display_group.html
+  diags:
+    list:
+      files:
+        - web/layouts/diags/home.html
+    display_diag:
+      files:
+        - web/layouts/diags/display-diag.html
+        - web/layouts/diags/_partials/diags-files.html
+    delete:
+      files:
+        - web/layouts/diags/delete-diag.html
+    update:
+      files:
+        - web/layouts/diags/update-diag.html
+    history:
+      files:
+        - web/layouts/diags/history-diags.html

  solidarity_transport:
    overview:
      files:
        - web/layouts/solidarity_transport/_partials/drivers_list.html
-        - web/layouts/solidarity_transport/_partials/booking_filters.html
        - web/layouts/solidarity_transport/_partials/bookings_list.html
        - web/layouts/solidarity_transport/_partials/bookings_history.html
        - web/layouts/solidarity_transport/overview.html
@@ -277,7 +273,6 @@ views:
        - web/layouts/solidarity_transport/_partials/driver_availabilities.html
        - web/layouts/solidarity_transport/_partials/driver_history.html
        - web/layouts/solidarity_transport/_partials/driver_documents.html
-        - web/layouts/solidarity_transport/_partials/driver_wallet.html
        - web/layouts/solidarity_transport/driver_display.html
    driver_journey:
      files:
@@ -288,7 +283,6 @@ views:
        - web/layouts/solidarity_transport/driver_journey.html
    booking_display:
      files:
-        - sms/solidarity_transport/request_driver.tmpl
        - web/layouts/solidarity_transport/_partials/journey_map.html
        - web/layouts/solidarity_transport/_partials/journey_preview.html
        - web/layouts/solidarity_transport/booking_display.html
@@ -305,38 +299,23 @@ views:
  organized_carpool:
    overview:
      files:
-        - web/layouts/organized_carpool/_partials/booking_filters.html
        - web/layouts/organized_carpool/_partials/drivers_list.html
        - web/layouts/organized_carpool/_partials/bookings_list.html
-        - web/layouts/organized_carpool/_partials/bookings_history.html
        - web/layouts/organized_carpool/overview.html
    driver_create:
      files:
        - web/layouts/_partials/address_autocomplete.html
        - web/layouts/organized_carpool/driver_create.html
-    driver_update:
-      files:
-        - web/layouts/agenda/_partials/address.html
-        - web/layouts/_partials/address_autocomplete.html
-        - web/layouts/organized_carpool/driver_update.html
    driver_display:
      files:
        - web/layouts/_partials/address_autocomplete.html
        - web/layouts/organized_carpool/_partials/driver_availabilities.html
-        - web/layouts/organized_carpool/_partials/driver_documents.html
-        - web/layouts/organized_carpool/_partials/driver_wallet.html
-        - web/layouts/organized_carpool/_partials/driver_history.html
+        - web/layouts/solidarity_transport/_partials/driver_documents.html
        - web/layouts/organized_carpool/driver_display.html
    journey:
      files:
-        - sms/organized_carpool/request_driver.tmpl
-        - web/layouts/_partials/submit_with_sms.html
        - web/layouts/organized_carpool/_partials/journey_preview.html
        - web/layouts/organized_carpool/journey.html
-    booking_display:
-      files:
-        - web/layouts/organized_carpool/_partials/booking_map.html
-        - web/layouts/organized_carpool/booking_display.html

  administration:
    home:
@@ -361,7 +340,6 @@ views:
        - web/layouts/administration/vehicles_stats.html
    bookings_list:
      files:
-        - web/layouts/vehicles_management/_partials/booking_filters.html
        - web/layouts/administration/_partials/bookings_list.html
        - web/layouts/administration/bookings_stats.html
    settings:
@@ -396,7 +374,6 @@ icons:
  svg:
    coopgo:parcoursmob/monogram: <svg xmlns="http://www.w3.org/2000/svg" class="%s" viewBox="0 0 61.85 33.58"><defs><style>.cls-1{fill:#ff1300;}.cls-2{fill:#243887;}</style></defs><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path class="cls-1" d="M44.978,0C31.337,0,28.1,6.824,27.875,15.505H39.536V9.434a.727.727,0,0,1,1.123-.607L52.6,16.453,40.659,24.08a.729.729,0,0,1-1.123-.608v-6.1H27.865c.075,8.427,1.527,16.213,17.113,16.213,14.867,0,16.872-7.764,16.872-17.032C61.85,7.91,59.894,0,44.978,0Z"/><polygon class="cls-1" points="41.412 21.385 49.133 16.453 41.412 11.521 41.412 21.385"/><path class="cls-2" d="M14.175,11.4l-.019,4.151H26.311a14.781,14.781,0,0,0,.819-5.141C27.046,3.767,22.545,0,14.764,0H1.052A1.147,1.147,0,0,0,0,1.24V31.87a1.149,1.149,0,0,0,1.094,1.239H11.525a1.145,1.145,0,0,0,1.051-1.239V10.41h.758C13.88,10.41,14.175,10.756,14.175,11.4Z"/><path class="cls-2" d="M14.148,17.3l-.015,3.514H18.97A7.521,7.521,0,0,0,25.458,17.3Z"/></g></g></svg>
    hero:outline/archive-box: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="m20.25 7.5-.625 10.632a2.25 2.25 0 0 1-2.247 2.118H6.622a2.25 2.25 0 0 1-2.247-2.118L3.75 7.5M10 11.25h4M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125Z" /></svg>
-    hero:outline/archive-box-x-mark: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="m20.25 7.5-.625 10.632a2.25 2.25 0 0 1-2.247 2.118H6.622a2.25 2.25 0 0 1-2.247-2.118L3.75 7.5m6 4.125 2.25 2.25m0 0 2.25 2.25M12 13.875l2.25-2.25M12 13.875l-2.25 2.25M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125Z" /></svg>
    hero:outline/arrow-long-right: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M17.25 8.25 21 12m0 0-3.75 3.75M21 12H3" /></svg>
    hero:outline/arrow-path-rounded-square: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 12c0-1.232-.046-2.453-.138-3.662a4.006 4.006 0 0 0-3.7-3.7 48.678 48.678 0 0 0-7.324 0 4.006 4.006 0 0 0-3.7 3.7c-.017.22-.032.441-.046.662M19.5 12l3-3m-3 3-3-3m-12 3c0 1.232.046 2.453.138 3.662a4.006 4.006 0 0 0 3.7 3.7 48.656 48.656 0 0 0 7.324 0 4.006 4.006 0 0 0 3.7-3.7c.017-.22.032-.441.046-.662M4.5 12l3 3m-3-3-3 3" /></svg>
    hero:outline/briefcase: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>
@@ -405,7 +382,6 @@ icons:
    hero:outline/calendar: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
    hero:outline/chevron-right: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M8.25 4.5l7.5 7.5-7.5 7.5" /></svg>
    hero:outline/cog: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" /><path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /></svg>
-    hero:outline/document: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z" /></svg>
    hero:outline/document-arrow-down: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m.75 12l3 3m0 0l3-3m-3 3v-6m-1.5-9H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" /></svg>
    hero:outline/document-text: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" /></svg>
    hero:outline/folder-plus: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M12 10.5v6m3-3H9m4.06-7.19l-2.12-2.12a1.5 1.5 0 00-1.061-.44H4.5A2.25 2.25 0 002.25 6v12a2.25 2.25 0 002.25 2.25h15A2.25 2.25 0 0021.75 18V9a2.25 2.25 0 00-2.25-2.25h-5.379a1.5 1.5 0 01-1.06-.44z" /></svg>
@@ -418,10 +394,8 @@ icons:
    hero:outline/plus-circle: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3m0 0v3m0-3h3m-3 0H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
    hero:outline/shield-check: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" /></svg>
    hero:outline/table-cells: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M3.375 19.5h17.25m-17.25 0a1.125 1.125 0 01-1.125-1.125M3.375 19.5h7.5c.621 0 1.125-.504 1.125-1.125m-9.75 0V5.625m0 12.75v-1.5c0-.621.504-1.125 1.125-1.125m18.375 2.625V5.625m0 12.75c0 .621-.504 1.125-1.125 1.125m1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125m0 3.75h-7.5A1.125 1.125 0 0112 18.375m9.75-12.75c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125m19.5 0v1.5c0 .621-.504 1.125-1.125 1.125M2.25 5.625v1.5c0 .621.504 1.125 1.125 1.125m0 0h17.25m-17.25 0h7.5c.621 0 1.125.504 1.125 1.125M3.375 8.25c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125m17.25-3.75h-7.5c-.621 0-1.125.504-1.125 1.125m8.625-1.125c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125M12 10.875v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 10.875c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125M13.125 12h7.5m-7.5 0c-.621 0-1.125.504-1.125 1.125M20.625 12c.621 0 1.125.504 1.125 1.125v1.5c0 .621-.504 1.125-1.125 1.125m-17.25 0h7.5M12 14.625v-1.5m0 1.5c0 .621-.504 1.125-1.125 1.125M12 14.625c0 .621.504 1.125 1.125 1.125m-2.25 0c.621 0 1.125.504 1.125 1.125m0 1.5v-1.5m0 0c0-.621.504-1.125 1.125-1.125m0 0h7.5" /></svg>
-    hero:outline/user: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M15.75 6a3.75 3.75 0 1 1-7.5 0 3.75 3.75 0 0 1 7.5 0ZM4.501 20.118a7.5 7.5 0 0 1 14.998 0A17.933 17.933 0 0 1 12 21.75c-2.676 0-5.216-.584-7.499-1.632Z" /></svg>
    hero:outline/user-group: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" /></svg>
    hero:outline/x: <svg class="%s text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" aria-hidden="true"><path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" /></svg>
-    hero:solid/check-circle: <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="%s"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12Zm13.36-1.814a.75.75 0 1 0-1.22-.872l-3.236 4.53L9.53 12.22a.75.75 0 0 0-1.06 1.06l2.25 2.25a.75.75 0 0 0 1.14-.094l3.75-5.25Z" clip-rule="evenodd" /></svg>
    hero:solid/chevron-right: <svg class="%s text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" /></svg>
    hero:solid/question-mark-icon: <svg class="%s" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path fill-rule="evenodd"  d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd" /></svg>
    hero:solid/search: <svg class="%s" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"><path fill-rule="evenodd" d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z" clip-rule="evenodd" /></svg>
@@ -431,8 +405,6 @@ icons:
    tabler-icons:walk: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-walk %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="13" cy="4" r="1" /><line x1="7" y1="21" x2="10" y2="17" /><path d="M16 21l-2 -4l-3 -3l1 -6" /><path d="M6 12l2 -3l4 -1l3 3l3 1" /></svg>
    tabler-icons:bus: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bus %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="6" cy="17" r="2" /><circle cx="18" cy="17" r="2" /><path d="M4 17h-2v-11a1 1 0 0 1 1 -1h14a5 7 0 0 1 5 7v5h-2m-4 0h-8" /><polyline points="16 5 17.5 12 22 12" /><line x1="2" y1="10" x2="17" y2="10" /><line x1="7" y1="5" x2="7" y2="10" /><line x1="12" y1="5" x2="12" y2="10" /></svg>
    tabler-icons:train: <svg  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-train %s"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M21 13c0 -3.87 -3.37 -7 -10 -7h-8" /><path d="M3 15h16a2 2 0 0 0 2 -2" /><path d="M3 6v5h17.5" /><path d="M3 11v4" /><path d="M8 11v-5" /><path d="M13 11v-4.5" /><path d="M3 19h18" /></svg>
-    hero:outline/map-pin: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M15 10.5a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25s-7.5-4.108-7.5-11.25a7.5 7.5 0 1115 0z" /></svg>
-    hero:outline/flag: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M3 3v1.5M3 21v-6m0 0l2.77-.693a9 9 0 016.208.682l.108.054a9 9 0 006.086.71l3.114-.732a48.524 48.524 0 01-.005-10.499l-3.11.732a9 9 0 01-6.085-.711l-.108-.054a9 9 0 00-6.208-.682L3 4.5M3 15V4.5" /></svg>

 emails:
  onboarding:
@@ -475,12 +447,6 @@ emails:
      files:
        - emails/layout.html
        - emails/onboarding/support_emailing.html
-  contact:
-    request:
-      subject: PARCOURSMOB - Nouveau message de contact
-      files:
-        - emails/layout.html
-        - emails/contact/request.html
  delete_subscriber:
    request:
      subject: PARCOURSMOB - Un bénéficiaire a été retiré d'un dispositif
@@ -488,21 +454,18 @@ emails:
        - emails/layout.html
        - emails/onboarding/delete-subscriber.html
  solidarity_transport:
-    booking_driver_accept:
+    boking_driver_accept:
      subject: Trajet accepté par un conducteur
      files:
        - emails/layout.html
        - emails/solidarity_transport/booking_driver_accept.html
-    booking_driver_decline:
-      subject: Trajet refusé par un conducteur
+    boking_driver_decline:
+      subject: Trajet accepté par un conducteur
      files:
        - emails/layout.html
-        - emails/solidarity_transport/booking_driver_decline.html
+        - emails/solidarity_transport/booking_driver_accept.html

 sms:
  solidarity_transport:
    request_driver:
      - sms/solidarity_transport/request_driver.tmpl
-  organized_carpool:
-    request_driver:
-      - sms/organized_carpool/request_driver.tmpl
--- a/emails/contact/request.html
+++ b/emails/contact/request.html
@@ -1,17 +0,0 @@
-{{define "content"}}
-<h2>Nouveau message de contact</h2>
-
-<table style="width: 100%; border-collapse: collapse; margin-top: 20px;">
-{{range $key, $value := .fields}}
-    <tr>
-        <td style="padding: 10px; border-bottom: 1px solid #eee; font-weight: bold; vertical-align: top; width: 30%;">{{$key}}</td>
-        <td style="padding: 10px; border-bottom: 1px solid #eee;">{{$value}}</td>
-    </tr>
-{{end}}
-</table>
-
-<hr style="margin-top: 30px; border: none; border-top: 1px solid #ccc;" />
-<p style="font-size: 12px; color: #666;">
-    Ce message a été envoyé via le formulaire de contact du site public.
-</p>
-{{end}}
--- a/emails/fleets/bookings/creation-admin-alert.html
+++ b/emails/fleets/bookings/creation-admin-alert.html
@@ -1,4 +1,4 @@
 {{define "content"}}
 <p>Vous avez une nouvelle réservation e véhicule sur PARCOURSMOB.</p>
-<p>Connectez vous sur <a href="http://localhost:9000/app/vehicles-management/bookings/{{.bookingid}}">http://localhost:9000/app/vehicles-management/bookings/{{.bookingid}}</a> pour y accéder</p>
+<p>Connectez vous sur <a href="https://spie06.parcoursmob.fr/app/vehicles-management/bookings/{{.bookingid}}">https://spie06.parcoursmob.fr/app/vehicles-management/bookings/{{.bookingid}}</a> pour y accéder</p>
 {{end}}
--- a/emails/layout.html
+++ b/emails/layout.html
@@ -20,9 +20,8 @@
                text-align: center;
            }

-            .logo {
-                max-width: 300px;
-                height: auto;
+            .w-96 {
+                width: 24rem/* 384px */;
            }

            .p-10 {
@@ -53,7 +52,7 @@
    </head>
    <body>
        <div class="bg-co-blue text-center text-white p-10">
-            <img class="logo" src="{{.baseUrl}}/public/images/mobicoop-solidaire.png" alt="Mobicoop solidaire" />
+            <img class="w-96" src="https://coopgo.fr/images/coopgo-logo-bluegreen.svg" alt="PARCOURSMOB" />
        </div>
        <div class="max-w-3xl m-auto">
            {{template "content" .}}
--- a/emails/solidarity_transport/booking_driver_decline.html
+++ b/emails/solidarity_transport/booking_driver_decline.html
@@ -1,5 +1,5 @@
 {{define "content"}}
 <p>Bonjour,</p>
 <p>Trajet refusé par un conducteur.</p>
-<p>Voir le trajet : <a href="{{ .baseUrl }}/app/solidarity-transport/bookings/{{.bookingid}}">{{ .baseUrl }}/app/solidarity-transport/bookings/{{.bookingid}}</a></p>
+<p>Voir le trajet : <a href="{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}">{{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}</a></p>
 {{end}}
--- a/sms/organized_carpool/request_driver.tmpl
+++ b/sms/organized_carpool/request_driver.tmpl
@@ -1,2 +0,0 @@
-{{ define "sms_template" }}[{{ .name }}] Nouvelle demande de covoiturage solidaire le {{ .datetime }}.
-Acceptez ou refusez sur {{ .baseUrl }}/ext/oc/bp/{booking_id}{{ end }}
--- a/sms/solidarity_transport/driver_accept.tmpl
+++ b/sms/solidarity_transport/driver_accept.tmpl
@@ -1 +1 @@
-{{ define "sms_template" }}[{{ .name }}] {{ .driver_first_name }} {{ .driver_last_name }} vient d'accepter votre trajet vers {{.address}} le {{.date}}. Le conducteur vous contactera pour organiser le trajet.{{ end }}
+{{ define "sms_template" }}[{{ .name }}] {{ .driver_first_name }} {{ .driver_last_name }} vient d'accepter votre trajet vers {{.address}} le {{.date}}.{{ end }}
--- a/web/assets/css/main.css
+++ b/web/assets/css/main.css
@@ -1,9 +1,9 @@
@import "tailwindcss";

@theme {
-  --color-co-blue: #243887;
+  --color-co-blue: #00727e;
  --color-co-lightblue: #907eff;
-  --color-co-red: #ff1300;
+  --color-co-red: #de1581;
  --color-co-green: #6cc11f;
  --color-co-yellow: #ffdd00;
  --color-co-orange: #ff5300;
--- a/web/layouts/_partials/address_autocomplete.html
+++ b/web/layouts/_partials/address_autocomplete.html
@@ -18,7 +18,7 @@
            this.responselength = 0
            return []
        }
-        result = await fetch("https://data.geopf.fr/geocodage/search/?q=" + encodeURIComponent(this.input))
+        result = await fetch("https://api-adresse.data.gouv.fr/search/?q=" + this.input)
        json = await result.json()
        console.log(json)

--- a/web/layouts/_partials/beneficiary_autocomplete.html
+++ b/web/layouts/_partials/beneficiary_autocomplete.html
@@ -1,21 +0,0 @@
-{{ define "beneficiary_autocomplete" }}
-<div x-model="{
-		input: '',
-	}">
-    <input type="text" 
-        class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"
-        x-model="input">
-
-    <ul x-show="responselength > 0"
-    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
-        <template x-for="item in autocomplete">
-            <a href="#">
-                <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9" 
-                    @click="select(item)">
-                    <span class="font-normal block truncate" x-text="item.properties.label" ></span>
-                </li>
-            </a>
-        </template>
-    </ul>
-</div>
-{{ end }}
--- a/web/layouts/_partials/orb_address_autocomplete.html
+++ b/web/layouts/_partials/orb_address_autocomplete.html
@@ -19,7 +19,7 @@
            this.responselength = 0
            return []
        }
-        result = await fetch("https://data.geopf.fr/geocodage/search/?q=" + encodeURIComponent(this.input))
+        result = await fetch("https://api-adresse.data.gouv.fr/search/?q=" + this.input)
        json = await result.json()
        console.log(json)

--- a/web/layouts/administration/bookings_stats.html
+++ b/web/layouts/administration/bookings_stats.html
@@ -7,27 +7,31 @@
        <div class="sm:flex-auto">
            
        </div>
-        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none flex gap-2">
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/exports/fleets/bookings">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    Export
+                </button>
+            </a>
            <a href="/app/administration/stats/vehicles">
                <button type="button"
-                    class="inline-flex items-center justify-center bg-co-blue hover:bg-blue-700 border-co-blue border px-4 py-2 text-white text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
                    {{$.IconSet.Icon "hero:outline/document-arrow-left" "h-5 w-5 mr-3"}}
                    Liste des véhicules
                </button>
            </a>
-            <a href="/exports/fleets/bookings/all_bookings.xlsx?status={{.ViewState.filters.status}}&date_start={{.ViewState.filters.date_start}}&date_end={{.ViewState.filters.date_end}}">
+            <!-- <a href="/api/cache/{{.ViewState.cacheid}}/export">
                <button type="button"
-                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
-                    Export
+                    Exporter
                </button>
-            </a>
+            </a> -->
        </div>
    </div>
 </div>

-{{template "vehicle_booking_filters" .}}
-
 {{template "bookings_list" .}}

 {{end}}
--- a/web/layouts/administration/create_group.html
+++ b/web/layouts/administration/create_group.html
@@ -89,28 +89,6 @@
                                    <p class="text-gray-500">Trouver des solutions et organiser les déplacements de ses bénéficiaires.</p>
                                </div>
                            </div>
-                            <div class="flex items-start">
-                                <div class="flex items-center h-5">
-                                    <input id="solidarity_transport" name="modules.solidarity_transport" type="checkbox"
-                                        class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded">
-                                </div>
-                                <div class="ml-3 text-sm">
-                                    <label for="modules.vehicles" class="font-medium text-gray-700">Transport solidaire</label>
-                                    <p class="text-gray-500">Organiser le transport solidaire ou transport d'utilité sociale avec des conducteurs solidaires.
-                                    </p>
-                                </div>
-                            </div>
-                            <div class="flex items-start">
-                                <div class="flex items-center h-5">
-                                    <input id="organized_carpool" name="modules.organized_carpool" type="checkbox"
-                                        class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded">
-                                </div>
-                                <div class="ml-3 text-sm">
-                                    <label for="modules.vehicles" class="font-medium text-gray-700">Covoiturage solidaire</label>
-                                    <p class="text-gray-500">Organiser le covoiturage solidaire, mettez en relation covoitureurs solidaires avec vos bénéficiaires.
-                                    </p>
-                                </div>
-                            </div>
                            <div class="flex items-start">
                                <div class="flex items-center h-5">
                                    <input id="vehicles" name="modules.vehicles" type="checkbox"
--- a/web/layouts/agenda/_partials/address.html
+++ b/web/layouts/agenda/_partials/address.html
@@ -22,7 +22,7 @@
            this.responselength = 0
            this.address = this.def
            this.input = `{{ .Default.properties.label}}`
-            result = await fetch('https://data.geopf.fr/geocodage/search/?q=' + this.input)
+            result = await fetch('https://api-adresse.data.gouv.fr/search/?q=' + this.input)
            json = await result.json()

            bb = json['features'][0]
@@ -33,7 +33,7 @@
                return [bb]
        }
        
-            result = await fetch('https://data.geopf.fr/geocodage/search/?q=' + this.input)
+            result = await fetch('https://api-adresse.data.gouv.fr/search/?q=' + this.input)
            json = await result.json()

        this.responselength = json['features'].length
--- a/web/layouts/auth/lost-password-init.html
+++ b/web/layouts/auth/lost-password-init.html
@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
    <head>
        <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
    </head>
    <body class="h-full">
        <form method="post">
--- a/web/layouts/auth/lost-password-recover-ko.html
+++ b/web/layouts/auth/lost-password-recover-ko.html
@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
    <head>
        <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
    </head>
    <body class="h-full">

--- a/web/layouts/auth/lost-password-recover.html
+++ b/web/layouts/auth/lost-password-recover.html
@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
    <head>
        <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
    </head>
    <body class="h-full">
        <form method="post">
--- a/web/layouts/auth/onboarding-ko.html
+++ b/web/layouts/auth/onboarding-ko.html
@@ -2,7 +2,7 @@
 <html class="h-full bg-gray-50">
    <head>
        <title>PARCOURSMOB - Identification</title>
-        <link rel="stylesheet" href="http://localhost:9000/public/css/main.css" />
+        <link rel="stylesheet" href="/public/css/main.css" />
    </head>
    <body class="h-full">

--- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html
+++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html
@@ -0,0 +1,58 @@
+{{define "beneficiary_diags"}}
+{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
+{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
+<div class="bg-white shadow sm:rounded-lg">
+    <div class="px-4 py-5 sm:px-6">
+        <div class="flex items-center space-x-5">
+            <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
+            <a href="{{.ViewState.beneficiary.ID}}/create-diag">
+                <button type="button"
+                class="flex justify-around rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
+                {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
+                Créer un diagnostic
+                </button>
+            </a>
+        </div>
+    </div>
+    <div class="border-t border-gray-200">
+        {{ $diagCount := len .ViewState.diags }}
+        <ul role="list" class="divide-y divide-gray-200 flex-1">
+            {{if eq $diagCount 0}}
+                <li class="py-2 px-4">
+                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
+                </li>
+            {{else}}
+                {{range .ViewState.diags}}
+                {{ $diags := .ID }}
+                {{if eq .Deleted false}}
+                    <li class="py-5 px-4 flex">
+                            <div class="flex-1 ml-3">
+                                <a href="/app/diags/{{$diags}}"class="mt-1 text-sm text-gray-900">{{.Name}}</a>
+                            </div>
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
+                            </div>
+                            <a href="/app/diags/{{$diags}}" target="_blank">
+                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
+                            </a>
+                    </li>
+                {{end}}
+                {{if eq .Deleted true}}
+                    <li class="py-5 px-4 flex">
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
+                            </div>
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
+                            </div>
+                        <div class="flex-1 ml-3">
+                            <p class="mt-1 text-sm text-gray-900">Ce diagnostic a été retiré</p>
+                        </div>
+                    </li>
+                {{end}}
+                {{end}}
+            {{end}}
+        </ul>
+    </div>
+</div>
+{{end}}
--- a/web/layouts/beneficiaries/_partials/beneficiary-files.html
+++ b/web/layouts/beneficiaries/_partials/beneficiary-files.html
@@ -65,20 +65,9 @@ x-data="{
              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <div class="flex gap-2 justify-end">
                <a href="/app/beneficiaries/{{$.ViewState.beneficiary.ID}}/documents/{{.FileName}}" target="_blank">
-                  <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">
-                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-4 w-4 mr-1"}}
-                    Télécharger<span class="sr-only"> le document</span>
-                  </button>
+                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
                </a>
-                  <button type="button"
-                    onclick="if(confirm('Êtes-vous sûr de vouloir supprimer ce document ?')) { window.location.href='/app/beneficiaries/{{$.ViewState.beneficiary.ID}}/documents/{{.FileName}}/delete'; }"
-                    class="inline-flex items-center rounded-md border border-transparent bg-co-red px-3 py-2 text-sm font-medium leading-4 text-white shadow-sm hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2">
-                    {{$.IconSet.Icon "hero:outline/trash" "h-4 w-4 mr-1"}}
-                    Supprimer<span class="sr-only"> le document</span>
-                  </button>
-                </div>
              </td>
            </tr>
            {{end}}
--- a/web/layouts/beneficiaries/_partials/beneficiary-journeys.html
+++ b/web/layouts/beneficiaries/_partials/beneficiary-journeys.html
@@ -1,6 +1,6 @@
 {{define "beneficiary_journeys"}}
 <div class="px-4 py-6 sm:px-6">
-    <form action="{{if eq $.ViewState.search_view "compact"}}/app/journeys/search{{else}}/app/journeys/{{end}}" method="GET">
+    <form action="/app/journeys/" method="GET">

        {{ $departureField := "departure" }}
        {{ $departureLabel := "Départ" }}
--- a/web/layouts/beneficiaries/_partials/beneficiary-organized-carpool.html
+++ b/web/layouts/beneficiaries/_partials/beneficiary-organized-carpool.html
@@ -1,73 +0,0 @@
-{{define "beneficiary_organized_carpool"}}
-<div class="py-6">
-  {{if .ViewState.organized_carpool_stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Trajets réalisés : {{ .ViewState.organized_carpool_stats.count }}</p>
-    <p class="text-lg">Kilomètres réalisés : {{ .ViewState.organized_carpool_stats.km}} km</p>
-  </div>
-  {{end}}
-
-  <div class="text-center py-5">
-    <a href="/app/journeys/?passengerid={{.ViewState.beneficiary.ID}}" class="inline-flex">
-      <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Chercher un trajet</button>
-    </a>
-  </div>
-
-  {{if .ViewState.organized_carpool_bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des covoiturages solidaires</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <thead class="bg-gray-50">
-        <tr>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Conducteur</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Statut</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"></th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.organized_carpool_bookings}}
-        {{if or (eq .Status.String "CONFIRMED") (eq .Status.String "WAITING_DRIVER_CONFIRMATION")}}
-        <tr>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04"}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Driver}}
-              <a class="text-co-blue" href="/app/organized-carpool/drivers/{{.Driver.Id}}">
-                {{ (index $.ViewState.organized_carpool_drivers_map .Driver.Id).Data.first_name }}
-                {{ (index $.ViewState.organized_carpool_drivers_map .Driver.Id).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerPickupAddress}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerDropAddress}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if eq .Status.String "CONFIRMED"}}
-              <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Confirmé</span>
-            {{else if eq .Status.String "WAITING_DRIVER_CONFIRMATION"}}
-              <span class="p-1 px-2 text-xs bg-gray-300 rounded-2xl">Attente confirmation</span>
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/organized-carpool/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun covoiturage solidaire enregistré</p>
-  </div>
-  {{end}}
-</div>
-{{end}}
--- a/web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
+++ b/web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
@@ -1,75 +1,7 @@
 {{define "beneficiary_solidarity_transport"}}
-<div class="py-6">
-  {{if .ViewState.solidarity_transport_stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Trajets réalisés : {{ .ViewState.solidarity_transport_stats.count }}</p>
-    <p class="text-lg">Kilomètres réalisés : {{ .ViewState.solidarity_transport_stats.km}} km</p>
-  </div>
-  {{end}}
+<div class="px-4 py-6 sm:px-6 text-center">
+  <p class="text-center text-lg">Trajets réalisés : {{ .ViewState.solidarity_transport_stats.count }}</p>
+  <p class="text-center text-lg">Kilomètres réalisés : {{ .ViewState.solidarity_transport_stats.km}} km</p>

-  <div class="text-center py-5">
-    <a href="/app/journeys/?passengerid={{.ViewState.beneficiary.ID}}" class="inline-flex">
-      <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Chercher un trajet</button>
-    </a>
-  </div>
-
-  {{if .ViewState.solidarity_transport_bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des transports solidaires</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <thead class="bg-gray-50">
-        <tr>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Conducteur</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Statut</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"></th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.solidarity_transport_bookings}}
-        {{if or (eq .Status "VALIDATED") (eq .Status "WAITING_CONFIRMATION")}}
-        <tr>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}
-              {{timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04"}}
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .DriverId}}
-              <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{.DriverId}}">
-                {{ (index $.ViewState.solidarity_transport_drivers_map .DriverId).Data.first_name }}
-                {{ (index $.ViewState.solidarity_transport_drivers_map .DriverId).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerPickup}}{{.Journey.PassengerPickup.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerDrop}}{{.Journey.PassengerDrop.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if eq .Status "VALIDATED"}}
-              <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Validé</span>
-            {{else if eq .Status "WAITING_CONFIRMATION"}}
-              <span class="p-1 px-2 text-xs bg-gray-300 rounded-2xl">Attente confirmation</span>
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun transport solidaire enregistré</p>
-  </div>
-  {{end}}
 </div>
 {{end}}
--- a/web/layouts/beneficiaries/_partials/beneficiary-wallet.html
+++ b/web/layouts/beneficiaries/_partials/beneficiary-wallet.html
@@ -1,10 +1,10 @@
 {{define "beneficiary_wallet"}}
-<div class="py-6"
+<div class="px-4 py-6 sm:px-6 text-center"
  x-data="{
    walletdialog: false
  }">
-  <div class="py-5 text-center">
-    <p class="text-lg">Solde : {{ printf "%.2f" .ViewState.wallet_balance }} €</p>
+  <div class="px-4 py-5 sm:px-6">
+    <p class="text-center text-lg">Solde : {{if .ViewState.beneficiary.Data.wallet}}{{ .ViewState.beneficiary.Data.wallet }}{{else}}0{{end}} €</p>
  <button  @click="walletdialog = !walletdialog" 
    class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
    Créditer le compte
@@ -15,7 +15,7 @@
                                
    <div class="fixed inset-0 z-10 overflow-y-auto">
      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg sm:p-6">
+        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
          <div>
            <div class="mt-3 text-center sm:mt-5">
              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Créditer le compte</h3>
@@ -25,33 +25,15 @@
              </div>
            </div>
          <form method="POST" action="/app/wallets/{{.ViewState.beneficiary.ID}}/credit" class="my-4">
-              <div class="space-y-4">
-                <div>
-                  <label for="amount" class="block text-sm font-medium text-gray-700">Montant</label>
-                  <input type="number" step="0.01" id="amount" name="amount" value="0"
-                         class="mt-1 w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-3 py-2 sm:text-sm border-gray-300 rounded-2xl">
+              <div class="my-8">
+                <input type="number" id="amount" name="amount" value="0"
+                       class="w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-2 p-1 sm:text-sm border-gray-300 rounded-2xl">
              </div>
-
-                <div>
-                  <label for="payment_method" class="block text-sm font-medium text-gray-700">Moyen de paiement</label>
-                  <select id="payment_method" name="payment_method"
-                          class="mt-1 w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-3 py-2 sm:text-sm border-gray-300 rounded-2xl">
-                    <option value="Paiement en espèce (MMS)">Paiement en espèce (MMS)</option>
-                    <option value="Virement bancaire">Virement bancaire</option>
-                    <option value="Autre">Autre</option>
-                  </select>
-                </div>
-
-                <div>
-                  <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
-                  <textarea id="description" name="description" rows="3" placeholder="Description de l'opération..."
-                            class="mt-1 w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-3 py-2 sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                </div>
-              </div>
-
-              <div class="mt-6 flex flex-col space-y-3">
+              <div class="mt-5 sm:mt-6">
                <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Ajouter</button>
-                <button @click="walletdialog=false" type="button" class="inline-flex w-full justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+              </div>
+              <div class="mt-5 sm:mt-6">
+                <button @click="walletdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
              </div>
            </form>
          </div>
@@ -60,72 +42,5 @@
    </div>
  </div>

-  <!-- Wallet Operations History -->
-  {{if .ViewState.beneficiary.Data.wallet_history}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des opérations</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <thead class="bg-gray-50">
-        <tr>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Crédit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Débit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Moyen de paiement</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Description</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        <!-- Initial Balance Row -->
-        <tr class="bg-gray-50">
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-500 italic sm:pl-6">
-            Solde initial
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-            {{if .ViewState.beneficiary.Data.wallet}}{{ printf "%.2f" .ViewState.beneficiary.Data.wallet }} €{{else}}0.00 €{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-        </tr>
-        {{range $index, $operation := .ViewState.beneficiary.Data.wallet_history}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if $operation.timestamp}}{{timeFormat $operation.timestamp "02/01/2006 15:04"}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-green-600 sm:pl-6">
-            {{if $operation.amount}}
-              {{if or (eq $operation.operation_type "credit") (not $operation.operation_type)}}
-                {{ printf "%.2f" $operation.amount }} €
-              {{end}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-red-600 sm:pl-6">
-            {{if eq $operation.operation_type "debit"}}
-              {{ printf "%.2f" $operation.amount }} €
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.payment_method}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.description}}
-          </td>
-        </tr>
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucune opération enregistrée</p>
-  </div>
-  {{end}}
-
 </div>
 {{end}}
--- a/web/layouts/beneficiaries/create-diag.html
+++ b/web/layouts/beneficiaries/create-diag.html
@@ -0,0 +1,110 @@
+{{define "content"}}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            name: null,
+            namespace: 'parcoursmob_beneficiaries',
+        },
+        rules: {
+            name: ['required'],
+            namespace: ['required'],
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
+                        pour créer un diagnostic dans PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="name" id="name" autocomplete="name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" name="namespace" value="parcoursmob_beneficiaries" />
+        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
+                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.json_schema" @blur="validateField('json_schema')"
+                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
+                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
+                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div> -->
+        <div class="flex justify-end">
+            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
+            <a href="/app/beneficiaries/{{.ViewState.beneficiary}}">
+                <button type="button"
+                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+            </a>
+            <button type="submit"
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
+        </div>
+    </form>
+</div>
+{{end}}
--- a/web/layouts/beneficiaries/create.html
+++ b/web/layouts/beneficiaries/create.html
@@ -111,12 +111,6 @@
                                x-model="fields.file_number" @blur="validateField('file_number')"
                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                        </div>
-
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
-
-                    <!-- will dolater : tags, groups, ... -->
-
                    </div>
                </div>
            </div>
@@ -131,34 +125,74 @@
                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                    <div class="grid grid-cols-6 gap-6">

-                        {{range .ViewState.profile_optional_fields}}
                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
+                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    {{if eq .name "gender"}}x-model="gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
+                                    <option value="0">Inconnu</option>
+                                    <option value="1">Masculin</option>
+                                    <option value="2">Féminin</option>
+                                    <option value="9">Sans objet</option>
                                </select>
                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="situation" class="block text-sm font-medium text-gray-700">Situation sociale</label>
+                            <div class="sm:mt-0 sm:col-span-2">
+                                <select id="situation" name="situation" autocomplete="situation" x-model="other_properties.situation"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                    <option value="">Inconnu</option>
+                                    <option value="BRSA">BRSA</option>
+                                    <option value="Demandeur d'emploi">Demandeur d'emploi</option>
+                                    <option value="Chantier">Chantier d'insertion</option>
+                                    <option value="Jeune -25">Jeune -25</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="situation" class="block text-sm font-medium text-gray-700">Motif d'inscription</label>
+                            <div class="sm:mt-0 sm:col-span-2">
+                                <select id="situation" name="situation" autocomplete="situation" x-model="other_properties.subscription_reason"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                    <option value="Autre">Inconnu</option>
+                                    <option value="Pas de permis">Pas de permis</option>
+                                    <option value="Pas de véhicule">Pas de véhicule</option>
+                                    <option value="Perte d'autonomie">Perte d'autonomie</option>
+                                    <option value="Autre">Autre</option>
+                                </select>
+                            </div>
+                        </div>
+                        {{if moduleAvailable "solidarity_transport"}}
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="status" class="block text-sm font-medium text-gray-700">Statut (prioritaire / non prioritaire)</label>
+                            <div class="sm:mt-0 sm:col-span-2">
+                                <select id="status" name="status" autocomplete="status" x-model="other_properties.status"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                    <option value="Non prioritaire">Non prioritaire</option>
+                                    <option value="Prioritaire">Prioritaire</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
+                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.last_subscription_date">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="previous_solidarity_transport" class="block text-sm font-medium text-gray-700">Nombre de transports solidaires précédents</label>
+                            <input type="number" name="previous solidarity_transport" id="previous_solidarity_transport" placeholder="0"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.previous_solidarity_transport">
                        </div>
                        {{end}}
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
+                            <textarea name="comment" id="comment"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.comment"></textarea>
+                        </div>

                        <!-- <div class="col-span-3 sm:col-span-3">
                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
@@ -178,6 +212,22 @@
                </div>
            </div>
        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
+                    <p class="mt-1 text-sm text-gray-500">Paramètres liés au bénéficiaire, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
+
+                    {{ $fieldName := "address" }}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
+
+                    <!-- will dolater : tags, groups, ... -->
+
+                </div>
+            </div>
+        </div>

        <div class="flex justify-end">
            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
--- a/web/layouts/beneficiaries/display.html
+++ b/web/layouts/beneficiaries/display.html
@@ -125,7 +125,7 @@
            </section>

            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: '{{ if .ViewState.tab }}{{ .ViewState.tab }}{{ else }}documents{{ end }}',
+                    tab: 'documents',
                    to(event) {
                        this.tab = event.target.value
                    }
@@ -189,17 +189,16 @@
                                            Transport solidaire </a>
                                        {{end}}

-                                        {{if moduleAvailable "organized_carpool"}}
-                                        <a href="#" @click="tab = 'organized_carpool'"
-                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'organized_carpool' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Covoiturage solidaire </a>
-                                        {{end}}

                                        <a href="#" @click="tab = 'organizations'"
                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                            :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                            Gestionnaires </a>
+
+                                        <!--<a href="#" @click="tab = 'diags'"
+                                            class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                            :class="tab == 'diags' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                            Diagnostics </a>-->
                                    </nav>
                                </div>
                            </div>
@@ -209,8 +208,8 @@
                        <div x-show="tab == 'notes'">{{template "beneficiary_notes" .}}</div>
                        <div x-show="tab == 'wallet'">{{template "beneficiary_wallet" .}}</div>
                        {{if moduleAvailable "solidarity_transport"}}<div x-show="tab == 'solidarity_transport'">{{template "beneficiary_solidarity_transport" .}}</div>{{end}}
-                        {{if moduleAvailable "organized_carpool"}}<div x-show="tab == 'organized_carpool'">{{template "beneficiary_organized_carpool" .}}</div>{{end}}
                        <div x-show="tab == 'organizations'">{{template "beneficiary_organizations" .}}</div>
+                        <!--<div x-show="tab == 'diags'">{{template "beneficiary_diags" .}}</div>-->
                    </div>
                </div>
            </section>
--- a/web/layouts/beneficiaries/list.html
+++ b/web/layouts/beneficiaries/list.html
@@ -14,15 +14,6 @@
                    Exporter
                </button>
            </a>
-            {{if .ViewState.Archived}}
-            <a href="/app/beneficiaries/">
-                <button type="button"
-                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                    {{$.IconSet.Icon "hero:outline/archive-box-x-mark" "h-5 w-5 mr-3"}}
-                    Bénéficiaires actifs
-                </button>
-            </a>
-            {{else}}
            <a href="/app/beneficiaries/?archived=true">
                <button type="button"
                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
@@ -30,7 +21,6 @@
                    Bénéficiaires archivés
                </button>
            </a>
-            {{end}}
            <a href="/app/beneficiaries/create">
                <button type="button"
                    class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
--- a/web/layouts/beneficiaries/update.html
+++ b/web/layouts/beneficiaries/update.html
@@ -7,15 +7,15 @@
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
    x-data="{
        fields: {
-            first_name: '{{ .ViewState.beneficiary.Data.first_name }}',
-            last_name: '{{ .ViewState.beneficiary.Data.last_name }}',
-            email: '{{ .ViewState.beneficiary.Data.email }}',
-            phone_number: '{{ .ViewState.beneficiary.Data.phone_number }}',
-            birthdate: {{if .ViewState.beneficiary.Data.birthdate}}'{{ (timeFrom .ViewState.beneficiary.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
-            file_number: '{{ .ViewState.beneficiary.Data.file_number }}',
-            gender: {{.ViewState.beneficiary.Data.gender}}
+            first_name: '{{ .ViewState.Data.first_name }}',
+            last_name: '{{ .ViewState.Data.last_name }}',
+            email: '{{ .ViewState.Data.email }}',
+            phone_number: '{{ .ViewState.Data.phone_number }}',
+            birthdate: {{if .ViewState.Data.birthdate}}'{{ (timeFrom .ViewState.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
+            file_number: '{{ .ViewState.Data.file_number }}',
+            gender: {{.ViewState.Data.gender}}
        },
-        other_properties: {{if .ViewState.beneficiary.Data.other_properties}}{{ json .ViewState.beneficiary.Data.other_properties }}{{else}}{}{{end}},
+        other_properties: {{if .ViewState.Data.other_properties}}{{ json .ViewState.Data.other_properties }}{{else}}{}{{end}},
        other_properties_serialized: null,
        rules: {
            first_name: ['required'],
@@ -114,14 +114,6 @@
                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                        </div>

-		    {{ $fieldName := "address" }}
-                    {{if .ViewState.beneficiary.Data.address}}
-                    {{$default := .ViewState.beneficiary.Data.address}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
-                    {{end}}
-
                    </div>
                </div>
            </div>
@@ -135,42 +127,118 @@
                </div>
                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                    <div class="grid grid-cols-6 gap-6">
-                        {{range .ViewState.profile_optional_fields}}
                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
+                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    {{if eq .name "gender"}}x-model="fields.gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
-                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
+                                <select id="gender" name="gender" autocomplete="gender" x-model="fields.gender"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-3xs-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                    <option value="0">Inconnu</option>
+                                    <option value="1" :selected="fields.gender == '1'">Masculin</option>
+                                    <option value="2" :selected="fields.gender == '2'">Féminin</option>
+                                    <option value="9" :selected="fields.gender == '9'">Sans objet</option>
                                </select>
                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="situation" class="block text-sm font-medium text-gray-700">Situation sociale</label>
+                            <div class="sm:mt-0 sm:col-span-2">
+                                <select id="situation" name="situation" autocomplete="situation" x-model="other_properties.situation"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                    <option value="">Inconnu</option>
+                                    <option value="BRSA">BRSA</option>
+                                    <option value="Demandeur d'emploi">Demandeur d'emploi</option>
+                                    <option value="Chantier">Chantier</option>
+                                    <option value="Jeune -25">Jeune -25</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="situation" class="block text-sm font-medium text-gray-700">Motif d'inscription</label>
+                            <div class="sm:mt-0 sm:col-span-2">
+                                <select id="subscription_reason" name="subscription_reason" autocomplete="subscription_reason" x-model="other_properties.subscription_reason"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                    <option value="Autre">Inconnu</option>
+                                    <option value="Pas de permis">Pas de permis</option>
+                                    <option value="Pas de véhicule">Pas de véhicule</option>
+                                    <option value="Perte d'autonomie">Perte d'autonomie</option>
+                                    <option value="Autre">Autre</option>
+                                </select>
+                            </div>
+                        </div>
+                        {{if moduleAvailable "solidarity_transport"}}
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="status" class="block text-sm font-medium text-gray-700">Statut (prioritaire / non prioritaire)</label>
+                            <div class="sm:mt-0 sm:col-span-2">
+                                <select id="status" name="status" autocomplete="status" x-model="other_properties.status"
+                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
+                                    <option value="Non prioritaire">Non prioritaire</option>
+                                    <option value="Prioritaire">Prioritaire</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
+                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.last_subscription_date">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="previous_solidarity_transport" class="block text-sm font-medium text-gray-700">Nombre de transports solidaires précédents</label>
+                            <input type="text" name="previous solidarity_transport" id="previous_solidarity_transport" placeholder="0"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.previous_solidarity_transport">
+                        </div>
+                        {{end}}
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
+                            <textarea name="comment" id="comment"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.comment"></textarea>
+                        </div>
+
+
+                        <!-- <div class="col-span-3 sm:col-span-3">
+                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
+                            <div class="mt-1 flex items-center space-x-5">
+                                <span class="inline-block h-12 w-12 rounded-co overflow-hidden bg-gray-100">
+                                    {{.IconSet.Icon "img:profile-picture-placeholder" "h-full w-full"}}
+                                </span>
+                                <button type="button"
+                                    class="bg-white py-2 px-3 border border-gray-300 rounded-2xl shadow-sm text-sm leading-4 font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                                    Charger la photo
+                                </button>
+                            </div>
+                        </div> -->
+
+
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
+                    <p class="mt-1 text-sm text-gray-500">Paramètres liés au bénéficiaire, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
+
+                    {{ $fieldName := "address" }}
+                    {{if .ViewState.Data.address}}
+                    {{$default := .ViewState.Data.address}}
+                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
                    {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
                    {{end}}
-                        </div>
-                        {{end}}
-                    </div>
+                    <!-- will dolater : tags, groups, ... -->
+
                </div>
            </div>
        </div>

        <div class="flex justify-end">
            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/beneficiaries/{{.ViewState.beneficiary.ID}}">
+            <a href="/app/beneficiaries/{{.ViewState.ID}}">
                <button type="button"
                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
            </a>
--- a/web/layouts/dashboard/_partials/beneficiaries-widget.html
+++ b/web/layouts/dashboard/_partials/beneficiaries-widget.html
@@ -10,12 +10,12 @@
        </div> -->
    </div>
    <ul role="list" class="divide-y divide-gray-200 flex-1">
-	{{range $index, $el := .latest}}{{if gt $index 4}}{{break}}{{end}}
+        {{range .latest}}
            <li class="py-2 px-4 flex">
-                <a href="/app/beneficiaries/{{$el.ID}}" class="flex w-full">
-                <img class="h-6 w-6 rounded-co" src="/app/beneficiaries/{{$el.ID}}/picture" alt="">
+                <a href="/app/beneficiaries/{{.ID}}" class="flex w-full">
+                <img class="h-6 w-6 rounded-co" src="/app/beneficiaries/{{.ID}}/picture" alt="">
                <div class="ml-3">
-                    <p class="text-sm font-medium text-gray-900">{{$el.Data.first_name}} {{$el.Data.last_name}}</p>
+                    <p class="text-sm font-medium text-gray-900">{{.Data.first_name}} {{.Data.last_name}}</p>
                </div>
            </a>
            </li>
--- a/web/layouts/dashboard/_partials/bookings-widget.html
+++ b/web/layouts/dashboard/_partials/bookings-widget.html
@@ -7,7 +7,7 @@
    </div>
    <ul role="list" class="divide-y divide-gray-200 flex-1">
        {{range .}}
-        {{if not .Deleted}}
+        {{if or (eq .Data.Deleted nil) (eq .Data.Deleted false)}}
            <li class="py-2 px-4 flex">
                <a href="/app/vehicles-management/bookings/{{.ID}}" class="flex w-full">
                <div class="ml-3">
--- a/web/layouts/dashboard/_partials/drivers-map-widget.html
+++ b/web/layouts/dashboard/_partials/drivers-map-widget.html
@@ -1,190 +0,0 @@
-{{define "drivers_map_widget"}}
-<div class="bg-white overflow-hidden shadow rounded-2xl">
-    <div class="p-6">
-        <div class="flex items-center justify-between mb-4">
-            <h3 class="text-lg leading-6 font-medium text-gray-900">
-                Carte des conducteurs
-            </h3>
-            {{if .geography_filters_enabled}}
-            <form>
-                <div class="grid grid-cols-1">
-                    <select id="driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-                        <option value="">Toutes les zones</option>
-                        {{range .geography_filters_list}}
-                        {{$geoValue := printf "%s:%s" .layer .code}}
-                        <option value="{{$geoValue}}"{{if eq $.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-                        {{end}}
-                    </select>
-                    <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-                        <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-                    </svg>
-                </div>
-            </form>
-            {{end}}
-        </div>
-
-        <div id="drivers-map" class="w-full rounded-lg overflow-hidden border border-gray-200" style="height: 500px;"></div>
-
-        <div class="mt-4 flex items-center justify-center gap-6 text-sm">
-            {{if moduleAvailable "solidarity_transport"}}
-            <div class="flex items-center">
-                <div class="w-6 h-6 rounded-co bg-co-blue border border-white shadow-md mr-2"></div>
-                <span class="text-gray-700">Transport solidaire ({{len .solidarity_drivers}})</span>
-            </div>
-            {{end}}
-            {{if moduleAvailable "organized_carpool"}}
-            <div class="flex items-center">
-                <div class="w-6 h-6 rounded-co bg-co-green border border-white shadow-md mr-2"></div>
-                <span class="text-gray-700">Covoiturage solidaire ({{len .organized_carpool_drivers}})</span>
-            </div>
-            {{end}}
-        </div>
-    </div>
-</div>
-
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    // Check if map libraries are available
-    if (typeof maplibregl === 'undefined' || typeof pmtiles === 'undefined') {
-        console.warn('Map libraries not available');
-        return;
-    }
-
-    // Initialize PMTiles protocol
-    let protocol = new pmtiles.Protocol();
-    maplibregl.addProtocol("pmtiles", protocol.tile);
-
-    // Initialize map centered on France with protomaps style
-    const map = new maplibregl.Map({
-        container: 'drivers-map',
-        style: '/public/maps/protomaps-light/style.json',
-        center: [2.3522, 48.8566], // Paris
-        zoom: 5
-    });
-
-    map.addControl(new maplibregl.NavigationControl(), 'top-right');
-
-    const bounds = new maplibregl.LngLatBounds();
-    let hasMarkers = false;
-
-    map.on('load', function() {
-        // Add solidarity transport drivers
-        {{if moduleAvailable "solidarity_transport"}}
-        const solidarityDrivers = [
-            {{range .solidarity_drivers}}
-            {{if .Data.address}}
-            {
-                name: '{{.Data.first_name}} {{.Data.last_name}}',
-                coordinates: {{if and .Data.address.geometry .Data.address.geometry.coordinates}}[{{index .Data.address.geometry.coordinates 0}}, {{index .Data.address.geometry.coordinates 1}}]{{else}}null{{end}},
-                address: {{if .Data.address.properties}}'{{.Data.address.properties.label}}'{{else}}''{{end}},
-                type: 'solidarity-transport',
-                driverId: '{{.ID}}'
-            },
-            {{end}}
-            {{end}}
-        ].filter(d => d.coordinates !== null);
-
-        solidarityDrivers.forEach(function(driver) {
-            // Create custom marker element matching compact search style
-            const el = document.createElement('div');
-            el.className = 'w-8 h-8 rounded-co bg-co-blue border border-white shadow-md flex items-center justify-center cursor-pointer';
-
-            // User icon matching compact search
-            el.innerHTML = `
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-                    <circle cx="12" cy="7" r="4"></circle>
-                </svg>
-            `;
-
-            const marker = new maplibregl.Marker({element: el})
-                .setLngLat(driver.coordinates)
-                .setPopup(new maplibregl.Popup({offset: 25, className: 'rounded-lg'})
-                    .setHTML(`
-                        <div class="p-3">
-                            <a href="/app/solidarity-transport/drivers/${driver.driverId}" class="font-semibold text-sm text-gray-900 hover:text-co-blue">${driver.name}</a>
-                            <p class="text-xs text-gray-600 mt-1">${driver.address}</p>
-                            <p class="text-xs text-co-blue font-medium mt-2">Transport solidaire</p>
-                        </div>
-                    `))
-                .addTo(map);
-
-            bounds.extend(driver.coordinates);
-            hasMarkers = true;
-        });
-        {{end}}
-
-        // Add organized carpool drivers
-        {{if moduleAvailable "organized_carpool"}}
-        const organizedCarpoolDrivers = [
-            {{range .organized_carpool_drivers}}
-            {{if .Data.address}}
-            {
-                name: '{{.Data.first_name}} {{.Data.last_name}}',
-                coordinates: {{if and .Data.address.geometry .Data.address.geometry.coordinates}}[{{index .Data.address.geometry.coordinates 0}}, {{index .Data.address.geometry.coordinates 1}}]{{else}}null{{end}},
-                address: {{if .Data.address.properties}}'{{.Data.address.properties.label}}'{{else}}''{{end}},
-                type: 'organized-carpool',
-                driverId: '{{.ID}}'
-            },
-            {{end}}
-            {{end}}
-        ].filter(d => d.coordinates !== null);
-
-        organizedCarpoolDrivers.forEach(function(driver) {
-            // Create custom marker element matching compact search style
-            const el = document.createElement('div');
-            el.className = 'w-8 h-8 rounded-co bg-co-green border border-white shadow-md flex items-center justify-center cursor-pointer';
-
-            // User icon matching compact search
-            el.innerHTML = `
-                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                    <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-                    <circle cx="12" cy="7" r="4"></circle>
-                </svg>
-            `;
-
-            const marker = new maplibregl.Marker({element: el})
-                .setLngLat(driver.coordinates)
-                .setPopup(new maplibregl.Popup({offset: 25, className: 'rounded-lg'})
-                    .setHTML(`
-                        <div class="p-3">
-                            <a href="/app/organized-carpool/drivers/${driver.driverId}" class="font-semibold text-sm text-gray-900 hover:text-co-green">${driver.name}</a>
-                            <p class="text-xs text-gray-600 mt-1">${driver.address}</p>
-                            <p class="text-xs text-co-green font-medium mt-2">Covoiturage solidaire</p>
-                        </div>
-                    `))
-                .addTo(map);
-
-            bounds.extend(driver.coordinates);
-            hasMarkers = true;
-        });
-        {{end}}
-
-        // Fit map to markers bounds with padding
-        if (hasMarkers) {
-            map.fitBounds(bounds, {
-                padding: 50,
-                maxZoom: 12
-            });
-        }
-    });
-});
-</script>
-
-<style>
-.maplibregl-popup-content {
-    padding: 0;
-    border-radius: 0.5rem;
-    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
-}
-.maplibregl-popup-close-button {
-    font-size: 20px;
-    padding: 4px;
-    color: #6B7280;
-}
-.maplibregl-popup-close-button:hover {
-    background-color: #F3F4F6;
-    color: #111827;
-}
-</style>
-{{end}}
--- a/web/layouts/dashboard/dashboard.html
+++ b/web/layouts/dashboard/dashboard.html
@@ -14,12 +14,40 @@
        <div
          class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
          <div class="flex-1 px-4 py-2 text-sm truncate">
-            <a href="/app/beneficiaries/" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
+            <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
            <p class="text-gray-500">{{.ViewState.beneficiaries.count}} bénéficiaires</p>
          </div>
        </div>
      </li>
  
+      <li class="col-span-1 flex shadow-sm rounded-3xl">
+        <div
+          class="flex-shrink-0 flex items-center justify-center w-16 bg-co-green text-white text-sm font-medium rounded-l-3xl">
+          {{.IconSet.Icon "hero:outline/shield-check" "h-6 w-6"}}
+        </div>
+        <div
+          class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
+          <div class="flex-1 px-4 py-2 text-sm truncate">
+            <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Accompagnement</a>
+            <p class="text-gray-500">0 actions réalisées</p>
+          </div>
+        </div>
+      </li>
+  
+      <li class="col-span-1 flex shadow-sm rounded-3xl">
+        <div
+          class="flex-shrink-0 flex items-center justify-center w-16 bg-co-yellow text-white text-sm font-medium rounded-l-3xl">
+          {{.IconSet.Icon "hero:outline/office-building" "h-6 w-6"}}
+        </div>
+        <div
+          class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
+          <div class="flex-1 px-4 py-2 text-sm truncate">
+            <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Groupes</a>
+            <p class="text-gray-500">0 groupes créés</p>
+          </div>
+        </div>
+      </li>
+  
      <li class="col-span-1 flex shadow-sm rounded-3xl">
        <div
          class="flex-shrink-0 flex items-center justify-center w-16 bg-co-red text-white text-sm font-medium rounded-l-3xl">
@@ -33,44 +61,6 @@
          </div>
        </div>
      </li>
-
-      {{if moduleAvailable "solidarity_transport"}}
-      <li class="col-span-1 flex shadow-sm rounded-3xl">
-        <div
-          class="flex-shrink-0 flex items-center justify-center w-16 bg-co-orange text-white text-sm font-medium rounded-l-3xl">
-          <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-          </svg>
-        </div>
-        <div
-          class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
-          <div class="flex-1 px-4 py-2 text-sm truncate">
-            <a href="/app/solidarity-transport/?tab=drivers" class="text-gray-900 font-medium hover:text-gray-600">Conducteurs solidaires</a>
-            <p class="text-gray-500">{{len .ViewState.solidarity_drivers}} conducteurs</p>
-          </div>
-        </div>
-      </li>
-      {{end}}
-
-      {{if moduleAvailable "organized_carpool"}}
-      <li class="col-span-1 flex shadow-sm rounded-3xl">
-        <div
-          class="flex-shrink-0 flex items-center justify-center w-16 bg-co-green text-white text-sm font-medium rounded-l-3xl">
-          <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-          </svg>
-        </div>
-        <div
-          class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
-          <div class="flex-1 px-4 py-2 text-sm truncate">
-            <a href="/app/organized-carpool/?tab=drivers" class="text-gray-900 font-medium hover:text-gray-600">Covoitureurs solidaires</a>
-            <p class="text-gray-500">{{len .ViewState.organized_carpool_drivers}} covoitureurs</p>
-          </div>
-        </div>
-      </li>
-      {{end}}
    </ul>
  </div>

@@ -89,11 +79,5 @@
      {{end}}

    </div>
-
-    {{if or (moduleAvailable "solidarity_transport") (moduleAvailable "organized_carpool")}}
-    <div class="py-4">
-      {{template "drivers_map_widget" .ViewState}}
-    </div>
-    {{end}}
 </div>
 {{end}}
--- a/web/layouts/organized_carpool/_partials/driver_documents.html
+++ b/web/layouts/organized_carpool/_partials/driver_documents.html
@@ -1,9 +1,9 @@
-{{define "driver_files"}}
+{{define "diags_files"}}
 <div class="px-4 py-6 sm:px-6"
 x-data="{
    fields: {
        name: null,
-        type: null,
+        type: diagnostic,
        file: null,
    },
    rules: {
@@ -39,7 +39,6 @@ x-data="{
    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
    {{end}}
    
-
    {{if gt (len .ViewState.documents) 0}}
    
    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
@@ -65,20 +64,9 @@ x-data="{
              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <div class="flex gap-2 justify-end">
-                  <a href="/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}" target="_blank">
-                  <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">
-                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-4 w-4 mr-1"}}
-                    Télécharger<span class="sr-only"> le document</span>
-                  </button>
+                <a href="/app/diags/{{$.ViewState.diag.ID}}/documents/{{.FileName}}" target="_blank">
+                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
                </a>
-                  <button type="button"
-                    onclick="if(confirm('Êtes-vous sûr de vouloir supprimer ce document ?')) { window.location.href='/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}/delete'; }"
-                    class="inline-flex items-center rounded-md border border-transparent bg-co-red px-3 py-2 text-sm font-medium leading-4 text-white shadow-sm hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2">
-                    {{$.IconSet.Icon "hero:outline/trash" "h-4 w-4 mr-1"}}
-                    Supprimer<span class="sr-only"> le document</span>
-                  </button>
-                </div>
              </td>
            </tr>
            {{end}}
@@ -90,9 +78,8 @@ x-data="{
      </div>
    
    {{end}}
-
    <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/organized-carpool/drivers/{{.ViewState.driver.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
+    <form method="POST" action="/app/diags/{{.ViewState.diag.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
        <div class="md:grid md:grid-cols-6 p-2">
          <div class="sm:col-span-2">
            <label for="type" class="block text-sm font-medium text-gray-700">Type</label>
@@ -100,7 +87,7 @@ x-data="{
                x-model="fields.type" @blur="validateField('type')"
                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                <option value="" selected>Sélectionner un type</option>
-                    {{range .ViewState.drivers_file_types}}
+                {{range .ViewState.events_file_types}}
                <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
                {{end}}
            </select>
@@ -109,7 +96,7 @@ x-data="{
                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
                      <input type="text" name="name" id="name"
                          placeholder="Nom du fichier"
-                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl p-2"
+                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl"
                          x-model="fields.name" @blur="validateField('name')"
                          :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
              </div>
@@ -131,9 +118,7 @@ x-data="{
                        
                    </div>
                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
-                    <template x-if="fields.file">
-                      <p class="text-co-blue p-2" x-text="fields.file"></p>
-                    </template>
+                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
                  </div>
                </div>
              </div>
@@ -143,6 +128,5 @@ x-data="{
            Ajouter le document
        </button>
    </form>
-
 </div>
 {{end}}
--- a/web/layouts/diags/delete-diag.html
+++ b/web/layouts/diags/delete-diag.html
@@ -0,0 +1,32 @@
+{{define "content"}}
+<div>
+        <form method="POST" >
+
+            <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
+        
+            <div class="fixed inset-0 z-10 overflow-y-auto">
+            <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+
+                <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
+                <div>
+                    <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
+                    {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
+                    </div>
+                    <div class="mt-3 text-center sm:mt-5">
+                        <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Confirmation de retrait</h3>
+                        <div class="mt-2">
+                            <p class="text-sm text-gray-500">Voulez-vous vraiment retirer ce dignostique ?</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
+                    <a href="/app/diags/{{.ViewState.diag.ID}}" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
+                    <button  type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button>
+                </div>
+                </div>
+            </div>
+            </div>
+        </form>
+
+ </div>
+{{end}}
--- a/web/layouts/diags/display-diag.html
+++ b/web/layouts/diags/display-diag.html
@@ -0,0 +1,80 @@
+{{ define "content" }}
+<main class="py-10">
+    <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
+        <div class="flex items-center space-x-5">
+            <div>
+                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.diag.Name}}</h1>
+            </div>
+            {{$diag := .ViewState.diag.ID}}
+        </div>
+        <div
+        class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
+            {{if eq .ViewState.diag.Deleted false}}
+            <a href="/app/diags/{{$diag}}/update" class="inline-flex"><button type="button"
+                class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
+            <a href="/app/diags/{{$diag}}/delete" class="inline-flex"><button type="button"
+                class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer</button></a>
+            {{end}}
+        </div>
+    </div>
+    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
+        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
+            <section aria-labelledby="diag-information-title">
+                <div class="bg-white shadow sm:rounded-lg">
+                    <div class="px-4 py-5 sm:px-6">
+                        <h2 id="diag" class="text-lg leading-6 font-medium text-gray-900">Informations</h2>
+                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations sur le diagnostic.</p>
+                    </div>
+                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Date du diagnostic</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{(timeFrom .ViewState.diag.Diagdate).Format "02/01/2006"}}</dd>
+                            </div>
+                            {{if eq .ViewState.diag.Namespace "parcoursmob_beneficiaries"}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Type</dt>
+                                <dd class="mt-1 text-sm text-gray-900">Diagnostic personnelle</dd>
+                            </div>
+                            {{end}}
+                            {{if eq .ViewState.diag.Namespace "parcoursmob_vehicles"}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Type</dt>
+                                <dd class="mt-1 text-sm text-gray-900">Diagnostic automobile</dd>
+                            </div>
+                            {{end}}
+                            {{if eq .ViewState.diag.Namespace "parcoursmob_bookings"}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Type</dt>
+                                <dd class="mt-1 text-sm text-gray-900">Diagnostic véhicule réservé</dd>
+                            </div>
+                            {{end}}
+                            <!-- {{if .ViewState.diag.Json_schema}}
+                            <div class="sm:col-span-2">
+                                <dt class="text-sm font-medium text-gray-500">JSON_schema</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.diag.Json_schema}}</dd>
+                            </div>
+                            {{end}}
+                            {{if .ViewState.diag.Ui_schema}}
+                            <div class="sm:col-span-2">
+                                <dt class="text-sm font-medium text-gray-500">UI_schema</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.diag.Ui_schema}}</dd>
+                            </div>
+                            {{end}} -->
+                        </dl>
+                    </div>
+                </div>
+            </section>
+            <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
+                <div class="space-y-6 lg:col-start-1 lg:col-span-2">
+                    <section aria-labelledby="event-documents">
+                        <div class="bg-white mt-4 px-4 py-5 shadow sm:rounded-lg sm:px-6">
+                            <h2 id="documents-title" class="text-lg font-medium text-gray-900">Documents</h2>
+                            <div class="flex justify-between items-center">
+                                <div>{{template "diags_files" .}}</div>
+                            </div>
+                        </div>
+                    </section>
+                </div>
+            </div>
+{{ end }}
--- a/web/layouts/diags/history-diags.html
+++ b/web/layouts/diags/history-diags.html
@@ -0,0 +1,73 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Diagnostics retirés</h1>
+
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <p class="mt-2 text-sm text-gray-700"></p>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/diags/">
+                <button type="button"
+                    class="inline-flex items-center justify-center mr-3 bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    Retour
+                </button>
+            </a>
+        </div>
+    </div>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Nom du diagnostic
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Type
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Actions</span>
+                                </th>
+                            </tr>
+                            <tbody class="divide-y divide-gray-200 bg-white">
+                                {{range .ViewState.diags}}
+                                {{if eq .Deleted true}}
+                                <a href="/app/diags/{{.ID}}">
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+
+                                        <div class="font-medium text-gray-900">{{.Name}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        {{if eq .Namespace "parcoursmob_beneficiaries"}}
+                                        <div class="text-gray-500">Diagnostic personnelle</div>
+                                        {{end}}
+                                        {{if eq .Namespace "parcoursmob_vehicles"}}
+                                        <div class="text-gray-500">Diagnostic automobile</div>
+                                        {{end}}
+                                        {{if eq .Namespace "parcoursmob_bookings"}}
+                                        <div class="text-gray-500">Diagnostic véhicule réservé</div>
+                                        {{end}}
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <a href="/app/diags/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
+                                    </td>
+                                </tr>
+                                </a>
+                                {{end}}
+                                {{end}}
+                            </tbody>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}
--- a/web/layouts/diags/home.html
+++ b/web/layouts/diags/home.html
@@ -0,0 +1,84 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Diagnostics effectués</h1>
+
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <p class="mt-2 text-sm text-gray-700"></p>
+        </div>
+        <!-- <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/diags/history">
+                <button type="button"
+                    class="inline-flex items-center justify-center mr-3 bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    {{$.IconSet.Icon "hero:outline/calendar" "h-5 w-5 mr-3"}}
+                    Historique
+                </button>
+            </a>
+        </div> -->
+    </div>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="mt-8 flex flex-col">
+        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
+            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
+                <div class="overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Nom du diagnostic
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Type
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Date
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Actions</span>
+                                </th>
+                            </tr>
+                            <tbody class="divide-y divide-gray-200 bg-white">
+                                {{range .ViewState.diags}}
+                                <a href="/app/diags/{{.ID}}">
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="font-medium text-gray-900">{{.Name}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        {{if eq .Namespace "parcoursmob_beneficiaries"}}
+                                        <div class="text-gray-500">Diagnostic personnelle</div>
+                                        {{end}}
+                                        {{if eq .Namespace "parcoursmob_vehicles"}}
+                                        <div class="text-gray-500">Diagnostic automobile</div>
+                                        {{end}}
+                                        {{if eq .Namespace "parcoursmob_bookings"}}
+                                        <div class="text-gray-500">Diagnostic véhicule réservé</div>
+                                        {{end}}
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="font-medium text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</div>
+                                    </td>
+                                    <td class="whitespace nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        {{if eq .Deleted true}}
+                                        <div class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Diagnostic retiré</div>
+                                        {{end}}
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <a href="/app/diags/{{.ID}}" target="_blank">
+                                            <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
+                                            </a>
+                                    </td>
+                                </tr>
+                                </a>
+                                {{end}}
+                            </tbody>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}
--- a/web/layouts/diags/update-diag.html
+++ b/web/layouts/diags/update-diag.html
@@ -0,0 +1,117 @@
+{{define "content"}}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Éditer un diagnostique</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            name: '{{.ViewState.diag.Name}}',
+            namespace: '{{.ViewState.diag.Namespace}}',
+            json_schema: '{{.ViewState.diag.Json_schema}}',
+            ui_schema: '{{.ViewState.diag.Ui_schema}}',
+        },
+        rules: {
+            name: ['required'],
+            namespace: ['required'],
+            json_schema: ['required'],
+            ui_schema: ['required']
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+                json_schema: {valid: null},
+                ui_schema: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
+                        pour éditer un diagnostique dans PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="name" id="name" autocomplete="given-name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
+                                value="{{.ViewState.diag.Name}}">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" name="namespace" value="{{.ViewState.diag.Namespace}}" />
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostique</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
+                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.json_schema" @blur="validateField('json_schema')"
+                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostique</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
+                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
+                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="flex justify-end">
+            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
+            <a href="/app/diags/{{.ViewState.diag.ID}}">
+                <button type="button"
+                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+            </a>
+            <button type="submit"
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Éditer le diagnostique</button>
+        </div>
+    </form>
+</div>
+{{end}}
--- a/web/layouts/journeys/_partials/journeys-all.html
+++ b/web/layouts/journeys/_partials/journeys-all.html
@@ -21,8 +21,8 @@
    <div class="px-4 pt-4 flex text-sm text-grey-900 font-bold">
        <div class="flex-1">
            {{.IconSet.Icon "tabler-icons:bus" "h-6 w-6 inline-flex mr-4"}}
-            {{ timeFormat $itinerary.StartTime "15:04" }} - {{ timeFormat $itinerary.EndTime "15:04" }}
-            ({{shortDuration $itinerary.Duration}})
+            {{$itinerary.StartTime.Format "15:04"}} - {{$itinerary.EndTime.Format "15:04"}}
+            ({{divideInt $itinerary.Duration 60}} Minutes)
        </div>
        <div></div>
    </div>
--- a/web/layouts/journeys/_partials/journeys-carpool.html
+++ b/web/layouts/journeys/_partials/journeys-carpool.html
@@ -7,53 +7,36 @@
 {{$first := true}}
 {{$i := 0}}
 {{range .ViewState.carpools}}
-{{$carpoolData := index .ExtraMembers "ocss"}}
 {{if $first}}
 {{$first = false}}
 <div class="p-4 pb-8">
 {{else}}
 <div class="p-4 border-t-2 pb-8">
 {{end}}
-    <div class="flex items-center justify-between mb-3">
-      <div class="flex-1">
-        <div class="text-sm text-grey-900 font-bold">Trajet en covoiturage avec {{$carpoolData.Driver.Alias}}</div>
-        {{$pickupDate := timeFrom $carpoolData.PassengerPickupDate}}
-        {{if $pickupDate}}<div class="text-xs text-gray-600">Départ {{$pickupDate}}</div>{{end}}
-      </div>
-      {{if and $carpoolData.Price $carpoolData.Price.Amount}}
-      <div class="text-lg font-bold text-co-blue">{{printf "%.2f" (round2 $carpoolData.Price.Amount)}}€</div>
-      {{end}}
+    <div class="flex text-sm text-grey-900 font-bold">
+      <div class="flex-1">Trajet en covoiturage avec {{.ExtraMembers.ocss.Driver.Alias}}</div>
    </div>
+    <!--{{if .ExtraMembers.ocss.PassengerPickupDate}}<div class="text-xs">Départ {{(timeFrom .ExtraMembers.ocss.PassengerPickupDate)}}</div>{{end}}-->
+    <!--<div class="flex items-center justify-center text-sm my-4">
+        <span class="ml-2 mt-1">
+        </span>
+        {{$.IconSet.Icon "hero:outline/chevron-right" "h-3 w-3 stroke-gray-800 m-2"}}
+        <span class="ml-2 mt-1">
+        </span>
+    </div>-->

-    <!-- Pickup and Drop addresses -->
-    <div class="mb-4 space-y-2">
-      {{if $carpoolData.PassengerPickupAddress}}
-      <div class="flex items-start gap-2 text-sm">
-        {{$.IconSet.Icon "hero:outline/map-pin" "h-4 w-4 text-co-green mt-0.5"}}
-        <div>
-          <div class="text-xs text-gray-500">Départ</div>
-          <div class="text-gray-900">{{$carpoolData.PassengerPickupAddress}}</div>
-        </div>
-      </div>
-      {{end}}
-      {{if $carpoolData.PassengerDropAddress}}
-      <div class="flex items-start gap-2 text-sm">
-        {{$.IconSet.Icon "hero:outline/flag" "h-4 w-4 text-co-red mt-0.5"}}
-        <div>
-          <div class="text-xs text-gray-500">Arrivée</div>
-          <div class="text-gray-900">{{$carpoolData.PassengerDropAddress}}</div>
-        </div>
-      </div>
-      {{end}}
-    </div>
+    <div class="p-4 pb-8 flex items-center justify-center">
+        <!--<span class="text-xs text-md">Avec </span>
+        <span class="ml-2 mt-1 h-5 rounded-xl bg-gray-200 flex items-center justify-center ring-8 ring-white text-black p-2 text-sm">
+        </span>-->
+
+        <span class="text-xs text-md"> sur l'application </span>
+        <span class="ml-2 rounded-xl px-2 py-1 bg-co-blue flex items-center justify-center ring-8 ring-white text-sm text-white whitespace-nowrap">
+            Blablacar Daily
+        </span>

-    <div class="text-center">
-        {{if $carpoolData.WebUrl}}
-        <a href="{{$carpoolData.WebUrl}}" target="_blank" class="inline-block rounded-xl px-4 py-1 bg-co-blue text-white text-sm hover:bg-co-darkblue transition-colors">
-            <span>Voir l'offre sur </span><span>{{$carpoolData.Operator}}</span>
-        </a>
-        {{end}}
    </div>
+    <p class=" text-center text-xs">Accéder au trajet :<br /> <a href="{{.ExtraMembers.ocss.WebUrl}}" class="text-co-blue">{{.ExtraMembers.ocss.WebUrl}}</a></p>
    <div  x-data="{dialog{{$i}}: false}" class="text-center">
        <button @click="dialog{{$i}} = !dialog{{$i}}" class="m-4 rounded-xl px-4 py-1 mt-8 bg-gray-200 text-co-blue text-sm">Envoyer le lien par SMS</button>
        <div x-show="dialog{{$i}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
--- a/web/layouts/journeys/_partials/journeys-local-solutions.html
+++ b/web/layouts/journeys/_partials/journeys-local-solutions.html
@@ -1,13 +0,0 @@
-
-{{define "journeys_local_solutions"}}
-<!--KNOWLEDGE BASE-->
-<div class="p-10">
-  {{ range .ViewState.kb_data }}
-    <div class="m-4">
-      <h2 class="text-sm font-bold">{{.title}}</h2>
-      <p class="text-sm">{{.description}}</p>
-      <p class="text-sm text-co-blue"><a href="{{.url}}" target="_blank">Voir plus ...</a></p>
-    </div>
-  {{ end }}
-</div>
-{{end}}
--- a/web/layouts/journeys/_partials/journeys-organized-carpools.html
+++ b/web/layouts/journeys/_partials/journeys-organized-carpools.html
@@ -5,12 +5,13 @@
 <p class="p-12 text-gray-500 text-center text-md">Aucun covoitureur solidaire disponible pour ce trajet.</p>
 {{else}}

+<h3 class="p-4 text-lg">Covoitureurs solidaires</h3>
 <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
  <thead class="bg-gray-50">
    <tr>
      <th scope="col"
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Covoitureurs solidaires
+          Covoitureurs disponibles
      </th>
      <th scope="col"
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
@@ -22,11 +23,7 @@
      </th>
      <th scope="col"
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date et heure
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Profil validé
+          Distance du covoiturage
      </th>
      <th scope="col"
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
@@ -41,21 +38,10 @@
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDepartureAddress }}</td>
      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverArrivalAddress }}</td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ if .PassengerPickupDate }}
-          {{ .PassengerPickupDate.AsTime.Format "02/01/2006 15:04" }}
-        {{ end }}
-      </td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{if carpoolDriverValidatedProfile $driver (carpoolDocuments $driver.ID) }}
-        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-        {{else}}
-        <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-        {{end}}
-      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Distance }} km</td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
        <a class="text-co-blue hover:text-co-blue" 
-          href="/app/organized-carpool/drivers/{{$driver.ID}}/journeys/{{.Id}}?passengerid={{$.ViewState.passengerid}}">
+          href="/app/organized-carpool/drivers/{{$driver.ID}}/journeys/{{.Id}}?{{unescapeHTML $.ViewState.querystring}}">
          Organiser
        </a>
      </td>
--- a/web/layouts/journeys/_partials/journeys-others.html
+++ b/web/layouts/journeys/_partials/journeys-others.html
@@ -1,14 +1,5 @@
 {{define "journeys_others"}}
-<!--KNOWLEDGE BASE-->
-<div class="p-10">
-  {{ range .ViewState.kb_data }}
-    <div class="m-4">
-      <h2 class="text-sm font-bold">{{.title}}</h2>
-      <p class="text-sm">{{.description}}</p>
-      <p class="text-sm text-co-blue"><a href="{{.url}}">Voir plus ...</a></p>
-    </div>
-  {{ end }}
-</div>
+
 <!--VEHICLES-->
 {{if moduleAvailable "vehicles"}}
 <div class="p-4 flex text-sm text-grey-900">
@@ -25,6 +16,7 @@
      <tr>
        <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 md:pl-0">Véhicule</th>
        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Numéro</th>
+        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Gestionnaire</th>
        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Lieu</th>
      </tr>
    </thead>
@@ -33,6 +25,7 @@
      <tr>
        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 md:pl-0">{{.Data.name}}</td>
        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{.Data.licence_plate}}</td>
+        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">COOPGO</td>
        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
      </tr>
      {{end}}
--- a/web/layouts/journeys/_partials/journeys-public-transit-transitous.html
+++ b/web/layouts/journeys/_partials/journeys-public-transit-transitous.html
@@ -2,8 +2,8 @@
 {{ range .ViewState.journeys }}
 <div class="p-4 pb-8">
    <div class="flex text-md text-grey-900 font-bold">
-        <div class="flex-1">{{ timeFormat .StartTime "15:04" }} - {{ timeFormat .EndTime "15:04" }}</div>
-        <div>{{ shortDuration .Duration }}</div>
+        <div class="flex-1">{{ .StartTime.Format "15:04" }} - {{ .EndTime.Format "15:04" }}</div>
+        <div>{{ divideInt .Duration 60 }} Minutes</div>
    </div>
    <div class="flow-root">
        <ul role="list" class="-mb-8">
@@ -30,7 +30,7 @@
                          </div>
                          {{ else }}
                          <div>
-                            <p class="text-xs text-gray-500">Attendre  <a href="#" class="font-medium text-gray-900">{{ shortDuration .Duration }}</a></p>
+                            <p class="text-xs text-gray-500">Attendre  <a href="#" class="font-medium text-gray-900">{{ divideInt .Duration 60 }} minutes</a></p>
                          </div>
                          {{ end }}
                        </div>
@@ -57,7 +57,7 @@
                      </div>
                      <div class="ml-16 pt-2">
                        <div>
-                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{timeFormat .StartTime "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{timeFormat .EndTime "15:04"}}</a></p>
+                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{.StartTime.Format "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{.EndTime.Format "15:04"}}</a></p>
                          </div>
                          <div>
                            <p class="text-sm text-gray-500">De <a href="#" class="font-medium text-gray-900">{{.From.Name}}</a> à <a href="#" class="font-medium text-gray-900">{{.To.Name}}</a></p>
@@ -87,7 +87,7 @@
                      </div>
                      <div class="ml-16 pt-2">
                        <div>
-                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{timeFormat .StartTime "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{timeFormat .EndTime "15:04"}}</a></p>
+                            <p class="text-sm text-gray-500">Départ <a href="#" class="font-medium text-gray-900">{{.StartTime.Format "15:04"}}</a> - Arrivée <a href="#" class="font-medium text-gray-900">{{.EndTime.Format "15:04"}}</a></p>
                          </div>
                          <div>
                            <p class="text-sm text-gray-500">De <a href="#" class="font-medium text-gray-900">{{.From.Name}}</a> à <a href="#" class="font-medium text-gray-900">{{.To.Name}}</a></p>
--- a/web/layouts/journeys/_partials/journeys-solidarity-transport.html
+++ b/web/layouts/journeys/_partials/journeys-solidarity-transport.html
@@ -21,10 +21,6 @@
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
          Distance passager
      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Dernier trajet (-{{.ViewState.last_trip_days}}j)
-      </th>
      <th scope="col"
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
          Commentaire
@@ -42,23 +38,13 @@
  <tbody class="divide-y divide-gray-200 bg-white">
    {{ range .ViewState.driver_journeys }}
    {{ $driver := (index $.ViewState.solidarity_drivers .DriverId)}}
-    {{ $lastTrip := (index $.ViewState.driver_last_trips .DriverId)}}

    <tr>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDistance }} km</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .PassengerDistance }} km</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{if $lastTrip.IsZero}}
-        <span class="text-gray-400">-</span>
-        {{else if eq ($lastTrip.Format "2006-01-02") ($.ViewState.departuredatetime.Format "2006-01-02")}}
-        <span class="text-red-600 font-semibold">{{ $lastTrip.Format "02/01/2006" }}</span>
-        {{else}}
-        {{ $lastTrip.Format "02/01/2006" }}
-        {{end}}
-      </td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{if $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDistance }} km</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .PassengerDistance }} km</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}}</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
        {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID) }}
        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
        {{else}}
@@ -67,7 +53,7 @@
      </td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
        <a class="text-co-blue hover:text-co-blue" 
-		href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}{{if ne $.ViewState.passengerid ""}}?passengerid={{$.ViewState.passengerid}}{{end}}">
+          href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}">
          Organiser
        </a>
      </td>
--- a/web/layouts/journeys/_partials/journeys-vehicles.html
+++ b/web/layouts/journeys/_partials/journeys-vehicles.html
@@ -1,36 +0,0 @@
-{{define "journeys_vehicles"}}
-<!--VEHICLES-->
-{{if moduleAvailable "vehicles"}}
-<div class="p-4 flex text-sm text-grey-900">
-    <div class="flex-1">
-        {{.IconSet.Icon "tabler-icons:car" "h-6 w-6 inline-flex mr-4"}}
-        <span class=" font-bold">{{len .ViewState.vehicles}} véhicules</span> partagés disponibles ce jour là et la semaine suivante
-    </div>
-    <div>
-    </div>
-</div>
-<div class="p-2">
-<table class="min-w-full divide-y divide-gray-300">
-    <thead>
-      <tr>
-        <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 md:pl-0">Véhicule</th>
-        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Numéro</th>
-        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Lieu</th>
-      </tr>
-    </thead>
-    <tbody class="divide-y divide-gray-200">
-      {{range .ViewState.vehicles}}
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 md:pl-0">{{.Data.name}}</td>
-        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{.Data.licence_plate}}</td>
-        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
-      </tr>
-      {{end}}
-    </tbody>
-  </table>
-</div>
-<div class="p-4 text-center">
-    <a href="/app/vehicles/"><button class="text-md px-4 py-1 bg-gray-200 text-co-blue rounded-xl">Réserver un véhicule</button></a>
-</div>
-{{end}}
-{{end}}
--- a/web/layouts/journeys/_partials/saved-searches.html
+++ b/web/layouts/journeys/_partials/saved-searches.html
@@ -1,110 +0,0 @@
-{{define "saved_searches"}}
-<div class="bg-white shadow sm:rounded-2xl sm:overflow-hidden">
-    <h2 class="text-lg font-medium text-gray-900 p-4 sm:px-6">Recherches sauvegardées</h2>
-    <div class="border-t border-gray-200">
-
-        {{if .ViewState.saved_searches}}
-        <div class="overflow-x-auto">
-            <table class="min-w-full divide-y divide-gray-300">
-                <thead class="bg-gray-50">
-                    <tr>
-                        <th scope="col" class="w-1/6 py-2 px-3 text-left text-sm font-semibold text-gray-900">
-                            Bénéficiaire
-                        </th>
-                        <th scope="col" class="w-1/4 px-3 py-2 text-left text-sm font-semibold text-gray-900">
-                            Départ
-                        </th>
-                        <th scope="col" class="w-1/4 px-3 py-2 text-left text-sm font-semibold text-gray-900">
-                            Destination
-                        </th>
-                        <th scope="col" class="w-1/6 px-3 py-2 text-left text-sm font-semibold text-gray-900">
-                            Date/Heure
-                        </th>
-                        <th scope="col" class="w-1/6 relative py-2 px-3 text-right text-sm font-semibold text-gray-900">
-                            <span class="sr-only">Actions</span>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody class="divide-y divide-gray-200 bg-white">
-                    {{range .ViewState.saved_searches}}
-                    <tr>
-                        <td class="py-3 px-3 text-sm text-gray-500">
-                            {{if and .Data .Data.passenger_id}}
-                                {{$beneficiary := index $.ViewState.beneficiaries .Data.passenger_id}}
-                                {{if $beneficiary}}
-                                    <a href="/app/beneficiaries/{{.Data.passenger_id}}" class="text-co-blue hover:text-co-blue-dark">
-                                        {{$beneficiary.Data.first_name}} {{$beneficiary.Data.last_name}}
-                                    </a>
-                                {{else}}
-                                    -
-                                {{end}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="px-3 py-3 text-sm text-gray-500 break-words">
-                            {{if .Departure}}
-                                {{if .Departure.Properties}}
-                                    {{if .Departure.Properties.city}}
-                                        {{.Departure.Properties.city}}
-                                    {{else}}
-                                        {{.Departure.Properties.label}}
-                                    {{end}}
-                                {{else}}
-                                    -
-                                {{end}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="px-3 py-3 text-sm text-gray-500 break-words">
-                            {{if .Destination}}
-                                {{if .Destination.Properties}}
-                                    {{if .Destination.Properties.city}}
-                                        {{.Destination.Properties.city}}
-                                    {{else}}
-                                        {{.Destination.Properties.label}}
-                                    {{end}}
-                                {{else}}
-                                    -
-                                {{end}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="px-3 py-3 text-sm text-gray-500 whitespace-nowrap">
-                            {{if .DateTime}}
-                                {{timeFormat .DateTime "02/01/2006 15:04"}}
-                            {{else}}
-                                -
-                            {{end}}
-                        </td>
-                        <td class="relative py-3 px-3 text-right text-sm font-medium whitespace-nowrap">
-                            <a href="{{if eq $.ViewState.search_view "compact"}}/app/journeys/search{{else}}/app/journeys/{{end}}?departure={{json .Departure}}&destination={{json .Destination}}&departuredate={{timeFormat .DateTime "2006-01-02"}}&departuretime={{timeFormat .DateTime "15:04"}}{{if and .Data .Data.passenger_id}}&passengerid={{.Data.passenger_id}}{{end}}" class="text-co-blue hover:text-co-blue-dark mr-4">
-                                Rechercher
-                            </a>
-                            <a href="/app/journeys/saved-searches/{{.ID}}/delete"
-                               class="text-red-600 hover:text-red-900"
-                               onclick="return confirm('Êtes-vous sûr de vouloir supprimer cette recherche sauvegardée ?')">
-                                Supprimer
-                            </a>
-                        </td>
-                    </tr>
-                    {{end}}
-                </tbody>
-            </table>
-        </div>
-        {{else}}
-        <div class="text-center py-8">
-            <div class="text-gray-500">
-                <svg class="mx-auto h-12 w-12 text-gray-400" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
-                </svg>
-                <h3 class="mt-2 text-sm font-medium text-gray-900">Aucune recherche sauvegardée</h3>
-                <p class="mt-1 text-sm text-gray-500">Effectuez une recherche et cliquez sur "Enregistrer pour plus tard" pour commencer.</p>
-            </div>
-        </div>
-        {{end}}
-    </div>
-</div>
-{{end}}
--- a/web/layouts/journeys/search-compact.html
+++ b/web/layouts/journeys/search-compact.html
--- a/web/layouts/journeys/search.html
+++ b/web/layouts/journeys/search.html
@@ -21,30 +21,7 @@
            <div class="bg-white shadow sm:rounded-2xl">
                <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Chercher une solution</h2>
                <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                    <form method="GET" action="{{if eq .ViewState.search_view "compact"}}/app/journeys/search{{else}}/app/journeys/{{end}}" x-data="journeySearch()">
-
-                        <div class="py-4">
-                            <label for="beneficiary" class="block text-sm font-medium text-gray-700">Bénéficiaire (optionnel)</label>
-                            <div class="mt-1 relative" x-data="beneficiaryAutocomplete()">
-                                <input type="text"
-                                       x-model="input"
-                                       @input="onInput()"
-                                       @focus="showResults = true"
-                                       @blur="setTimeout(() => showResults = false, 200)"
-                                       class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">
-
-                                <ul x-show="showResults && filteredBeneficiaries.length > 0"
-                                    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base overflow-auto focus:outline-none sm:text-sm border border-gray-300"
-                                    tabindex="-1" role="listbox">
-                                    <template x-for="beneficiary in filteredBeneficiaries" :key="beneficiary.id">
-                                        <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9"
-                                            @click="selectBeneficiary(beneficiary)">
-                                            <span class="font-normal block truncate" x-text="beneficiary.name"></span>
-                                        </li>
-                                    </template>
-                                </ul>
-                            </div>
-                        </div>
+                    <form method="GET">

                        {{ $departureField := "departure" }}
                        {{ $departureLabel := "Départ" }}
@@ -56,18 +33,17 @@
                        {{ $destination := .ViewState.destination }}
                        {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }}
                        
-                        <input type="hidden" name="passengerid" value="{{.ViewState.passengerid}}" />

                        <div class="py-4 grid grid-cols-2">
                            <div class="lg:col-span-1">
-                                <label for="departuredate" class="block text-sm font-medium text-gray-700">Date de départ</label>
+                                <label for="departuredate" class="block text-sm font-medium text-gray-700">Le</label>
                                <div class="mt-1">
                                    <input type="date" id="departuredate" name="departuredate" value="{{.ViewState.departuredate}}"
                                        class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
                                </div>
                            </div>
                            <div class="lg:col-span-1">
-                                <label for="departuretime" class="block text-sm font-medium text-gray-700">Heure de départ</label>
+                                <label for="departuretime" class="block text-sm font-medium text-gray-700">A</label>
                                <div class="mt-1">
                                    <input type="time" id="departuretime" name="departuretime" value="{{.ViewState.departuretime}}"
                                        class="p-2 shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
@@ -76,100 +52,11 @@
                            
                        </div>

-                        <div class="flex gap-2 mt-8">
                        <button type="submit"
-                                class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
+                            class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
                            Chercher
                        </button>
-                            {{if .ViewState.searched}}
-			    <a href="/app/journeys/save?departure={{json .ViewState.departure}}&destination={{ json .ViewState.destination }}&departuredate={{.ViewState.departuredate}}&departuretime={{.ViewState.departuretime}}&passengerid={{.ViewState.passengerid}}"
-                                class="rounded-2xl border border-gray-300 bg-white px-4 py-2 my-4 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto inline-flex items-center">
-                                Enregistrer pour plus tard
-                            </a>
-                            {{end}}
-                        </div>
                    </form>
-
-                    <script>
-                    function journeySearch() {
-                        return {
-                            selectedBeneficiaryId: '{{.ViewState.passengerid}}',
-                        }
-                    }
-
-                    function beneficiaryAutocomplete() {
-                        const beneficiaries = [
-                            {{range .ViewState.beneficiaries_list}}
-                            {
-                                id: '{{.ID}}',
-                                name: '{{.Data.first_name}} {{.Data.last_name}}',
-                                address: {{json .Data.address}}
-                            },
-                            {{end}}
-                        ];
-
-                        return {
-                            input: '',
-                            showResults: false,
-                            filteredBeneficiaries: [],
-                            selectedBeneficiary: null,
-
-                            init() {
-                                // Set initial value if passengerid is set
-                                const currentPassengerId = '{{.ViewState.passengerid}}';
-                                if (currentPassengerId) {
-                                    const beneficiary = beneficiaries.find(b => b.id === currentPassengerId);
-                                    if (beneficiary) {
-                                        this.input = beneficiary.name;
-                                        this.selectedBeneficiary = beneficiary;
-                                    }
-                                }
-                            },
-
-                            onInput() {
-                                if (this.input.length === 0) {
-                                    this.filteredBeneficiaries = [];
-                                    this.selectedBeneficiary = null;
-                                    this.updatePassengerId('');
-                                    return;
-                                }
-
-                                this.filteredBeneficiaries = beneficiaries.filter(beneficiary =>
-                                    beneficiary.name.toLowerCase().includes(this.input.toLowerCase())
-                                ).slice(0, 10); // Limit to 10 results
-                            },
-
-                            selectBeneficiary(beneficiary) {
-                                this.input = beneficiary.name;
-                                this.selectedBeneficiary = beneficiary;
-                                this.showResults = false;
-                                this.updatePassengerId(beneficiary.id);
-                                this.setDepartureAddress(beneficiary.address);
-                            },
-
-                            updatePassengerId(id) {
-                                const passengerInput = document.querySelector('input[name="passengerid"]');
-                                if (passengerInput) {
-                                    passengerInput.value = id;
-                                }
-                            },
-
-                            setDepartureAddress(address) {
-                                if (address) {
-                                    // Find the departure address autocomplete container
-                                    const departureContainer = document.querySelector('input[name="departure"]').closest('[x-data]');
-                                    if (departureContainer && departureContainer._x_dataStack && departureContainer._x_dataStack[0]) {
-                                        const addressAutocomplete = departureContainer._x_dataStack[0];
-                                        // Update the address autocomplete component directly
-                                        addressAutocomplete.address = JSON.stringify(address);
-                                        addressAutocomplete.addressObject = address;
-                                        addressAutocomplete.input = address.properties.label;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    </script>
                </div>
            </div>
        </div>
@@ -188,25 +75,52 @@
                            <label for="tabs" class="sr-only">Select a tab</label>
                            <select id="tabs" name="tabs" @change="to"
                                class="block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
-                                {{range .ViewState.journey_tabs}}
-                                {{if or .enabled (and .module (moduleAvailable .module))}}
-                                <option value="{{.name}}">{{.title}}</option>
-                                {{end}}
-                                {{end}}
+                                <option value="all">Tous modes</option>
+
+                                <option value="carpool">Covoiturage</option>
+
+                                <option value="public-transit">Transports</option>
+
+                                <option value="solidarity-transport">Transport solidaire</option> -->
+
+                                <option value="others">Autres</option>
                            </select>
                        </div>
                        <div class="hidden sm:block">
-                            <div class="border-b border-gray-200 pl-4 overflow-x-auto">
-                                <nav class="-mb-px flex space-x-8 min-w-max" aria-label="Tabs">
+                            <div class="border-b border-gray-200 pl-4">
+                                <nav class="-mb-px flex space-x-8" aria-label="Tabs">
                                    <!-- Current: "border-indigo-500 text-indigo-600", Default: "border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300" -->
-                                    {{range .ViewState.journey_tabs}}
-                                    {{if or .enabled (and .module (moduleAvailable .module))}}
-                                    <a href="#" @click="tab = '{{.name}}'"
+                                    <a href="#" @click="tab = 'all'"
                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == '{{.name}}' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        {{.title}} </a>
+                                        :class="tab == 'all' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Tous modes </a>
+
+                                    <a href="#" @click="tab = 'carpool'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'carpool' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Covoiturage </a>
+
+                                    <a href="#" @click="tab = 'public-transit'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'public-transit' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Transports </a>
+
+                                    {{ if moduleAvailable "solidarity_transport"}}
+                                    <a href="#" @click="tab = 'solidarity-transport'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'solidarity-transport' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Transport solidaire </a>
                                    {{end}}
+                                    {{if moduleAvailable "organized_carpool"}}
+                                    <a href="#" @click="tab = 'organized-carpool'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'organized-carpool' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Covoiturage solidaire </a>
                                    {{end}}
+                                    <a href="#" @click="tab = 'others'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'others' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Autres </a>
                                </nav>
                            </div>
                        </div>
@@ -217,14 +131,10 @@
                    <div x-show="tab == 'public-transit'">{{template "journeys_public_transit" .}}</div>
                    <div x-show="tab == 'organized-carpool'">{{template "journeys_organized_carpool" .}}</div>
                    <div x-show="tab == 'solidarity-transport'">{{template "journeys_solidarity_transport" .}}</div>
-                    <div x-show="tab == 'vehicles'">{{template "journeys_vehicles" .}}</div>
-                    <div x-show="tab == 'directory'">{{template "journeys_local_solutions" .}}</div>
                    <div x-show="tab == 'others'">{{template "journeys_others" .}}</div>
                </div>
            </div>
        </section>
-            {{else}}
-            {{template "saved_searches" .}}
            {{end}}
        </div>
    </div>
--- a/web/layouts/layout.html
+++ b/web/layouts/layout.html
@@ -30,7 +30,7 @@
      x-transition:enter="transition ease-in-out duration-300 transform" x-transition:enter-start="-translate-x-full"
      x-transition:enter-end="translate-x-0" x-transition:leave="transition ease-in-out duration-300 transform"
      x-transition:leave-start="translate-x-0" x-transition:leave-end="-translate-x-full">
-      <div class="relative flex-1 flex flex-col max-w-xs w-full pt-5 pb-4 bg-co-blue">
+      <div class="relative flex-1 flex flex-col max-w-xs w-full pb-4 bg-co-blue">
        <div class="absolute top-0 right-0 -mr-12 pt-2" @click="offCanvasMenu = false">
          <button type="button"
            class="ml-1 flex items-center justify-center h-10 w-10 rounded-full focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white">
@@ -39,8 +39,9 @@
          </button>
        </div>

-        <div class="flex-shrink-0 flex items-center px-4">
-          <img class="h-8 w-auto" src="/public/images/mobicoop-solidaire.png" alt="Mobicoop Solidaire">
+        <div class="bg-white flex items-center shadow"><img class="h-16 w-auto m-auto" src="/public/images/departement06.png"></div>
+        <div class="flex-shrink-0 flex items-center px-4 pt-5">
+          <img class="h-8 w-auto" src="/public/images/main_logo.svg" alt="PARCOURSMOB">
        </div>
        <div class="mt-5 flex-1 h-0 overflow-y-auto">

@@ -58,9 +59,10 @@
  <!-- Static sidebar for desktop -->
  <div class="hidden md:flex md:w-64 md:flex-col md:fixed md:inset-y-0">
    <!-- Sidebar component, swap this element with another sidebar if you like -->
-    <div class="flex flex-col flex-grow pt-5 bg-co-blue overflow-y-auto">
-      <div class="flex items-center flex-shrink-0 px-4">
-        <img class="h-8 w-auto" src="/public/images/mobicoop-solidaire.png" alt="Mobicoop Solidaire">
+    <div class="flex flex-col flex-grow bg-co-blue overflow-y-auto">
+      <div class="bg-white flex items-center shadow"><img class="h-16 w-auto m-auto" src="/public/images/departement06.png"></div>
+      <div class="flex items-center flex-shrink-0 px-4 pt-5">
+        <img class="h-8 w-auto m-auto" src="/public/images/main_logo.svg" alt="PARCOURSMOB">
      </div>
      <div class="mt-5 flex-1 flex flex-col">
        {{ template "mainmenu" . }}
--- a/web/layouts/members/update.html
+++ b/web/layouts/members/update.html
@@ -1,5 +1,5 @@
 {{define "content"}}
-{{if eq .UserID .ViewState.user.ID}}
+{{if eq .UserID .ViewState.ID}}

 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
    <h1 class="text-2xl font-semibold text-gray-900">Modifier vos informations</h1>
@@ -8,11 +8,11 @@
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
    x-data="{
        fields: {
-            first_name: '{{ .ViewState.user.Data.first_name }}',
-            last_name: '{{ .ViewState.user.Data.last_name }}',
-            email: '{{ .ViewState.user.Data.email }}',
-            phone_number: '{{ .ViewState.user.Data.phone_number }}',
-            gender: {{.ViewState.user.Data.gender}}
+            first_name: '{{ .ViewState.Data.first_name }}',
+            last_name: '{{ .ViewState.Data.last_name }}',
+            email: '{{ .ViewState.Data.email }}',
+            phone_number: '{{ .ViewState.Data.phone_number }}',
+            gender: {{.ViewState.Data.gender}}
        },
        rules: {
            first_name: ['required'],
@@ -58,7 +58,7 @@
                    <div class="grid grid-cols-6 gap-6">
                        <div class="col-span-6 sm:col-span-3">
                            <label for="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" value="{{.ViewState.user.Data.first_name}}" name="first_name" id="first_name" autocomplete="given-name"
+                            <input type="text" value="{{.ViewState.Data.first_name}}" name="first_name" id="first_name" autocomplete="given-name"
                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 @blur="validateField('first_name')" 
                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -66,7 +66,7 @@

                        <div class="col-span-6 sm:col-span-3">
                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" value="{{.ViewState.user.Data.last_name}}" autocomplete="family-name"
+                            <input type="text" name="last_name" id="last_name" value="{{.ViewState.Data.last_name}}" autocomplete="family-name"
                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
                               @blur="validateField('last_name')"
                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -74,7 +74,7 @@

                        <div class="col-span-6 sm:col-span-3">
                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email" value="{{.ViewState.user.Data.email}}"
+                            <input type="text" name="email" id="email" autocomplete="email" value="{{.ViewState.Data.email}}"
                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
                                 @blur="validateField('email')"
                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -101,33 +101,19 @@
                </div>
                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                    <div class="grid grid-cols-6 gap-6">
-                        {{range .ViewState.profile_optional_fields}}
                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
+                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
                                    class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
+                                    <option value="0">Inconnu</option>
+                                    <option value="1" :selected="fields.gender == '1'">Masculin</option>
+                                    <option value="2" :selected="fields.gender == '2'">Féminin</option>
+                                    <option value="9" :selected="fields.gender == '9'">Sans objet</option>
                                </select>
                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
                        </div>
-                        {{end}}
+
                    </div>
                </div>
            </div>
@@ -135,7 +121,7 @@

        <div class="flex justify-end">
            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/members/{{.ViewState.user.ID}}">
+            <a href="/app/members/{{.ViewState.ID}}">
                <button type="button"
                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
            </a>
@@ -160,7 +146,7 @@
         </div>
     </div>
     <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
-         <a href="/app/members/{{.ViewState.user.ID}}"class="rounded-2xl mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
+         <a href="/app/members/{{.ViewState.ID}}"class="rounded-2xl mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
     </div>
     </div>
 </div>
--- a/web/layouts/organized_carpool/_partials/booking_filters.html
+++ b/web/layouts/organized_carpool/_partials/booking_filters.html
@@ -1,88 +0,0 @@
-{{ define "booking_filters" }}
-{{$tab := or .tab "carpoolService"}}
-
-<form>
-
-<input type="hidden" name="tab" value="{{$tab}}" />
-
-<div class="flex flex-row justify-end items-end">
-
-<div class="m-2">
-<div>
-  <label for="{{$tab}}_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
-  <div class="mt-2 flex">
-	  <input id="{{$tab}}_date_start" type="date" name="date_start" class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_start}}" onchange="this.form.submit()" />
-	  <input id="{{$tab}}_date_end" type="date" name="date_end" class="mx-2 block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_end}}" onchange="this.form.submit()" />
-  </div>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option></option>
-    <option value="WAITING_DRIVER_CONFIRMATION"{{if eq .filters.status "WAITING_DRIVER_CONFIRMATION"}} selected{{end}}>Attente confirmation conducteur</option>
-    <option value="CONFIRMED"{{if eq .filters.status "CONFIRMED"}} selected{{end}}>Confirmé</option>
-    <option value="CANCELLED"{{if eq .filters.status "CANCELLED"}} selected{{end}}>Annulé</option>
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-{{if $.geography_filters_enabled}}
-<div class="m-2">
-<label for="{{$tab}}_passenger_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse passager</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_passenger_address_geo" name="passenger_address_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.passenger_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_departure_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Départ</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_departure_geo" name="departure_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.departure_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_destination_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Destination</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_destination_geo" name="destination_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.destination_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-{{end}}
-
-</div>
-
-</form>
-{{ end }}
--- a/web/layouts/organized_carpool/_partials/booking_map.html
+++ b/web/layouts/organized_carpool/_partials/booking_map.html
@@ -1,180 +0,0 @@
-{{ define "organized_carpool_map" }}
-<div id="map" class="w-full h-full min-h-96"></div>
-<script>
-  let protocol = new pmtiles.Protocol();
-  maplibregl.addProtocol("pmtiles",protocol.tile);
-  var map = new maplibregl.Map({
-    container: 'map', // container id
-    style: "/public/maps/protomaps-light/style.json",
-  });
-
-  const geojsonPoints = {
-    "type": "FeatureCollection",
-    "features": [
-      {
-        "type": "Feature",
-        "geometry": {
-          "type": "Point",
-          "coordinates": [{{ .booking.PassengerPickupLng }}, {{ .booking.PassengerPickupLat }}]
-        },
-        "properties": {
-          "label": "{{ .booking.PassengerPickupAddress }}",
-          "type": "pickup"
-        }
-      },
-      {
-        "type": "Feature",
-        "geometry": {
-          "type": "Point",
-          "coordinates": [{{ .booking.PassengerDropLng }}, {{ .booking.PassengerDropLat }}]
-        },
-        "properties": {
-          "label": "{{ .booking.PassengerDropAddress }}",
-          "type": "drop"
-        }
-      }
-    ]
-  }
-
-  map.on('load', async () => {
-    // Add route polyline if available
-    // Add driver route if available
-    {{if .booking.DriverRoute}}
-    console.log("DriverRoute found");
-    try {
-      const driverRoute = JSON.parse(`{{ .booking.DriverRoute.Serialized }}`);
-      console.log("Parsed driverRoute:", driverRoute);
-      console.log("DriverRoute type:", driverRoute.type);
-      console.log("DriverRoute features:", driverRoute.features);
-      console.log("DriverRoute features count:", driverRoute.features ? driverRoute.features.length : 0);
-      console.log("DriverRoute keys:", Object.keys(driverRoute));
-      if (driverRoute.features && driverRoute.features.length > 0) {
-        console.log("First feature:", driverRoute.features[0]);
-        console.log("LineString features:", driverRoute.features.filter(f => f.geometry && f.geometry.type === 'LineString'));
-      } else {
-        console.log("No features found, checking alternative structure");
-        console.log("All driverRoute properties:", driverRoute);
-      }
-
-      map.addSource('driver_route', {
-        type: "geojson",
-        data: driverRoute
-      });
-
-      map.addLayer({
-        'id': 'driver_route',
-        'type': 'line',
-        'source': 'driver_route',
-        'filter': ['==', ['geometry-type'], 'LineString'], // Only show LineString geometries
-        'layout': {
-          'line-join': 'round',
-          'line-cap': 'round',
-        },
-        'paint': {
-          'line-color': '#243887', // Blue - main application color
-          'line-width': 3
-        },
-      });
-      console.log("Driver route layer added successfully");
-    } catch (error) {
-      console.error("Error adding driver route:", error);
-    }
-    {{else}}
-    console.log("No DriverRoute available");
-    {{end}}
-
-    // Add passenger route if available
-    {{if .booking.PassengerRoute}}
-    console.log("PassengerRoute found");
-    try {
-      const passengerRoute = JSON.parse(`{{ .booking.PassengerRoute.Serialized }}`);
-      console.log("Parsed passengerRoute:", passengerRoute);
-      console.log("PassengerRoute type:", passengerRoute.type);
-      console.log("PassengerRoute features count:", passengerRoute.features ? passengerRoute.features.length : 0);
-
-      map.addSource('passenger_route', {
-        type: "geojson",
-        data: passengerRoute
-      });
-
-      map.addLayer({
-        'id': 'passenger_route',
-        'type': 'line',
-        'source': 'passenger_route',
-        'filter': ['==', ['geometry-type'], 'LineString'], // Only show LineString geometries
-        'layout': {
-          'line-join': 'round',
-          'line-cap': 'round',
-        },
-        'paint': {
-          'line-color': '#243887', // Blue - main application color
-          'line-width': 3
-        },
-      });
-      console.log("Passenger route layer added successfully");
-    } catch (error) {
-      console.error("Error adding passenger route:", error);
-    }
-    {{else}}
-    console.log("No PassengerRoute available");
-    {{end}}
-
-    map.addSource('carpool_points', {
-      type: "geojson",
-      data: geojsonPoints
-    })
-
-    // Add pickup point
-    map.addLayer({
-      'id': 'pickup_point',
-      'type': 'circle',
-      'source': 'carpool_points',
-      'filter': ['==', ['get', 'type'], 'pickup'],
-      'paint': {
-        'circle-color': '#243887', // Blue - main application color
-        'circle-radius': 8,
-        'circle-stroke-color': '#fff',
-        'circle-stroke-width': 2
-      },
-    });
-
-    // Add drop point
-    map.addLayer({
-      'id': 'drop_point',
-      'type': 'circle',
-      'source': 'carpool_points',
-      'filter': ['==', ['get', 'type'], 'drop'],
-      'paint': {
-        'circle-color': '#243887', // Blue - main application color
-        'circle-radius': 8,
-        'circle-stroke-color': '#fff',
-        'circle-stroke-width': 2
-      },
-    });
-
-    // Add popup on click
-    map.on('click', 'pickup_point', (e) => {
-      new maplibregl.Popup()
-        .setLngLat(e.lngLat)
-        .setHTML(`<strong>Point de départ</strong><br>${e.features[0].properties.label}`)
-        .addTo(map);
-    });
-
-    map.on('click', 'drop_point', (e) => {
-      new maplibregl.Popup()
-        .setLngLat(e.lngLat)
-        .setHTML(`<strong>Destination</strong><br>${e.features[0].properties.label}`)
-        .addTo(map);
-    });
-
-    // Change cursor on hover
-    map.on('mouseenter', 'pickup_point', () => map.getCanvas().style.cursor = 'pointer');
-    map.on('mouseleave', 'pickup_point', () => map.getCanvas().style.cursor = '');
-    map.on('mouseenter', 'drop_point', () => map.getCanvas().style.cursor = 'pointer');
-    map.on('mouseleave', 'drop_point', () => map.getCanvas().style.cursor = '');
-
-    var bbox = turf.bbox(geojsonPoints)
-    map.fitBounds(bbox, { padding: 50 })
-  })
-</script>
-{{ end }}
--- a/web/layouts/organized_carpool/_partials/bookings_history.html
+++ b/web/layouts/organized_carpool/_partials/bookings_history.html
@@ -1,175 +0,0 @@
-
-{{ define "carpool_bookings_history" }}
-{{template "booking_filters" dict "tab" "carpoolHistory" "filters" .ViewState.hist_filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
-{{if eq (len .ViewState.bookings_history) 0}}
-<div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
-{{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings_history}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .Driver.Id}}{{$passenger := index $.ViewState.passengers_map .Passenger.Id}}{
-      id: '{{.Id}}',
-      driverId: '{{if .Driver}}{{.Driver.Id}}{{end}}',
-      driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-      driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      passengerId: '{{if .Passenger}}{{.Passenger.Id}}{{end}}',
-      passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-      passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      pickupAddress: '{{ jsEscape .PassengerPickupAddress }}',
-      dropAddress: '{{ jsEscape .PassengerDropAddress }}',
-      pickupDate: '{{if .PassengerPickupDate}}{{ timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04" }}{{end}}',
-      status: '{{.Status.String}}',
-      price: '{{if .Price}}{{ printf "%.2f" (round2 .Price.Amount) }}{{else}}N/A{{end}}',
-      currency: '{{if .Price}}{{.Price.Currency}}{{end}}'
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_DRIVER_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'CONFIRMED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Confirmé' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  }
-}">
-
-<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-  <thead class="bg-gray-50">
-    <tr>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Conducteur
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Passager
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Départ
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Destination
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Date
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Statut
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Prix
-      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          &nbsp;
-      </th>
-    </tr>
-  </thead>
-  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
-      <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
-          </a>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
-          </a>
-        </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupAddress"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropAddress"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-text="booking.price !== 'N/A' ? booking.price + ' ' + booking.currency : 'N/A'"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/bookings/' + booking.id">Voir</a>
-        </td>
-      </tr>
-    </template>
-  </tbody>
-</table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
-{{end}}
-{{end}}
--- a/web/layouts/organized_carpool/_partials/bookings_list.html
+++ b/web/layouts/organized_carpool/_partials/bookings_list.html
@@ -1,58 +1,8 @@

 {{ define "carpool_bookings_list" }}
-{{template "booking_filters" dict "tab" "carpoolService" "filters" .ViewState.filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
 {{if eq (len .ViewState.bookings) 0}}
 <div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
 {{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .Driver.Id}}{{$passenger := index $.ViewState.passengers_map .Passenger.Id}}{
-      id: '{{.Id}}',
-      driverId: '{{if .Driver}}{{.Driver.Id}}{{end}}',
-      driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-      driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      passengerId: '{{if .Passenger}}{{.Passenger.Id}}{{end}}',
-      passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-      passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      pickupAddress: '{{ jsEscape .PassengerPickupAddress }}',
-      dropAddress: '{{ jsEscape .PassengerDropAddress }}',
-      pickupDate: '{{if .PassengerPickupDate}}{{ timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04" }}{{end}}',
-      status: '{{.Status.String}}',
-      price: '{{if .Price}}{{ printf "%.2f" (round2 .Price.Amount) }}{{else}}N/A{{end}}',
-      currency: '{{if .Price}}{{.Price.Currency}}{{end}}'
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_DRIVER_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'WAITING_PASSENGER_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation passager' };
-    if (status === 'CONFIRMED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Confirmé' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  }
-}">
-
 <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
  <thead class="bg-gray-50">
    <tr>
@@ -80,10 +30,6 @@
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
          Statut
      </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Prix
-      </th>
      <th scope="col"
          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
          &nbsp;
@@ -91,86 +37,46 @@
    </tr>
  </thead>
  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
+    {{range .ViewState.bookings}}
    <tr>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
+        <a class="text-co-blue" href="/app/organized-carpool/drivers/{{.DriverId}}">
+        {{ (index $.ViewState.drivers_map .DriverId).Data.first_name }} 
+        {{ (index $.ViewState.drivers_map .DriverId).Data.last_name }}
        </a>
      </td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
+        <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
+        {{ (index $.ViewState.passengers_map .PassengerId).Data.first_name }} 
+        {{ (index $.ViewState.passengers_map .PassengerId).Data.last_name }}
        </a>
      </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupAddress"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropAddress"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
+        {{ .Journey.PassengerPickup.Properties.label }} 
      </td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-text="booking.price !== 'N/A' ? booking.price + ' ' + booking.currency : 'N/A'"></span>
+        {{ .Journey.PassengerDrop.Properties.label }} 
      </td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/organized-carpool/bookings/' + booking.id">Voir</a>
+        {{ .Journey.PassengerPickupDate.Format "02/01/2006 15:04" }} 
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{ if eq .Status "WAITING_CONFIRMATION"}}
+        <span class="p-1 text-xs bg-gray-300 rounded-xl">Attente confirmation</span>
+        {{ else if eq .Status "VALIDATED"}}
+        <span class="p-1 text-xs bg-co-green rounded-xl">Validé</span>
+        {{ else if eq .Status "CANCELLED"}}
+        <span class="p-1 text-xs bg-co-red text-white rounded-xl">Annulé</span>
+        {{ end }}
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        <a class="text-co-blue" href="/app/organized-carpool/bookings/{{.Id}}">
+          Voir
+        </a>
      </td>
    </tr>
-    </template>
+    {{ end }}
  </tbody>
 </table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
 {{end}}
 {{end}}
--- a/web/layouts/organized_carpool/_partials/driver_history.html
+++ b/web/layouts/organized_carpool/_partials/driver_history.html
@@ -1,61 +0,0 @@
-{{define "organized_carpool_driver_history"}}
-<div class="py-6">
-  {{if .ViewState.stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Covoiturages réalisés : {{ .ViewState.stats.bookings.confirmed }}</p>
-    <p class="text-lg">Kilomètres parcourus : {{ .ViewState.stats.bookings.km }} km</p>
-  </div>
-  {{end}}
-
-  {{if .ViewState.bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des covoiturages</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <thead class="bg-gray-50">
-        <tr>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Actions</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.bookings}}
-        {{if eq .Status.String "CONFIRMED"}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .PassengerPickupDate}}
-              {{timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04"}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Passenger}}
-              <a class="text-co-blue" href="/app/beneficiaries/{{.Passenger.Id}}">
-                {{ (index $.ViewState.beneficiaries_map .Passenger.Id).Data.first_name }}
-                {{ (index $.ViewState.beneficiaries_map .Passenger.Id).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerPickupAddress}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{.PassengerDropAddress}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/organized-carpool/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun covoiturage enregistré</p>
-  </div>
-  {{end}}
-</div>
-{{end}}
--- a/web/layouts/organized_carpool/_partials/driver_wallet.html
+++ b/web/layouts/organized_carpool/_partials/driver_wallet.html
@@ -1,113 +0,0 @@
-{{define "organized_carpool_driver_wallet"}}
-<div class="py-6"
-  x-data="{
-    walletdialog: false
-  }">
-  <div class="py-5 text-center">
-    <p class="text-lg">Solde : {{ printf "%.2f" .ViewState.wallet_balance }} €</p>
-  <button  @click="walletdialog = !walletdialog"
-    class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-    Créditer le compte
-  </button>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="walletdialog">
-    <div class="fixed inset-0 bg-gray-900 opacity-30 transition-opacity"></div>
-
-    <div class="fixed inset-0 z-10 overflow-y-auto">
-      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
-          <div>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Créditer le compte</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Créditer le compte mobilité du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/wallets/{{.ViewState.driver.ID}}/credit" class="my-4">
-              <div class="my-8">
-                <input type="number" step="0.01" id="amount" name="amount" value="0"
-                       class="w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-2 p-1 sm:text-sm border-gray-300 rounded-2xl">
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="walletdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- Wallet Operations History -->
-  {{if .ViewState.driver.Data.wallet_history}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des opérations</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <thead class="bg-gray-50">
-        <tr>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Crédit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Débit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Moyen de paiement</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Description</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        <!-- Initial Balance Row -->
-        <tr class="bg-gray-50">
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-500 italic sm:pl-6">
-            Solde initial
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-            {{if .ViewState.driver.Data.wallet}}{{ printf "%.2f" .ViewState.driver.Data.wallet }} €{{else}}0.00 €{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-        </tr>
-        {{range $index, $operation := .ViewState.driver.Data.wallet_history}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if $operation.timestamp}}{{timeFormat $operation.timestamp "02/01/2006 15:04"}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-green-600 sm:pl-6">
-            {{if $operation.amount}}
-              {{if or (eq $operation.operation_type "credit") (not $operation.operation_type)}}
-                {{ printf "%.2f" $operation.amount }} €
-              {{end}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-red-600 sm:pl-6">
-            {{if eq $operation.operation_type "debit"}}
-              {{ printf "%.2f" $operation.amount }} €
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.payment_method}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.description}}
-          </td>
-        </tr>
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucune opération enregistrée</p>
-  </div>
-  {{end}}
-
-</div>
-{{end}}
--- a/web/layouts/organized_carpool/_partials/drivers_list.html
+++ b/web/layouts/organized_carpool/_partials/drivers_list.html
@@ -1,59 +1,24 @@

 {{ define "carpool_drivers_list" }}
-
-<div class="sm:flex sm:items-center sm:justify-between">
-  {{if $.ViewState.geography_filters_enabled}}
-  <form class="flex flex-row items-end m-4">
-    <input type="hidden" name="tab" value="drivers" />
-    {{if $.ViewState.archived}}<input type="hidden" name="archived" value="true" />{{end}}
-
-    <div>
-      <label for="drivers_driver_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse conducteur</label>
-      <div class="mt-2 grid grid-cols-1">
-        <select id="drivers_driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-          <option value="">Toutes les zones</option>
-          {{range $.ViewState.geography_filters_list}}
-          {{$geoValue := printf "%s:%s" .layer .code}}
-          <option value="{{$geoValue}}"{{if eq $.ViewState.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-          {{end}}
-        </select>
-        <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-          <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-        </svg>
-      </div>
-    </div>
-  </form>
-  {{else}}
+<div class="sm:flex sm:items-center">
  <div class="sm:flex-auto">
    <p class="mt-2 text-sm text-gray-700"></p>
  </div>
-  {{end}}
-
-  <div class="m-4 sm:flex-none">
-    <a href="/exports/organized-carpool/drivers.xlsx?{{if $.ViewState.archived}}archived=true&{{end}}{{if $.ViewState.filters.driver_address_geo}}driver_address_geo={{$.ViewState.filters.driver_address_geo}}{{end}}">
+  <div class="m-4 sm:ml-16 sm:flex-none">
+    <!--<a href="/api/cache/{{.ViewState.CacheId}}/export">
      <button type="button"
        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
        {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
        Exporter
      </button>
-    </a>
-    {{if .ViewState.archived}}
-    <a href="/app/organized-carpool/?tab=drivers">
-      <button type="button"
-        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-          {{$.IconSet.Icon "hero:outline/archive-box-x-mark" "h-5 w-5 mr-3"}}
-            Covoitureurs actifs
-      </button>
-    </a>
-    {{else}}
-    <a href="/app/organized-carpool/?tab=drivers&archived=true">
+    </a>-->
+    <a href="/app/organized-carpool/?archived=true">
      <button type="button"
        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
          {{$.IconSet.Icon "hero:outline/archive-box" "h-5 w-5 mr-3"}}
            Covoitureurs archivés
      </button>
    </a>
-    {{end}}
    <a href="/app/organized-carpool/drivers/create">
      <button type="button"
        class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
@@ -63,39 +28,6 @@
    </a>
  </div>
 </div>
-<div x-data="{
-  drivers: [
-    {{range $index, $driver := .ViewState.drivers}}{{if $index}},{{end}}{
-      id: '{{$driver.ID}}',
-      firstName: '{{ jsEscape $driver.Data.first_name }}',
-      lastName: '{{ jsEscape $driver.Data.last_name }}',
-      address: '{{if $driver.Data.address}}{{ jsEscape $driver.Data.address.properties.label }}{{end}}',
-      addressDestination: '{{if $driver.Data.address_destination}}{{ jsEscape $driver.Data.address_destination.properties.label }}{{end}}',
-      phoneNumber: '{{ jsEscape $driver.Data.phone_number }}',
-      validated: {{if carpoolDriverValidatedProfile $driver (carpoolDocuments $driver.ID)}}true{{else}}false{{end}}
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.drivers_items_per_page }}{{ .ViewState.drivers_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.drivers.length / this.itemsPerPage);
-  },
-  get paginatedDrivers() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.drivers.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  }
-}">
-
 <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
  <thead class="bg-gray-50">
    <tr>
@@ -126,76 +58,23 @@
    </tr>
  </thead>
  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="driver in paginatedDrivers" :key="driver.id">
+    {{ range .ViewState.drivers }}
    <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.firstName + ' ' + driver.lastName"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.address"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.addressDestination"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.phoneNumber"></td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.first_name }} {{ .Data.last_name }}</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if .Data.address_destination}}{{.Data.address_destination.properties.label}}{{end}}</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.phone_number }}</td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-show="driver.validated" class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-          <span x-show="!driver.validated" class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
+        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
      </td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue hover:text-co-blue" :href="'/app/organized-carpool/drivers/' + driver.id">
+        <a class="text-co-blue hover:text-co-blue" 
+          href="/app/organized-carpool/drivers/{{.ID}}">
          Voir
        </a>
      </td>
    </tr>
-    </template>
+    {{ end }}
  </tbody>
 </table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, drivers.length)"></span>
-        sur
-        <span class="font-medium" x-text="drivers.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
 {{ end }}
--- a/web/layouts/organized_carpool/_partials/journey_preview.html
+++ b/web/layouts/organized_carpool/_partials/journey_preview.html
@@ -12,23 +12,11 @@
                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Départ passager</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-              {{ if .journey.ExtraMembers.passenger_pickup }}
-                {{ .journey.ExtraMembers.passenger_pickup.properties.label }}
-              {{ else }}
-                Adresse non disponible
-              {{ end }}
-            </dd>
+            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 0).Properties.MustString "label"}}</dd>
                            </div>
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Destination passager</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-              {{ if .journey.ExtraMembers.passenger_drop }}
-                {{ .journey.ExtraMembers.passenger_drop.properties.label }}
-              {{ else }}
-                Adresse non disponible
-              {{ end }}
-            </dd>
+            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 1).Properties.MustString "label"}}</dd>
                            </div>
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
@@ -37,40 +25,10 @@
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Destination conducteur</dt>
            <dd class="mt-1 text-sm text-gray-900">{{(index .journey.Features 1).Properties.MustString "label"}}</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Date et heure</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-              {{ if .journey.ExtraMembers.departure_date }}
-                {{ timeFormat .journey.ExtraMembers.departure_date "02/01/2006 15:04" }}
-              {{ else }}
-                Non définie
-              {{ end }}
-            </dd>
                            </div>
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-            <dd class="mt-1 text-sm text-gray-900">
-                                    {{if .pricing_result}}
-                                        {{ printf "%.2f" (round2 .pricing_result.passenger.Amount) }} {{.pricing_result.passenger.Currency}}
-                                    {{else}}
-                                        0.00 EUR
-                                    {{end}}
-                                </dd>
-                            </div>
-                            {{if and .pricing_result .pricing_result.driver (gt (round2 .pricing_result.driver.Amount) 0.0)}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .pricing_result.driver.Amount) }} {{.pricing_result.driver.Currency}}</dd>
-                            </div>
-                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Distance passager</dt>
-            			<dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" .journey.ExtraMembers.passenger_distance }} km</dd>
-                            </div>
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Distance conducteur</dt>
-            			<dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" .journey.ExtraMembers.driver_distance }} km</dd>
+            <dd class="mt-1 text-sm text-gray-900">0 EUR</dd>
                            </div>
                        </dl>
                    </div>
@@ -179,16 +137,6 @@
                                <dd class="mt-1 text-sm text-gray-900">{{.driver.Data.file_number}}</dd>
                            </div>
                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                    {{if carpoolDriverValidatedProfile .driver (carpoolDocuments .driver.ID) }}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                    {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                    {{end}}
-                                </dd>
-                            </div>
                        </dl>
                    </div>

@@ -309,19 +257,9 @@
                                <dd class="mt-1 text-sm text-gray-900">{{.passenger.Data.file_number}}</dd>
                            </div>
                            {{end}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                    {{if carpoolDriverValidatedProfile .passenger (carpoolDocuments .passenger.ID) }}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                    {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                    {{end}}
-                                </dd>
-                            </div>
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Compte mobilié (solde)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .passenger_wallet_balance) }} EUR</dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{if .passenger.Data.wallet}}{{ .passenger.Data.wallet }}{{else}}0{{end}} EUR</dd>
                            </div>
                        </dl>
                    </div>
--- a/web/layouts/organized_carpool/booking_display.html
+++ b/web/layouts/organized_carpool/booking_display.html
@@ -1,194 +0,0 @@
-{{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">
-      Covoiturage solidaire
-    </h1>
-
-    {{ if eq .ViewState.booking.Status.String "WAITING_DRIVER_CONFIRMATION"}}
-    <div class="mt-4"><span class="p-2 text-sm bg-gray-300 rounded-2xl px-4">Attente confirmation</span></div>
-    {{ else if eq .ViewState.booking.Status.String "CONFIRMED"}}
-    <div class="mt-4"><span class="p-1 text-sm bg-co-green rounded-2xl px-4">Confirmé</span></div>
-    {{ else if eq .ViewState.booking.Status.String "CANCELLED"}}
-    <div class="mt-4"><span class="p-1 text-sm bg-co-red text-white rounded-2xl px-4">Annulé</span></div>
-    {{ end }}
-
-    <div class="mt-6 flex justify-end space-x-3">
-      {{if eq .ViewState.booking.Status.String "WAITING_DRIVER_CONFIRMATION" }}
-      <a href="/app/organized-carpool/bookings/{{.ViewState.booking.Id}}/confirm" class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Confirmer
-        </button>
-      </a>
-      {{end}}
-
-      {{if ne .ViewState.booking.Status.String "WAITING_DRIVER_CONFIRMATION" }}
-      <a href="/app/organized-carpool/bookings/{{.ViewState.booking.Id}}/waitconfirmation" class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Remettre en attente
-        </button>
-      </a>
-      {{end}}
-
-      {{if ne .ViewState.booking.Status.String "CANCELLED" }}
-      {{$dialog := "cancel"}}
-      <div x-data="{ {{ $dialog }}: false}">
-        <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-co-red border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-          Annuler
-        </button>
-        <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-          <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-
-          <div class="fixed inset-0 z-10 overflow-y-auto">
-            <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-              <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-                <form method="POST" action="/app/organized-carpool/bookings/{{.ViewState.booking.Id}}/cancel">
-                  <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{$.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
-                  </div>
-                  <div class="mt-3 text-center sm:mt-5">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Annuler</h3>
-                    <div class="mt-2">
-                      <p class="text-sm text-gray-500">Êtes-vous sûr de vouloir annuler ce covoiturage ?</p>
-                    </div>
-                  </div>
-                  <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <button @click="{{$dialog}} = !{{$dialog}}" type="button" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</button>
-                    <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmer</button>
-                  </div>
-                </form>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      {{end}}
-
-      <a href='/app/journeys/?departure={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerPickupLng}},{{.ViewState.booking.PassengerPickupLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerPickupAddress}}"}}&destination={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerDropLng}},{{.ViewState.booking.PassengerDropLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerDropAddress}}"}}&passengerid={{.ViewState.passenger.ID}}' class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Dupliquer
-        </button>
-      </a>
-
-      {{if eq .ViewState.booking.Status.String "CANCELLED" }}
-      <a href='/app/journeys/?departure={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerPickupLng}},{{.ViewState.booking.PassengerPickupLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerPickupAddress}}"}}&destination={"type":"Feature","geometry":{"type":"Point","coordinates":[{{.ViewState.booking.PassengerDropLng}},{{.ViewState.booking.PassengerDropLat}}]},"properties":{"label":"{{.ViewState.booking.PassengerDropAddress}}"}}&departuredate={{ timeFormat .ViewState.booking.PassengerPickupDate.AsTime "2006-01-02"}}&departuretime={{ timeFormat .ViewState.booking.PassengerPickupDate.AsTime "15:04"}}&passengerid={{.ViewState.passenger.ID}}&organized_carpool_exclude_driver={{.ViewState.driver.ID}}' class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Solliciter un autre conducteur
-        </button>
-      </a>
-      {{end}}
-    </div>
-</div>
-
-<div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  <div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
-    <!-- Booking Details -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="px-4 py-5 sm:px-6">
-        <h3 class="text-lg leading-6 font-medium text-gray-900">Détails du covoiturage</h3>
-        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations sur le trajet</p>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:p-0">
-        <dl class="sm:divide-y sm:divide-gray-200">
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-		    <a class="text-co-blue" href="/app/organized-carpool/drivers/{{ .ViewState.driver.ID }}">{{ .ViewState.driver.Data.first_name }} {{ .ViewState.driver.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-		    <a class="text-co-blue" href="/app/beneficiaries/{{ .ViewState.passenger.ID }}">{{ .ViewState.passenger.Data.first_name }} {{ .ViewState.passenger.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                {{ .ViewState.driverDepartureAddress }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prise en charge passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.PassengerPickupAddress }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Dépose passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.PassengerDropAddress }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Arrivée conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ if .ViewState.driverArrivalAddress }}
-                {{ .ViewState.driverArrivalAddress }}
-              {{ end }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Date et heure</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ timeFormat .ViewState.booking.PassengerPickupDate.AsTime "02/01/2006 15:04" }}
-            </dd>
-          </div>
-          {{if .ViewState.booking.Distance}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Distance</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Distance }} km
-            </dd>
-          </div>
-          {{end}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ if .ViewState.booking.Price }}
-                {{ if eq .ViewState.booking.Price.Type.String "FREE" }}
-                  <span class="text-co-green font-medium">Gratuit</span>
-                {{ else if eq .ViewState.booking.Price.Type.String "PAYING" }}
-                  <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.Price.Amount) }} {{ .ViewState.booking.Price.Currency }}</span>
-                {{ else }}
-                  <span class="text-gray-500">Prix non défini</span>
-                {{ end }}
-              {{ else }}
-                <span class="text-gray-500">Prix non disponible</span>
-              {{ end }}
-            </dd>
-          </div>
-          {{if and .ViewState.booking.DriverCompensationAmount .ViewState.booking.DriverCompensationCurrency}}
-            {{if gt (round2 .ViewState.booking.DriverCompensationAmount) 0.0}}
-            <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-              <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-              <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.DriverCompensationAmount) }} {{ .ViewState.booking.DriverCompensationCurrency }}</span>
-              </dd>
-            </div>
-            {{end}}
-          {{end}}
-          {{if .ViewState.booking.Motivation}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Motif</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{.ViewState.booking.Motivation}}
-            </dd>
-          </div>
-          {{end}}
-        </dl>
-      </div>
-    </div>
-
-    <!-- Map -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="border-t border-gray-200 h-full">
-        <div class="h-full min-h-96">
-          {{ template "organized_carpool_map" .ViewState }}
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-{{ end }}
--- a/web/layouts/organized_carpool/driver_display.html
+++ b/web/layouts/organized_carpool/driver_display.html
@@ -28,8 +28,8 @@
              class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Désarchiver</button></a>{{end}}
            <!-- <button type="button"
                class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
-            <a href="/app/organized-carpool/drivers/{{.ViewState.driver.ID}}/update" class="inline-flex"><button type="button"
-                    class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
+<!--            <a href="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/update" class="inline-flex"><button type="button"
+                    class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>-->
        </div>
    </div>

@@ -44,16 +44,6 @@
                    </div>
                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                  {{if carpoolDriverValidatedProfile .ViewState.driver .ViewState.documents}}
-                                    <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-                                  {{else}}
-                                    <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                                  {{end}}
-                                </dd>
-                            </div>
                            {{if .ViewState.driver.Data.email}}
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Email</dt>
@@ -97,7 +87,7 @@
            </section>

            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: '{{ if .ViewState.tab }}{{ .ViewState.tab }}{{ else }}documents{{ end }}',
+                    tab: 'documents',
                    to(event) {
                        this.tab = event.target.value
                    }
@@ -118,10 +108,6 @@
                                    <option value="events">Dispositifs</option> -->

                                    <option value="documents">Documents</option>
-
-                                    <option value="wallet">Compte mobilité</option>
-
-                                    <option value="history">Covoiturage solidaire</option>
                                </select>
                            </div>
                            <div class="hidden sm:block">
@@ -138,24 +124,12 @@
                                        :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                        Documents </a>

-                                        <a href="#" @click="tab = 'wallet'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Compte mobilité </a>
-
-                                        <a href="#" @click="tab = 'history'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'history' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Covoiturage solidaire </a>
-
                                    </nav>
                                </div>
                            </div>
                        </div>

                        <div x-show="tab == 'documents'">{{template "driver_files" .}}</div>
-                        <div x-show="tab == 'wallet'">{{template "organized_carpool_driver_wallet" .}}</div>
-                        <div x-show="tab == 'history'">{{template "organized_carpool_driver_history" .}}</div>

                    </div>
                </div>
--- a/web/layouts/organized_carpool/driver_update.html
+++ b/web/layouts/organized_carpool/driver_update.html
@@ -1,174 +0,0 @@
-{{ define "content" }}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <h1 class="text-2xl font-semibold text-gray-900">Modifier le covoitureur solidaire</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
-    x-data="{
-        fields: {
-          first_name: '{{.ViewState.driver.Data.first_name}}',
-          last_name: '{{.ViewState.driver.Data.last_name}}',
-          email: '{{.ViewState.driver.Data.email}}' ,
-          phone_number: '{{.ViewState.driver.Data.phone_number}}',
-          birthdate: {{if .ViewState.driver.Data.birthdate}}'{{ (timeFrom .ViewState.driver.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
-        },
-        other_properties: {{if .ViewState.driver.Data.other_properties}}{{ json .ViewState.driver.Data.other_properties }}{{else}}{}{{end}},
-        other_properties_serialized: '{{ json .ViewState.driver.Data.other_properties }}',
-        rules: {
-            first_name: ['required'],
-            last_name: ['required'],
-            email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
-            birthdate: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                first_name: {valid: null},
-                last_name: {valid: null},
-                email: {valid: null},
-                phone_number: {valid: null},
-                birthdate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.other_properties_serialized = JSON.stringify(this.other_properties)
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <input type="hidden" name="other_properties" x-model="other_properties_serialized" />
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations personnelles obligatoires pour créer le covoitureur solidaire</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
-                            <input type="text" name="first_name" id="first_name" autocomplete="given-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.first_name" @blur="validateField('first_name')"
-                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
-                            <input type="text" name="last_name" id="last_name" autocomplete="family-name"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.last_name" @blur="validateField('last_name')"
-                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
-                            <input type="text" name="email" id="email" autocomplete="email"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.email" @blur="validateField('email')"
-                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
-                                téléphone</label>
-                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.phone_number" @blur="validateField('phone_number')"
-                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="birthdate" class="block text-sm font-medium text-gray-700">Date de
-                                naissance</label>
-                            <input type="date" name="birthdate" id="birthdate" autocomplete="birthdate" placeholder="JJ/MM/AAAA"
-                                class="p-2 mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.birthdate" @blur="validateField('birthdate')"
-                                :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    {{ $fieldName := "address" }}
-                    {{if .ViewState.driver.Data.address}}
-                    {{$default := .ViewState.driver.Data.address}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
-                    {{end}}
-
-                    {{ $fieldName := "address_destination" }}
-                    {{if .ViewState.driver.Data.address_destination}}
-                    {{$default := .ViewState.driver.Data.address_destination}}
-                    {{ template "address" dict "FieldName" $fieldName  "Default" $default "Label" "Adresse destination"}}
-                    {{else}}
-                    {{ template "address_autocomplete" dict "FieldName" $fieldName "Label" "Adresse destination"}}
-                    {{end}}
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations optionnelles</h3>
-                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
-                </div>
-                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="gender" name="gender" autocomplete="gender" x-model="other_properties.gender"
-                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    <option value="0">Inconnu</option>
-                                    <option value="1">Masculin</option>
-                                    <option value="2">Féminin</option>
-                                    <option value="9">Sans objet</option>
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
-                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.last_subscription_date">
-                        </div>
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
-                            <textarea name="comment" id="comment"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="other_properties.comment"></textarea>
-                        </div>
-
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="flex justify-end">
-            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/organized-carpool/drivers/{{.ViewState.driver.ID}}">
-                <button type="button"
-                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-            </a>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Modifier le covoitureur solidaire</button>
-        </div>
-    </form>
-</div>
-{{end}}
--- a/web/layouts/organized_carpool/journey.html
+++ b/web/layouts/organized_carpool/journey.html
@@ -3,32 +3,13 @@
    <h1 class="text-2xl font-semibold text-gray-900">Organiser le covoiturage</h1>
 </div>
 <div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  {{template "journey_preview" (dict "journey" .ViewState.journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries "passenger_wallet_balance" .ViewState.passenger_wallet_balance "pricing_result" .ViewState.pricing_result)}}
+  {{template "journey_preview" (dict "journey" .ViewState.journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
 {{if ne .ViewState.passenger.ID ""}}
-<div class="max-w-7xl m-auto px-4 sm:px-6 md:px-8 flex flex-col justify-items-center">
-  {{if .ViewState.passenger}}
-  {{if lt .ViewState.passenger_wallet_balance .ViewState.pricing_result.passenger.Amount}}
-    <p class="text-xl text-co-red text-center p-4">Le solde du compte mobilité est insuffisant.</p>
-    {{end}}
-  {{end}}
+<div class="max-w-7xl m-auto px-4 sm:px-6 md:px-8 flex justify-items-center">
  <form method="POST">
-    <div class="m-auto text-center">
-      <label for="motivation" class="block text-sm font-medium text-gray-700">Motif du trajet</label>
-      <select name="motivation" id="motivation"
-          class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm  rounded-2xl bg-white m-auto">
-        {{range .ViewState.booking_motivations}}
-        <option value="{{.value}}"{{if eq .value ""}} selected="selected"{{end}}>{{.label}}</option>
-        {{end}}
-      </select>
-    </div>
-    {{template "submit_with_sms"
-      dict  "IconSet" .IconSet
-            "Viewstate" .ViewState
-            "ComponentState" (dict "submitText" "Envoyer la demande de covoiturage"
-                                   "doNotSendOption" true)
-            "SMSState" (dict "name" (.ViewState.config.GetString "service_name")
-                             "datetime" (or (timeFormat .ViewState.journey.ExtraMembers.departure_date "02/01/2006") "À définir")
-                             "baseUrl" (.ViewState.config.GetString "base_url") )}}
+    <button class="w-100 bg-co-blue  border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+      Envoyer la mise en relation
+    </button>
  </form>
 </div>
 {{end}}
--- a/web/layouts/organized_carpool/overview.html
+++ b/web/layouts/organized_carpool/overview.html
@@ -1,10 +1,10 @@
 {{ define "content" }}
-{{$defaultTab := "carpoolService"}}
+
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
  <h1 class="text-2xl font-semibold text-gray-900">Covoiturage solidaire</h1>

    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
-        tab: '{{or .ViewState.tab $defaultTab}}',
+        tab: 'drivers',
        to(event) {
            this.tab = event.target.value
        }
@@ -12,53 +12,32 @@
        <div class="divide-y divide-gray-200">
            <div>
                <div class="hidden sm:block">
-                    <div class="border-b border-gray-200 pl-4 flex justify-between items-center">
+                    <div class="border-b border-gray-200 pl-4">
                        <nav class="-mb-px flex space-x-8" aria-label="Tabs"> 
-                            <a href="#" @click="tab = 'carpoolService'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'carpoolService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets </a>
-
                            <a href="#" @click="tab = 'drivers'"
                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                :class="tab == 'drivers' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                Covoitureurs solidaires </a>
                            
-                            <a href="#" @click="tab = 'carpoolHistory'"
+                            <!--<a href="#" @click="tab = 'beneficiaries'"
                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'carpoolHistory' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets passés </a>
+                                :class="tab == 'beneficiaries' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                Bénéficiaires </a>-->
+
+                            <a href="#" @click="tab = 'trips'"
+                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                Trajets </a>
                        </nav>
-
-                        <div class="pr-4" x-show="tab == 'carpoolHistory'">
-                            {{$exportURL := "/exports/organized-carpool/bookings.xlsx"}}
-                            {{$hasParams := false}}
-                            {{if .ViewState.hist_filters.date_start}}{{$exportURL = printf "%s?start_date=%s" $exportURL .ViewState.hist_filters.date_start}}{{$hasParams = true}}{{end}}
-                            {{if .ViewState.hist_filters.date_end}}{{if $hasParams}}{{$exportURL = printf "%s&end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{else}}{{$exportURL = printf "%s?end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.departure_geo}}{{if $hasParams}}{{$exportURL = printf "%s&departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{else}}{{$exportURL = printf "%s?departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.destination_geo}}{{if $hasParams}}{{$exportURL = printf "%s&destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{else}}{{$exportURL = printf "%s?destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.passenger_address_geo}}{{if $hasParams}}{{$exportURL = printf "%s&passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{else}}{{$exportURL = printf "%s?passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{$hasParams = true}}{{end}}{{end}}
-
-                            <a href="{{$exportURL}}">
-                                <button type="button"
-                                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
-                                    </svg>
-                                    Exporter
-                                </button>
-                            </a>
                    </div>
                </div>
            </div>
-            </div>
-
-            <div x-show="tab == 'carpoolService'">{{template "carpool_bookings_list" .}}</div>

            <div x-show="tab == 'drivers'">{{template "carpool_drivers_list" .}}</div>

-            <div x-show="tab == 'carpoolHistory'">{{template "carpool_bookings_history" .}}</div>
+
+            <div x-show="tab == 'beneficiaries'">1</div>
+            <div x-show="tab == 'trips'">{{template "carpool_bookings_list" .}}</div>

        </div>
    </div>
--- a/web/layouts/solidarity_transport/_partials/booking_filters.html
+++ b/web/layouts/solidarity_transport/_partials/booking_filters.html
@@ -1,92 +0,0 @@
-{{ define "booking_filters" }}
-{{$tab := or .tab "solidarityTransport"}}
-
-<form>
-
-<input type="hidden" name="tab" value="{{$tab}}" />
-
-<div class="flex flex-row justify-end items-end">
-
-<div class="m-2">
-<div>
-  <label for="{{$tab}}_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
-  <div class="mt-2 flex">
-	  <input id="{{$tab}}_date_start" type="date" name="date_start" class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_start}}" onchange="this.form.submit()" />
-	  <input id="{{$tab}}_date_end" type="date" name="date_end" class="mx-2 block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.filters.date_end}}" onchange="this.form.submit()" />
-  </div>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_status" name="status" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option></option>
-    <option value="VALIDATED"{{if eq .filters.status "VALIDATED"}} selected{{end}}>Validé</option>
-    <option value="CANCELLED"{{if eq .filters.status "CANCELLED"}} selected{{end}}>Annulé</option>
-    <option value="WAITING_CONFIRMATION"{{if eq .filters.status "WAITING_CONFIRMATION"}} selected{{end}}>Attente confirmation</option>
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-
-{{if $.geography_filters_enabled}}
-<div class="m-2">
-<label for="{{$tab}}_passenger_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse passager</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_passenger_address_geo" name="passenger_address_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.passenger_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-{{end}}
-
-{{if $.geography_filters_enabled}}
-<div class="m-2">
-<label for="{{$tab}}_departure_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Départ</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_departure_geo" name="departure_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.departure_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-<div class="m-2">
-<label for="{{$tab}}_destination_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Destination</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="{{$tab}}_destination_geo" name="destination_geo" class="col-start-1 row-start-1 w-36 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option value="">Toutes les zones</option>
-    {{range $.geography_filters_list}}
-    {{$geoValue := printf "%s:%s" .layer .code}}
-    <option value="{{$geoValue}}"{{if eq $.filters.destination_geo $geoValue}} selected{{end}}>{{.name}}</option>
-    {{end}}
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-{{end}}
-
-</div>
-
-</form>
-{{ end }}
--- a/web/layouts/solidarity_transport/_partials/bookings_history.html
+++ b/web/layouts/solidarity_transport/_partials/bookings_history.html
@@ -1,161 +1,82 @@

 {{ define "solidarity_bookings_history" }}
-{{template "booking_filters" dict "tab" "solidarityHistory" "filters" .ViewState.hist_filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
 {{if eq (len .ViewState.bookings_history) 0}}
 <div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
 {{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings_history}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .DriverId}}{{$passenger := index $.ViewState.passengers_map .PassengerId}}{
-      id: '{{.Id}}',
-      driverId: '{{.DriverId}}',
-      driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-      driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      passengerId: '{{.PassengerId}}',
-      passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-      passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      pickupLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerPickup.Properties.label }}{{end}}',
-      dropLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerDrop.Properties.label }}{{end}}',
-      pickupDate: '{{if .Journey}}{{ timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04" }}{{end}}',
-      status: '{{.Status}}',
-      price: '{{if .Journey}}{{ printf "%.2f" (round2 .Journey.Price.Amount) }}{{end}}',
-      currency: '{{if .Journey}}{{.Journey.Price.Currency}}{{end}}',
-      motivation: {{ if .Data.motivation }}'{{ jsEscape .Data.motivation }}'{{ else }}''{{ end }},
-      replacedBy: {{ if .Data.replaced_by }}'{{ .Data.replaced_by }}'{{ else }}''{{ end }}
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  },
-  guaranteedMotivations: {{ json .ViewState.guaranteed_trip_motivations }},
-  isGuaranteedTrip(motivation) {
-    return this.guaranteedMotivations.includes(motivation);
-  }
-}">
-
 <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
  <thead class="bg-gray-50">
    <tr>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Conducteur</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Destination</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Statut</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Prix</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">&nbsp;</th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Conducteur
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Passager
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Départ
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Destination
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Date
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Statut
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          &nbsp;
+      </th>
    </tr>
  </thead>
  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
-      <tr :class="booking.replacedBy ? 'bg-gray-200' : ''">
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
+    {{range .ViewState.bookings_history}}
+    <tr>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{.DriverId}}">
+        {{ (index $.ViewState.drivers_map .DriverId).Data.first_name }} 
+        {{ (index $.ViewState.drivers_map .DriverId).Data.last_name }}
+        </a>
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
+        {{ (index $.ViewState.passengers_map .PassengerId).Data.first_name }} 
+        {{ (index $.ViewState.passengers_map .PassengerId).Data.last_name }}
        </a>
      </td>
      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
+        {{ .Journey.PassengerPickup.Properties.label }} 
+      </td>
+      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{ .Journey.PassengerDrop.Properties.label }} 
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{ .Journey.PassengerPickupDate.Format "02/01/2006 15:04" }} 
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{ if eq .Status "WAITING_CONFIRMATION"}}
+        <span class="p-1 text-xs bg-gray-300 rounded-xl">Attente confirmation</span>
+        {{ else if eq .Status "VALIDATED"}}
+        <span class="p-1 text-xs bg-co-green rounded-xl">Validé</span>
+        {{ else if eq .Status "CANCELLED"}}
+        <span class="p-1 text-xs bg-co-red text-white rounded-xl">Annulé</span>
+        {{ end }}
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">
+          Voir
        </a>
      </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupLabel"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropLabel"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
-          <template x-if="booking.motivation && isGuaranteedTrip(booking.motivation)">
-            <div class="mt-4">
-              <span class="text-xs p-2 bg-co-green text-white rounded-2xl" x-text="'Trajet garanti : ' + booking.motivation"></span>
-            </div>
-          </template>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-text="booking.price + ' ' + booking.currency"></span>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/bookings/' + booking.id">Voir</a>
-        </td>
    </tr>
-    </template>
+    {{ end }}
  </tbody>
 </table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
 {{end}}
 {{end}}
--- a/web/layouts/solidarity_transport/_partials/bookings_list.html
+++ b/web/layouts/solidarity_transport/_partials/bookings_list.html
@@ -1,155 +1,83 @@

 {{ define "solidarity_bookings_list" }}
-{{template "booking_filters" dict "tab" "solidarityService" "filters" .ViewState.filters "geography_filters_enabled" .ViewState.geography_filters_enabled "geography_filters_list" .ViewState.geography_filters_list }}
-
 {{if eq (len .ViewState.bookings) 0}}
 <div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
 {{else}}
-{{$inrange := false}}
-
-<div x-data="{
-  bookings: [
-  {{range .ViewState.bookings}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .DriverId}}{{$passenger := index $.ViewState.passengers_map .PassengerId}}{
-	id: '{{.Id}}',
-      	driverId: '{{.DriverId}}',
-	driverFirstName: '{{if $driver.Data.first_name}}{{ jsEscape $driver.Data.first_name }}{{end}}',
-	driverLastName: '{{if $driver.Data.last_name}}{{ jsEscape $driver.Data.last_name }}{{end}}',
-      	passengerId: '{{ .PassengerId }}',
-	passengerFirstName: '{{if $passenger.Data.first_name}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
-	passengerLastName: '{{if $passenger.Data.last_name}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
-      	pickupLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerPickup.Properties.label }}{{end}}',
-      	dropLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerDrop.Properties.label }}{{end}}',
-      	pickupDate: '{{if .Journey}}{{ timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04" }}{{end}}',
-      	status: '{{.Status}}',
-      	motivation: {{ if .Data.motivation }}'{{ jsEscape .Data.motivation }}'{{ else }}''{{ end }}
-      }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.trips_items_per_page }}{{ .ViewState.trips_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.bookings.length / this.itemsPerPage);
-  },
-  get paginatedBookings() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.bookings.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  },
-  getStatusBadge(status) {
-    if (status === 'WAITING_CONFIRMATION') return { class: 'p-1 text-xs bg-gray-300 rounded-xl', text: 'Attente confirmation' };
-    if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
-    if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
-    return { class: '', text: '' };
-  },
-  guaranteedMotivations: {{ json .ViewState.guaranteed_trip_motivations }},
-  isGuaranteedTrip(motivation) {
-    return this.guaranteedMotivations.includes(motivation);
-  }
-}">
-
 <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
  <thead class="bg-gray-50">
    <tr>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Conducteur</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Destination</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Statut</th>
-      <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">&nbsp;</th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Conducteur
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Passager
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Départ
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Destination
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Date
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Statut
+      </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          &nbsp;
+      </th>
    </tr>
  </thead>
  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="booking in paginatedBookings" :key="booking.id">
+    {{range .ViewState.bookings}}
    <tr>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/beneficiaries/' + booking.passengerId">
-            <span x-text="booking.passengerFirstName + ' ' + booking.passengerLastName"></span>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{.DriverId}}">
+        {{ (index $.ViewState.drivers_map .DriverId).Data.first_name }} 
+        {{ (index $.ViewState.drivers_map .DriverId).Data.last_name }}
+        </a>
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
+        {{ (index $.ViewState.passengers_map .PassengerId).Data.first_name }} 
+        {{ (index $.ViewState.passengers_map .PassengerId).Data.last_name }}
        </a>
      </td>
      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/drivers/' + booking.driverId">
-            <span x-text="booking.driverFirstName + ' ' + booking.driverLastName"></span>
+        {{ .Journey.PassengerPickup.Properties.label }} 
+      </td>
+      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{ .Journey.PassengerDrop.Properties.label }} 
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{ timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04" }} 
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{ if eq .Status "WAITING_CONFIRMATION"}}
+        <span class="p-1 text-xs bg-gray-300 rounded-xl">Attente confirmation</span>
+        {{ else if eq .Status "VALIDATED"}}
+        <span class="p-1 text-xs bg-co-green rounded-xl">Validé</span>
+        {{ else if eq .Status "CANCELLED"}}
+        <span class="p-1 text-xs bg-co-red text-white rounded-xl">Annulé</span>
+        {{ end }}
+        {{if and .Data.motivation (or (or (eq .Data.motivation "Santé") (eq .Data.motivation "Insertion")) (eq .Data.motivation "Administratif"))}}<div class="mt-4"><span class="text-xs p-2 bg-co-green text-white rounded-2xl">Trajet garanti : {{.Data.motivation}}</span></div>{{end}}
+      </td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">
+          Voir
        </a>
      </td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupLabel"></td>
-        <td class="py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.dropLabel"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
-          <template x-if="booking.motivation && isGuaranteedTrip(booking.motivation)">
-            <div class="mt-4">
-              <span class="text-xs p-2 bg-co-green text-white rounded-2xl" x-text="'Trajet garanti : ' + booking.motivation"></span>
-            </div>
-          </template>
-        </td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue" :href="'/app/solidarity-transport/bookings/' + booking.id">Voir</a>
-        </td>
    </tr>
-    </template>
+    {{ end }}
  </tbody>
 </table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, bookings.length)"></span>
-        sur
-        <span class="font-medium" x-text="bookings.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
 {{end}}
 {{end}}
--- a/web/layouts/solidarity_transport/_partials/driver_documents.html
+++ b/web/layouts/solidarity_transport/_partials/driver_documents.html
@@ -66,20 +66,9 @@ x-data="{
              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                <div class="flex gap-2 justify-end">
                <a href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}" target="_blank">
-                  <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">
-                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-4 w-4 mr-1"}}
-                    Télécharger<span class="sr-only"> le document</span>
-                  </button>
+                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
                </a>
-                  <button type="button"
-                    onclick="if(confirm('Êtes-vous sûr de vouloir supprimer ce document ?')) { window.location.href='/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/documents/{{.FileName}}/delete'; }"
-                    class="inline-flex items-center rounded-md border border-transparent bg-co-red px-3 py-2 text-sm font-medium leading-4 text-white shadow-sm hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2">
-                    {{$.IconSet.Icon "hero:outline/trash" "h-4 w-4 mr-1"}}
-                    Supprimer<span class="sr-only"> le document</span>
-                  </button>
-                </div>
              </td>
            </tr>
            {{end}}
--- a/web/layouts/solidarity_transport/_partials/driver_history.html
+++ b/web/layouts/solidarity_transport/_partials/driver_history.html
@@ -1,69 +1,7 @@
 {{define "driver_history"}}
-<div class="py-6">
-  {{if .ViewState.stats}}
-  <div class="py-5 text-center">
-    <p class="text-lg">Trajets réalisés : {{ .ViewState.stats.bookings.count }}</p>
-    <p class="text-lg">Kilomètres réalisés : {{ .ViewState.stats.bookings.km}} km</p>
-  </div>
-  {{end}}
+<div class="px-4 py-6 sm:px-6 text-center">
+  <p class="text-center text-lg">Trajets réalisés : {{ .ViewState.stats.bookings.count }}</p>
+  <p class="text-center text-lg">Kilomètres réalisés : {{ .ViewState.stats.bookings.km}} km</p>

-  {{if .ViewState.bookings}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des transports solidaires</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <thead class="bg-gray-50">
-        <tr>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Passager</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Départ</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Arrivée</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Statut</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"></th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.bookings}}
-        {{if or (eq .Status "VALIDATED") (eq .Status "WAITING_CONFIRMATION")}}
-        <tr>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}
-              {{timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04"}}
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .PassengerId}}
-              <a class="text-co-blue" href="/app/beneficiaries/{{.PassengerId}}">
-                {{ (index $.ViewState.beneficiaries_map .PassengerId).Data.first_name }}
-                {{ (index $.ViewState.beneficiaries_map .PassengerId).Data.last_name }}
-              </a>
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerPickup}}{{.Journey.PassengerPickup.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if .Journey}}{{if .Journey.PassengerDrop}}{{.Journey.PassengerDrop.Properties.label}}{{end}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if eq .Status "VALIDATED"}}
-              <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Validé</span>
-            {{else if eq .Status "WAITING_CONFIRMATION"}}
-              <span class="p-1 px-2 text-xs bg-gray-300 rounded-2xl">Attente confirmation</span>
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">Voir</a>
-          </td>
-        </tr>
-        {{end}}
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucun transport solidaire enregistré</p>
-  </div>
-  {{end}}
 </div>
 {{end}}
--- a/web/layouts/solidarity_transport/_partials/driver_wallet.html
+++ b/web/layouts/solidarity_transport/_partials/driver_wallet.html
@@ -1,113 +0,0 @@
-{{define "driver_wallet"}}
-<div class="py-6"
-  x-data="{
-    walletdialog: false
-  }">
-  <div class="py-5 text-center">
-    <p class="text-lg">Solde : {{ printf "%.2f" .ViewState.wallet_balance }} €</p>
-  <button  @click="walletdialog = !walletdialog"
-    class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-    Créditer le compte
-  </button>
-  <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
-       x-show="walletdialog">
-    <div class="fixed inset-0 bg-gray-900 opacity-30 transition-opacity"></div>
-
-    <div class="fixed inset-0 z-10 overflow-y-auto">
-      <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-        <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
-          <div>
-            <div class="mt-3 text-center sm:mt-5">
-              <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Créditer le compte</h3>
-                <div class="mt-2">
-                  <p class="text-sm text-gray-500">Créditer le compte mobilité du conducteur</p>
-                </div>
-              </div>
-            </div>
-          <form method="POST" action="/app/wallets/{{.ViewState.driver.ID}}/credit" class="my-4">
-              <div class="my-8">
-                <input type="number" step="0.01" id="amount" name="amount" value="0"
-                       class="w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-2 p-1 sm:text-sm border-gray-300 rounded-2xl">
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Ajouter</button>
-              </div>
-              <div class="mt-5 sm:mt-6">
-                <button @click="walletdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- Wallet Operations History -->
-  {{if .ViewState.driver.Data.wallet_history}}
-  <div class="py-5">
-    <h4 class="text-lg font-medium text-gray-900 mb-4 text-center">Historique des opérations</h4>
-    <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-      <thead class="bg-gray-50">
-        <tr>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Date</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Crédit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Débit</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Moyen de paiement</th>
-          <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Description</th>
-        </tr>
-      </thead>
-      <tbody class="divide-y divide-gray-200 bg-white">
-        <!-- Initial Balance Row -->
-        <tr class="bg-gray-50">
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-500 italic sm:pl-6">
-            Solde initial
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-            {{if .ViewState.driver.Data.wallet}}{{ printf "%.2f" .ViewState.driver.Data.wallet }} €{{else}}0.00 €{{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm text-gray-500 sm:pl-6">
-            -
-          </td>
-        </tr>
-        {{range $index, $operation := .ViewState.driver.Data.wallet_history}}
-        <tr>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{if $operation.timestamp}}{{timeFormat $operation.timestamp "02/01/2006 15:04"}}{{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-green-600 sm:pl-6">
-            {{if $operation.amount}}
-              {{if or (eq $operation.operation_type "credit") (not $operation.operation_type)}}
-                {{ printf "%.2f" $operation.amount }} €
-              {{end}}
-            {{end}}
-          </td>
-          <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-red-600 sm:pl-6">
-            {{if eq $operation.operation_type "debit"}}
-              {{ printf "%.2f" $operation.amount }} €
-            {{end}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.payment_method}}
-          </td>
-          <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
-            {{$operation.description}}
-          </td>
-        </tr>
-        {{end}}
-      </tbody>
-    </table>
-  </div>
-  {{else}}
-  <div class="py-5">
-    <p class="text-sm text-gray-500 text-center">Aucune opération enregistrée</p>
-  </div>
-  {{end}}
-
-</div>
-{{end}}
--- a/web/layouts/solidarity_transport/_partials/drivers_list.html
+++ b/web/layouts/solidarity_transport/_partials/drivers_list.html
@@ -1,58 +1,23 @@
 {{ define "solidarity_drivers_list" }}
-
-<div class="sm:flex sm:items-center sm:justify-between">
-  {{if $.ViewState.geography_filters_enabled}}
-  <form class="flex flex-row items-end m-4">
-    <input type="hidden" name="tab" value="drivers" />
-    {{if $.ViewState.archived}}<input type="hidden" name="archived" value="true" />{{end}}
-
-    <div>
-      <label for="drivers_driver_address_geo" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Adresse conducteur</label>
-      <div class="mt-2 grid grid-cols-1">
-        <select id="drivers_driver_address_geo" name="driver_address_geo" class="col-start-1 row-start-1 w-48 appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-          <option value="">Toutes les zones</option>
-          {{range $.ViewState.geography_filters_list}}
-          {{$geoValue := printf "%s:%s" .layer .code}}
-          <option value="{{$geoValue}}"{{if eq $.ViewState.filters.driver_address_geo $geoValue}} selected{{end}}>{{.name}}</option>
-          {{end}}
-        </select>
-        <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-          <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-        </svg>
-      </div>
-    </div>
-  </form>
-  {{else}}
+<div class="sm:flex sm:items-center">
  <div class="sm:flex-auto">
    <p class="mt-2 text-sm text-gray-700"></p>
  </div>
-  {{end}}
-
-  <div class="m-4 sm:flex-none">
-    <a href="/exports/solidarity-transport/drivers.xlsx?{{if $.ViewState.archived}}archived=true&{{end}}{{if $.ViewState.filters.driver_address_geo}}driver_address_geo={{$.ViewState.filters.driver_address_geo}}{{end}}">
+  <div class="m-4 sm:ml-16 sm:flex-none">
+    <!--<a href="/api/cache/{{.ViewState.CacheId}}/export">
      <button type="button"
        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
        {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
        Exporter
      </button>
-    </a>
-    {{if .ViewState.archived}}
-    <a href="/app/solidarity-transport/?tab=drivers">
-      <button type="button"
-        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-          {{$.IconSet.Icon "hero:outline/archive-box-x-mark" "h-5 w-5 mr-3"}}
-            Conducteurs actifs
-      </button>
-    </a>
-    {{else}}
-    <a href="/app/solidarity-transport/?tab=drivers&archived=true">
+    </a>-->
+    <a href="/app/solidarity-transport/?archived=true">
      <button type="button"
        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
          {{$.IconSet.Icon "hero:outline/archive-box" "h-5 w-5 mr-3"}}
            Conducteurs archivés
      </button>
    </a>
-    {{end}}
    <a href="/app/solidarity-transport/drivers/create">
      <button type="button"
        class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
@@ -62,38 +27,6 @@
    </a>
  </div>
 </div>
-<div x-data="{
-  drivers: [
-    {{range $index, $driver := .ViewState.drivers}}{{if $index}},{{end}}{
-      id: '{{$driver.ID}}',
-      firstName: '{{ jsEscape $driver.Data.first_name }}',
-      lastName: '{{ jsEscape $driver.Data.last_name }}',
-      address: '{{if $driver.Data.address}}{{ jsEscape $driver.Data.address.properties.label }}{{end}}',
-      phoneNumber: '{{ jsEscape $driver.Data.phone_number }}',
-      validated: {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID)}}true{{else}}false{{end}}
-    }{{end}}
-  ],
-  currentPage: 1,
-  itemsPerPage: {{ if .ViewState.drivers_items_per_page }}{{ .ViewState.drivers_items_per_page }}{{ else }}10{{ end }},
-  get totalPages() {
-    return Math.ceil(this.drivers.length / this.itemsPerPage);
-  },
-  get paginatedDrivers() {
-    const start = (this.currentPage - 1) * this.itemsPerPage;
-    const end = start + this.itemsPerPage;
-    return this.drivers.slice(start, end);
-  },
-  nextPage() {
-    if (this.currentPage < this.totalPages) this.currentPage++;
-  },
-  prevPage() {
-    if (this.currentPage > 1) this.currentPage--;
-  },
-  goToPage(page) {
-    this.currentPage = page;
-  }
-}">
-
 <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
  <thead class="bg-gray-50">
    <tr>
@@ -120,75 +53,26 @@
    </tr>
  </thead>
  <tbody class="divide-y divide-gray-200 bg-white">
-    <template x-for="driver in paginatedDrivers" :key="driver.id">
+    {{ range .ViewState.drivers }}
    <tr>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.firstName + ' ' + driver.lastName"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.address"></td>
-        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="driver.phoneNumber"></td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.first_name }} {{ .Data.last_name }}</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .Data.phone_number }}</td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <span x-show="driver.validated" class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
-          <span x-show="!driver.validated" class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
+        {{if solidarityDriverValidatedProfile . (solidarityDocuments .ID) }}
+        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
+        {{else}}
+        <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
+        {{end}}
      </td>
      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-          <a class="text-co-blue hover:text-co-blue" :href="'/app/solidarity-transport/drivers/' + driver.id">
+        <a class="text-co-blue hover:text-co-blue" 
+          href="/app/solidarity-transport/drivers/{{.ID}}">
          Voir
        </a>
      </td>
    </tr>
-    </template>
+    {{ end }}
  </tbody>
 </table>
-
-<!-- Pagination -->
-<div class="flex items-center justify-between border-t border-gray-200 bg-white px-4 py-3 sm:px-6">
-  <div class="flex flex-1 justify-between sm:hidden">
-    <button @click="prevPage()" :disabled="currentPage === 1"
-            class="relative inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Précédent
-    </button>
-    <button @click="nextPage()" :disabled="currentPage === totalPages"
-            class="relative ml-3 inline-flex items-center rounded-md border border-gray-300 bg-white px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed">
-      Suivant
-    </button>
-  </div>
-  <div class="hidden sm:flex sm:flex-1 sm:items-center sm:justify-between">
-    <div>
-      <p class="text-sm text-gray-700">
-        Affichage de
-        <span class="font-medium" x-text="(currentPage - 1) * itemsPerPage + 1"></span>
-        à
-        <span class="font-medium" x-text="Math.min(currentPage * itemsPerPage, drivers.length)"></span>
-        sur
-        <span class="font-medium" x-text="drivers.length"></span>
-        résultats
-      </p>
-    </div>
-    <div>
-      <nav class="isolate inline-flex -space-x-px rounded-md shadow-sm" aria-label="Pagination">
-        <button @click="prevPage()" :disabled="currentPage === 1"
-                class="relative inline-flex items-center rounded-l-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Précédent</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M12.79 5.23a.75.75 0 01-.02 1.06L8.832 10l3.938 3.71a.75.75 0 11-1.04 1.08l-4.5-4.25a.75.75 0 010-1.08l4.5-4.25a.75.75 0 011.06.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-        <template x-for="page in totalPages" :key="page">
-          <button @click="goToPage(page)"
-                  :class="page === currentPage ? 'z-10 bg-co-blue text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-co-blue' : 'text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:outline-offset-0'"
-                  class="relative inline-flex items-center px-4 py-2 text-sm font-semibold focus:z-20"
-                  x-text="page"></button>
-        </template>
-        <button @click="nextPage()" :disabled="currentPage === totalPages"
-                class="relative inline-flex items-center rounded-r-md px-2 py-2 text-gray-400 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-20 focus:outline-offset-0 disabled:opacity-50 disabled:cursor-not-allowed">
-          <span class="sr-only">Suivant</span>
-          <svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-            <path fill-rule="evenodd" d="M7.21 14.77a.75.75 0 01.02-1.06L11.168 10 7.23 6.29a.75.75 0 111.04-1.08l4.5 4.25a.75.75 0 010 1.08l-4.5 4.25a.75.75 0 01-1.06-.02z" clip-rule="evenodd" />
-          </svg>
-        </button>
-      </nav>
-    </div>
-  </div>
-</div>
-
-</div>
 {{ end }}
--- a/web/layouts/solidarity_transport/_partials/journey_map.html
+++ b/web/layouts/solidarity_transport/_partials/journey_map.html
@@ -17,6 +17,21 @@
      {{ json .driver_journey.DriverArrival }}
    ]
  }
+  const driverGeojsonPoints = {
+    "type": "FeatureCollection",
+    "features": [
+      {{ json .driver_journey.DriverDeparture }},
+      {{ json .driver_journey.DriverArrival }}
+    ]
+  }
+  const passengerGeojsonPoints = {
+    "type": "FeatureCollection",
+    "features": [
+      {{ json .driver_journey.PassengerPickup }},
+      {{ json .driver_journey.PassengerDrop }},
+    ]
+  }
+

  map.on('load', async () => {
    {{if .driver_journey.JourneyPolyline}}
@@ -34,62 +49,37 @@
        'line-cap': 'round',
      },
      'paint': {
-        'line-color': getComputedStyle(document.documentElement).getPropertyValue('--color-co-blue').trim(),
-        'line-width': 4
+        'line-color': '#243887',
+        'line-width': 3
      },
    });
    {{end}}

-    // Driver departure marker
-    const driverDepartureEl = document.createElement('div');
-    driverDepartureEl.className = 'w-8 h-8 rounded-co bg-co-blue border border-white shadow-md flex items-center justify-center';
-    driverDepartureEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-        </svg>
-    `;
-    new maplibregl.Marker({element: driverDepartureEl})
-        .setLngLat({{ json .driver_journey.DriverDeparture }}.geometry.coordinates)
-        .addTo(map);
-
-    // Driver arrival marker
-    const driverArrivalEl = document.createElement('div');
-    driverArrivalEl.className = 'w-8 h-8 rounded-co bg-co-blue border border-white shadow-md flex items-center justify-center';
-    driverArrivalEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"></path>
-            <circle cx="12" cy="7" r="4"></circle>
-        </svg>
-    `;
-    new maplibregl.Marker({element: driverArrivalEl})
-        .setLngLat({{ json .driver_journey.DriverArrival }}.geometry.coordinates)
-        .addTo(map);
-
-    // Passenger pickup marker
-    const passengerPickupEl = document.createElement('div');
-    passengerPickupEl.className = 'w-8 h-8 rounded-co bg-co-green border border-white shadow-md flex items-center justify-center';
-    passengerPickupEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="16" height="16">
-            <path fill-rule="evenodd" d="M11.54 22.351l.07.04.028.016a.76.76 0 00.723 0l.028-.015.071-.041a16.975 16.975 0 001.144-.742 19.58 19.58 0 002.683-2.282c1.944-1.99 3.963-4.98 3.963-8.827a8.25 8.25 0 00-16.5 0c0 3.846 2.02 6.837 3.963 8.827a19.58 19.58 0 002.682 2.282 16.975 16.975 0 001.145.742zM12 13.5a3 3 0 100-6 3 3 0 000 6z" clip-rule="evenodd" />
-        </svg>
-    `;
-    new maplibregl.Marker({element: passengerPickupEl})
-        .setLngLat({{ json .driver_journey.PassengerPickup }}.geometry.coordinates)
-        .addTo(map);
-
-    // Passenger drop marker
-    const passengerDropEl = document.createElement('div');
-    passengerDropEl.className = 'w-8 h-8 rounded-co bg-co-red border border-white shadow-md flex items-center justify-center';
-    passengerDropEl.innerHTML = `
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="16" height="16">
-            <path fill-rule="evenodd" d="M3 2.25a.75.75 0 01.75.75v.54l1.838-.46a9.75 9.75 0 016.725.738l.108.054a8.25 8.25 0 005.58.652l3.109-.732a.75.75 0 01.917.81 47.784 47.784 0 00.005 10.337.75.75 0 01-.574.812l-3.114.733a9.75 9.75 0 01-6.594-.77l-.108-.054a8.25 8.25 0 00-5.69-.625l-2.202.55V21a.75.75 0 01-1.5 0V3A.75.75 0 013 2.25z" clip-rule="evenodd" />
-        </svg>
-    `;
-    new maplibregl.Marker({element: passengerDropEl})
-        .setLngLat({{ json .driver_journey.PassengerDrop }}.geometry.coordinates)
-        .addTo(map);
-
+    map.addSource('driver_points', {
+      type: "geojson",
+      data: driverGeojsonPoints
+    })
+    map.addLayer({
+      'id': 'driver_points',
+      'type': 'circle',
+      'source': 'driver_points',
+      'paint': {
+        'circle-color': '#000'
+      },
+    });
+    map.addSource('passenger_points', {
+      type: "geojson",
+      data: passengerGeojsonPoints
+    })
+    map.addLayer({
+      'id': 'passenger_points',
+      'type': 'circle',
+      'source': 'passenger_points',
+      'paint': {
+        'circle-color': '#243887',
+        'circle-radius': 8
+      },
+    });
    var bbox=turf.bbox(geojsonPoints)

    map.fitBounds(bbox, { padding: 50 })
--- a/web/layouts/solidarity_transport/_partials/journey_preview.html
+++ b/web/layouts/solidarity_transport/_partials/journey_preview.html
@@ -38,7 +38,7 @@
                            </div>
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Horaire départ conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ timeFormat .driver_journey.DriverDepartureDate "02/01/2006 15:04"}}</dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{ .driver_journey.DriverDepartureDate.Format "02/01/2006 15:04"}}</dd>
                            </div>
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Horaire rendez vous passager</dt>
@@ -50,31 +50,8 @@
                            </div>
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">
-                                    {{if .pricing_result}}
-                                        {{ printf "%.2f" (round2 .pricing_result.passenger.Amount) }} {{.pricing_result.passenger.Currency}}
-                                    {{else if .booking}}
-                                        {{ printf "%.2f" (round2 .booking.Journey.Price.Amount) }} {{.booking.Journey.Price.Currency}}
-                                    {{else}}
-                                        0.00 EUR
-                                    {{end}}
-                                </dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{ .driver_journey.Price.Amount }} {{ .driver_journey.Price.Currency}}</dd>
                            </div>
-                            {{if and .pricing_result .pricing_result.driver (gt (round2 .pricing_result.driver.Amount) 0.0)}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .pricing_result.driver.Amount) }} {{.pricing_result.driver.Currency}}</dd>
-                            </div>
-                            {{else if .booking}}
-                                {{if .booking.DriverCompensationAmount}}
-                                    {{if gt (round2 .booking.DriverCompensationAmount) 0.0}}
-                                    <div class="sm:col-span-1">
-                                        <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-                                        <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .booking.DriverCompensationAmount) }} {{.booking.DriverCompensationCurrency}}</dd>
-                                    </div>
-                                    {{end}}
-                                {{end}}
-                            {{end}}
                        </dl>
                    </div>
  <div>
@@ -272,7 +249,7 @@
                            {{end}}
                            <div class="sm:col-span-1">
                                <dt class="text-sm font-medium text-gray-500">Compte mobilié (solde)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ printf "%.2f" (round2 .passenger_wallet_balance) }} EUR</dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{if .passenger.Data.wallet}}{{ .passenger.Data.wallet }}{{else}}0{{end}} EUR</dd>
                            </div>
                        </dl>
                    </div>
--- a/web/layouts/solidarity_transport/booking_display.html
+++ b/web/layouts/solidarity_transport/booking_display.html
@@ -3,48 +3,76 @@
    <h1 class="text-2xl font-semibold text-gray-900">
      Transport solidaire
    </h1>
-
-    {{if and .ViewState.booking.Data.motivation (isGuaranteedTripMotivation .ViewState.booking.Data.motivation)}}
-    <div class="mt-4"><span class="text-sm p-2 bg-co-green text-white rounded-2xl">Trajet garanti : {{.ViewState.booking.Data.motivation}}</span></div>
-    {{end}}
-
+    {{if and .ViewState.booking.Data.motivation (or (or (eq .ViewState.booking.Data.motivation "Santé") (eq .ViewState.booking.Data.motivation "Insertion")) (eq .ViewState.booking.Data.motivation "Administratif"))}}<div class="mt-4"><span class="text-sm p-2 bg-co-green text-white rounded-2xl">Trajet garanti : {{.ViewState.booking.Data.motivation}}</span></div>{{end}}
      {{ if eq .ViewState.booking.Status "WAITING_CONFIRMATION"}}
      <div class="mt-4"><span class="p-2 text-sm bg-gray-300 rounded-2xl px-4">Attente confirmation</span></div>
      {{ else if eq .ViewState.booking.Status "VALIDATED"}}
      <div class="mt-4"><span class="p-1 text-sm bg-co-green rounded-2xl px-4">Validé</span></div>
      {{ else if eq .ViewState.booking.Status "CANCELLED"}}
-    <div class="mt-4"><span class="p-1 text-sm bg-co-red text-white rounded-2xl px-4">Annulé{{if .ViewState.booking.Data.reason}} : {{.ViewState.booking.Data.reason}}{{end}}</span></div>
+  <div class="mt-4"><span class="p-1 text-sm bg-co-red text-white rounded-2xl px-4">Annulé : {{.ViewState.booking.Data.reason}}</span></div>
      {{ end }}
+<div
+  class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">

-    <div class="mt-6 flex justify-end space-x-3">
-      {{if .ViewState.booking.Data.replaced_by}}
-      <!-- Booking has been replaced, show link to replacement -->
-      <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Data.replaced_by}}" class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Remplacé par →
+
+    {{$dialog := "modif"}}
+<div  x-data="{ {{ $dialog }}: false}">
+  <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-white border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+    Modifier
  </button>
-      </a>
-      {{else}}
-      <!-- Normal action buttons -->
+  <div x-show="{{$dialog}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
+     <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
+        
+     <div class="fixed inset-0 z-10 overflow-y-auto">
+       <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+
+         <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
+           <form method="POST">
+             <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
+                    {{$.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
+             </div>
+             <div class="mt-3 text-center sm:mt-5">
+               <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Modifier</h3>
+               <div class="mt-2">
+                 <p class="text-sm text-gray-500"></p>
+               </div>
+               <div>
+                 <label for="driver_distance" class="block text-sm font-medium text-gray-700">Kilomètres conducteur</label>
+                 <div class="mt-1">
+                    <input type="text" name="driver_distance" id="driver_distance" class="block w-full rounded-2xl border-gray-300 shadow-sm focus:border-co-blue focus:ring-co-blue sm:text-sm" value="{{.ViewState.booking.Journey.DriverDistance}}" />
+                 </div>
+               </div>
+             </div>
+             <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
+               <button @click="{{$dialog}} = !{{$dialog}}" type="button" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</button>
+               <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Valider</button>
+             </div>
+           </form>
+         </div>
+       </div>
+     </div>
+</div>
+</div>
+
+  <!-- <button type="button"
+       class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
+  {{if eq .ViewState.booking.Status "CANCELLED" }}
+    <a href="/app/journeys/?departure={{json .ViewState.booking.Journey.PassengerPickup}}&destination={{ json .ViewState.booking.Journey.PassengerDrop }}&departuredate={{ .ViewState.booking.Journey.PassengerPickupDate.Format "2006-01-02"}}&departuretime={{ .ViewState.booking.Journey.PassengerPickupDate.Format "15:04"}}" class="inline-flex"><button type="button"
+     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Solliciter un autre conducteur</button></a>
+  {{end}}
  {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION" }}
-      <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/confirm" class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Confirmer
-        </button>
-      </a>
+  <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/confirm" class="inline-flex"><button type="button"
+     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Confirmer</button></a>
  {{end}}
-
  {{if ne .ViewState.booking.Status "WAITING_CONFIRMATION" }}
-      <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/waitconfirmation" class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Remettre en attente
-        </button>
-      </a>
+  <a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/waitconfirmation" class="inline-flex"><button type="button"
+     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Remettre en attente</button></a>
  {{end}}
-
  {{if ne .ViewState.booking.Status "CANCELLED" }}
-      {{$dialog := "cancel"}}
-      <div x-data="{ {{ $dialog }}: false}">
+  <!--<a href="/app/solidarity-transport/bookings/{{.ViewState.booking.Id}}/cancel" class="inline-flex"><button type="button"
+     class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Annuler</button></a>-->
+{{$dialog := "cancel"}}
+<div  x-data="{ {{ $dialog }}: false}">
  <button @click="{{ $dialog }} = !{{ $dialog }}" type="button" class="bg-co-red border-gray-300 border px-4 py-2 text-white items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
    Annuler 
  </button>
@@ -62,7 +90,7 @@
             <div class="mt-3 text-center sm:mt-5">
               <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Annuler</h3>
               <div class="mt-2">
-                      <p class="text-sm text-gray-500">Sélectionnez la raison de l'annulation</p>
+                 <p class="text-sm text-gray-500"></p>
               </div>
               <div>
                 <label for="reason" class="block text-sm font-medium text-gray-700">Raison de l'annulation</label>
@@ -78,269 +106,19 @@
             </div>
             <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
               <button @click="{{$dialog}} = !{{$dialog}}" type="button" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</button>
-                    <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmer</button>
+               <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Valider</button>
             </div>
           </form>
         </div>
       </div>
     </div>
  </div>
-      </div>
-      {{end}}
-
-      <a href="/app/journeys/?departure={{json .ViewState.booking.Journey.PassengerPickup}}&destination={{ json .ViewState.booking.Journey.PassengerDrop }}&passengerid={{.ViewState.booking.PassengerId}}" class="inline-flex">
-        <button type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Dupliquer
-        </button>
-      </a>
-
-      {{if eq .ViewState.booking.Status "CANCELLED" }}
-      {{$dialogReplace := "replace_driver"}}
-      <div x-data="{ {{ $dialogReplace }}: false}">
-        <button @click="{{ $dialogReplace }} = !{{ $dialogReplace }}" type="button" class="px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
-          Solliciter un autre conducteur
-        </button>
-
-        <!-- Modal for replacement drivers -->
-        <div x-show="{{$dialogReplace}}" class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true">
-          <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-
-          <div class="fixed inset-0 z-10 overflow-y-auto">
-            <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-6">
-
-              <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-6xl sm:p-6 m-4">
-                <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                  {{$.IconSet.Icon "hero:outline/users" "h-6 w-6"}}
-                </div>
-                <div class="mt-3 text-center sm:mt-5">
-                  <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Conducteurs disponibles</h3>
-                  <div class="mt-2">
-                    <p class="text-sm text-gray-500">Sélectionnez un conducteur de remplacement</p>
-                  </div>
-                </div>
-
-                <div class="mt-4">
-                  {{if .ViewState.replacement_drivers}}
-                  <table class="min-w-full divide-y divide-gray-300">
-                    <thead class="bg-gray-50">
-                      <tr>
-                        <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Conducteur</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Lieu de départ</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Distance conducteur</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Distance passager</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Dernier trajet (-{{$.ViewState.last_trip_days}}j)</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Prix passager</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Indemnité conducteur</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Commentaire</th>
-                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Profil validé</th>
-                        <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                          <span class="sr-only">Actions</span>
-                        </th>
-                      </tr>
-                    </thead>
-                    <tbody class="divide-y divide-gray-200 bg-white">
-                      {{range $index, $journey := .ViewState.replacement_drivers}}
-                      {{$driver := index $.ViewState.replacement_drivers_map $journey.DriverId}}
-                      {{$pricing := index $.ViewState.replacement_pricing $journey.Id}}
-                      {{$location := index $.ViewState.replacement_locations $journey.Id}}
-                      {{$lastTrip := index $.ViewState.driver_last_trips $journey.DriverId}}
-                      <tr>
-                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
-                          {{$driver.Data.first_name}} {{$driver.Data.last_name}}
-                        </td>
-                        <td class="px-3 py-4 text-sm text-gray-500">
-                          {{if $location}}{{$location}}{{else}}-{{end}}
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{$journey.DriverDistance}} km
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{$journey.PassengerDistance}} km
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{if $lastTrip.IsZero}}
-                          <span class="text-gray-400">-</span>
-                          {{else if eq ($lastTrip.Format "2006-01-02") ($.ViewState.booking.Journey.PassengerPickupDate.Format "2006-01-02")}}
-                          <span class="text-red-600 font-semibold">{{ $lastTrip.Format "02/01/2006" }}</span>
-                          {{else}}
-                          {{ $lastTrip.Format "02/01/2006" }}
-                          {{end}}
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{if $pricing}}
-                          {{printf "%.2f" $pricing.passenger.amount}} {{$pricing.passenger.currency}}
-                          {{else}}-{{end}}
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{if $pricing}}
-                          {{printf "%.2f" $pricing.driver.amount}} {{$pricing.driver.currency}}
-                          {{else}}-{{end}}
-                        </td>
-                        <td class="px-3 py-4 text-sm text-gray-500">
-                          {{if $driver.Data.other_properties}}{{$driver.Data.other_properties.comment}}{{end}}
-                        </td>
-                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                          {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID)}}
-                          <span class="p-1 px-2 text-xs bg-co-green text-white rounded-2xl">Oui</span>
-                          {{else}}
-                          <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
-                          {{end}}
-                        </td>
-                        <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
-                          <form method="POST" action="/app/solidarity-transport/bookings/{{$.ViewState.booking.Id}}/create-replacement" class="inline">
-                            <input type="hidden" name="driver_id" value="{{$journey.DriverId}}" />
-                            <input type="hidden" name="journey_id" value="{{$journey.Id}}" />
-                            <input type="hidden" name="message" value="{{template "sms_template" (dict "name" ($.ViewState.config.GetString "service_name") "datetime" (timeFormat $journey.PassengerPickupDate.AsTime "02/01/2006 15:04") "baseUrl" ($.ViewState.config.GetString "base_url"))}}" />
-                            <button type="submit" class="text-co-blue hover:text-co-blue-dark underline">
-                              Solliciter
-                            </button>
-                          </form>
-                        </td>
-                      </tr>
-                      {{end}}
-                    </tbody>
-                  </table>
-                  {{else}}
-                  <div class="text-center py-8">
-                    <p class="text-sm text-gray-500">Aucun conducteur disponible pour ce trajet</p>
-                  </div>
-                  {{end}}
-                </div>
-
-                <div class="mt-5 sm:mt-6">
-                  <button @click="{{$dialogReplace}} = !{{$dialogReplace}}" type="button" class="inline-flex w-full justify-center rounded-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">
-                    Fermer
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      {{end}}
-      {{end}}
-    </div>
 </div>
-
+  {{end}}
+</div>
+</div>
 <div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  <div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
-    <!-- Booking Details -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="px-4 py-5 sm:px-6">
-        <h3 class="text-lg leading-6 font-medium text-gray-900">Détails du transport solidaire</h3>
-        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations sur le trajet</p>
-      </div>
-      <div class="border-t border-gray-200 px-4 py-5 sm:p-0">
-        <dl class="sm:divide-y sm:divide-gray-200">
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              <a class="text-co-blue" href="/app/solidarity-transport/drivers/{{ .ViewState.driver.ID }}">{{ .ViewState.driver.Data.first_name }} {{ .ViewState.driver.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              <a class="text-co-blue" href="/app/beneficiaries/{{ .ViewState.passenger.ID }}">{{ .ViewState.passenger.Data.first_name }} {{ .ViewState.passenger.Data.last_name }}</a>
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Départ conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.DriverDeparture.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prise en charge passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.PassengerPickup.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Dépose passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.PassengerDrop.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Arrivée conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.DriverArrival.Properties.label }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Date et heure</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ timeFormat .ViewState.booking.Journey.PassengerPickupDate "02/01/2006 15:04" }}
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Type de trajet</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{if .ViewState.booking.Journey.Noreturn}}
-                Aller simple (pas de retour)
-              {{else}}
-                Aller-retour ({{.ViewState.booking.ReturnWaitingDuration | shortDuration}} d'attente estimée sur place)
-              {{end}}
-            </dd>
-          </div>
-          {{if .ViewState.booking.Data.motivation}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Motif</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{$motivation := .ViewState.booking.Data.motivation}}
-              {{$found := false}}
-              {{range .ViewState.booking_motivations}}
-                {{if eq .value $motivation}}
-                  {{.label}}
-                  {{$found = true}}
-                {{end}}
-              {{end}}
-              {{if not $found}}{{$motivation}}{{end}}
-            </dd>
-          </div>
-          {{end}}
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Distance passager</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.PassengerDistance }} km
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Distance conducteur</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              {{ .ViewState.booking.Journey.DriverDistance }} km
-            </dd>
-          </div>
-          <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-            <dt class="text-sm font-medium text-gray-500">Prix (passager)</dt>
-            <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-              <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.Journey.Price.Amount) }} {{ .ViewState.booking.Journey.Price.Currency }}</span>
-            </dd>
-          </div>
-          {{if .ViewState.booking.DriverCompensationAmount}}
-            {{if gt (round2 .ViewState.booking.DriverCompensationAmount) 0.0}}
-            <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-              <dt class="text-sm font-medium text-gray-500">Indemnité conducteur</dt>
-              <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
-                <span class="font-medium">{{ printf "%.2f" (round2 .ViewState.booking.DriverCompensationAmount) }} {{.ViewState.booking.DriverCompensationCurrency}}</span>
-              </dd>
-            </div>
-            {{end}}
-          {{end}}
-        </dl>
-      </div>
-    </div>
-
-    <!-- Map -->
-    <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-      <div class="border-t border-gray-200 h-full">
-        <div class="h-full min-h-96">
-          {{ template "journey_map" (dict "driver_journey" .ViewState.booking.Journey) }}
-        </div>
-      </div>
-    </div>
-  </div>
+  {{template "journey_preview" (dict "driver_journey" .ViewState.booking.Journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
 </div>

 {{ end }}
--- a/web/layouts/solidarity_transport/driver_create.html
+++ b/web/layouts/solidarity_transport/driver_create.html
@@ -116,46 +116,31 @@
                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                    <div class="grid grid-cols-6 gap-6">

-                        {{range .ViewState.profile_optional_fields}}
                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
+                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    {{if eq .name "gender"}}x-model="gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
+                                    <option value="0">Inconnu</option>
+                                    <option value="1">Masculin</option>
+                                    <option value="2">Féminin</option>
+                                    <option value="9">Sans objet</option>
                                </select>
                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "multicheckbox"}}
-                            <div class="mt-1 space-y-2">
-				{{$name := .name}}
-                                {{range .options}}
-                                <label class="flex items-center">
-                                    <input type="checkbox" name="{{$name}}[]" value="{{.value}}"
-				    x-model="other_properties.{{$name}}___{{.value}}"
-                                           class="h-4 w-4 text-co-blue focus:ring-co-blue border-co-blue rounded">
-                                    <span class="ml-2 text-sm text-gray-700">{{.label}}</span>
-                                </label>
-                                {{end}}
                        </div>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
+                        
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
+                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.last_subscription_date">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
+                            <textarea name="comment" id="comment"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.comment"></textarea>
                        </div>
-                        {{end}}

                        <!-- <div class="col-span-3 sm:col-span-3">
                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
--- a/web/layouts/solidarity_transport/driver_display.html
+++ b/web/layouts/solidarity_transport/driver_display.html
@@ -89,66 +89,25 @@
                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.file_number}}</dd>
                            </div>
                            {{end}}
-                            {{range .ViewState.profile_optional_fields}}
-                            {{$fieldName := .name}}
-                            {{$fieldLabel := .label}}
-                            {{$fieldType := .type}}
-                            {{if eq .type "multicheckbox"}}
-                                {{$hasValues := false}}
-                                {{range .options}}
-                                    {{$optionKey := printf "%s___%s" $fieldName .value}}
-                                    {{if index $.ViewState.driver.Data.other_properties $optionKey}}{{$hasValues = true}}{{end}}
-                                {{end}}
-                                {{if $hasValues}}
-                                <div class="sm:col-span-2">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">
-                                        <div class="flex flex-wrap gap-2">
-                                            {{range .options}}
-                                            {{$optionKey := printf "%s___%s" $fieldName .value}}
-                                            {{if index $.ViewState.driver.Data.other_properties $optionKey}}
-                                            <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-200 text-gray-800">
-                                                {{.label}}
-                                            </span>
-                                            {{end}}
-                                            {{end}}
-                                        </div>
-                                    </dd>
-                                </div>
-                                {{end}}
-                            {{else if eq .type "select"}}
-                                {{$fieldValue := index $.ViewState.driver.Data.other_properties $fieldName}}
-                                {{if and $fieldValue (ne $fieldValue "0") (ne $fieldValue "")}}
+                            {{if and .ViewState.driver.Data.other_properties .ViewState.driver.Data.other_properties.last_subscription_date}}
                            <div class="sm:col-span-1">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">
-                                        {{if eq $fieldName "gender"}}
-                                            {{genderISO5218 $fieldValue}}
-                                        {{else}}
-                                            {{range .options}}
-                                                {{if eq .value $fieldValue}}{{.label}}{{end}}
-                                            {{end}}
-                                        {{end}}
-                                    </dd>
+                                <dt class="text-sm font-medium text-gray-500">Dernière adhésion</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{ .ViewState.driver.Data.other_properties.last_subscription_date}}</dd>
                            </div>
                            {{end}}
-                            {{else}}
-                                {{$fieldValue := index $.ViewState.driver.Data.other_properties $fieldName}}
-                                {{if $fieldValue}}
+                            {{if and .ViewState.driver.Data.other_properties .ViewState.driver.Data.other_properties.comment}}
                            <div class="sm:col-span-1">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">{{$fieldValue}}</dd>
+                                <dt class="text-sm font-medium text-gray-500">Commentaire</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{ .ViewState.driver.Data.other_properties.comment}}</dd>
                            </div>
                            {{end}}
-                            {{end}}
-                            {{end}}
                        </dl>
                    </div>
                </div>
            </section>

            <section aria-labelledby="functionalities-title" x-data="{
-                    tab: '{{ if .ViewState.tab }}{{ .ViewState.tab }}{{ else }}documents{{ end }}',
+                    tab: 'documents',
                    to(event) {
                        this.tab = event.target.value
                    }
@@ -170,9 +129,7 @@

                                    <option value="documents">Documents</option>
                                    
-                                    <option value="wallet">Compte mobilité</option>
-
-                                    <option value="history">Transports solidaires</option>
+                                    <option value="history">Historique</option>
                                </select>
                            </div>
                            <div class="hidden sm:block">
@@ -189,15 +146,10 @@
                                        :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                        Documents </a>
                                        
-                                        <a href="#" @click="tab = 'wallet'"
-                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                        :class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Compte mobilité </a>
-
                                        <a href="#" @click="tab = 'history'"
                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                        :class="tab == 'history' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                        Transports solidaires </a>
+                                        Transport solidaires </a>

                                    </nav>
                                </div>
@@ -205,7 +157,6 @@
                        </div>

                        <div x-show="tab == 'documents'">{{template "driver_files" .}}</div>
-                        <div x-show="tab == 'wallet'">{{template "driver_wallet" .}}</div>
                        <div x-show="tab == 'history'">{{template "driver_history" .}}</div>

                    </div>
--- a/web/layouts/solidarity_transport/driver_journey.html
+++ b/web/layouts/solidarity_transport/driver_journey.html
@@ -8,9 +8,6 @@
        </div>
        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
          <form method="POST" action="/app/solidarity-transport/drivers/{{.ViewState.driver.ID}}/journeys/{{.ViewState.driver_journey.Id}}/noreturn">
-            {{if .ViewState.passenger.ID}}
-            <input type="hidden" name="passengerid" value="{{.ViewState.passenger.ID}}" />
-            {{end}}
            {{if .ViewState.driver_journey.Noreturn}}
            <button type="submit"
              class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
@@ -29,17 +26,15 @@
      </div>
 </div>
 <div class="max-w-7xl mx-auto py-8 px-4 sm:px-6 md:px-8">
-  {{template "journey_preview" (dict "driver_journey" .ViewState.driver_journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries "passenger_wallet_balance" .ViewState.passenger_wallet_balance "pricing_result" .ViewState.pricing_result)}}
+  {{template "journey_preview" (dict "driver_journey" .ViewState.driver_journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}}
          {{if ne .ViewState.passenger.ID ""}}
 <div class="max-w-7xl m-auto px-4 sm:px-6 md:px-8 flex flex-col justify-items-center">
  {{if .ViewState.passenger}}
-  {{if lt .ViewState.passenger_wallet_balance .ViewState.pricing_result.passenger.Amount}}
-    <p class="text-xl text-co-red text-center p-4">Le solde du compte mobilité est insuffisant. <a href="/app/beneficiaries/{{.ViewState.passenger.ID}}?tab=wallet" class="underline text-co-blue">Créditer le compte</a></p>
+  {{$wallet := (or .ViewState.passenger.Data.wallet 0.0)}}
+  {{if lt $wallet .ViewState.driver_journey.Price.Amount}}
+    <p class="text-xl text-co-red text-center p-4">Le solde du compte mobilité est insuffisant.</p>
    {{end}}
  <form method="POST">
-    {{if .ViewState.replaces_booking_id}}
-    <input type="hidden" name="replaces_booking_id" value="{{.ViewState.replaces_booking_id}}" />
-    {{end}}
    {{if not .ViewState.driver_journey.Noreturn}}
    <div class="m-auto text-center">
      <label for="return_waiting_time" class="block text-sm font-medium text-gray-700">Durée d'attente à destination (minutes)</label>
@@ -51,9 +46,14 @@
      <label for="motivation" class="block text-sm font-medium text-gray-700">Motif du trajet</label>
    <select name="motivation" id="motivation"
        class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm  rounded-2xl bg-white m-auto">
-      {{range .ViewState.booking_motivations}}
-      <option value="{{.value}}"{{if eq .value ""}} selected="selected"{{end}}>{{.label}}</option>
-      {{end}}
+      <option value="Administratif">Administratif (trajet garanti)</option>
+      <option value="Commerce">Commerce</option>
+      <option value="Courses">Courses</option>
+      <option value="Insertion">Insertion (trajet garanti)</option>
+      <option value="Loisirs">Loisirs</option>
+      <option value="Visite à un proche">Visite à un proche</option>
+      <option value="Santé">Santé (trajet garanti)</option>
+      <option selected="selected" value="">Autre&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>
    </select>
    </div>
    {{template "submit_with_sms" 
--- a/web/layouts/solidarity_transport/driver_update.html
+++ b/web/layouts/solidarity_transport/driver_update.html
@@ -14,7 +14,7 @@
          birthdate: {{if .ViewState.driver.Data.birthdate}}'{{ (timeFrom .ViewState.driver.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
        },
        other_properties: {{if .ViewState.driver.Data.other_properties}}{{ json .ViewState.driver.Data.other_properties }}{{else}}{}{{end}},
-        other_properties_serialized: {{ json .ViewState.driver.Data.other_properties }},
+        other_properties_serialized: '{{ json .ViewState.driver.Data.other_properties }}',
        rules: {
            first_name: ['required'],
            last_name: ['required'],
@@ -121,46 +121,31 @@
                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                    <div class="grid grid-cols-6 gap-6">

-                        {{range .ViewState.profile_optional_fields}}
                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
+                            <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    {{if eq .name "gender"}}x-model="gender"{{else}}x-model="other_properties.{{.name}}"{{end}}
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
+                                    <option value="0">Inconnu</option>
+                                    <option value="1">Masculin</option>
+                                    <option value="2">Féminin</option>
+                                    <option value="9">Sans objet</option>
                                </select>
                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "multicheckbox"}}
-                            <div class="mt-1 space-y-2">
-				{{$name := .name}}
-                                {{range .options}}
-                                <label class="flex items-center">
-                                    <input type="checkbox" name="{{$name}}[]" value="{{.value}}"
-				    x-model="other_properties.{{$name}}___{{.value}}"
-                                           class="h-4 w-4 text-co-blue focus:ring-co-blue border-co-blue rounded">
-                                    <span class="ml-2 text-sm text-gray-700">{{.label}}</span>
-                                </label>
-                                {{end}}
                        </div>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" x-model="other_properties.{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
+                        
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="last_subscription_date" class="block text-sm font-medium text-gray-700">Date de dernière adhésion</label>
+                            <input type="date" name="last_subscription_date" id="last_subscription_date" autocomplete="last_subscription_date" placeholder="JJ/MM/AAAA"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.last_subscription_date">
+                        </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="comment" class="block text-sm font-medium text-gray-700">Commentaire</label>
+                            <textarea name="comment" id="comment"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="other_properties.comment"></textarea>
                        </div>
-                        {{end}}

                        <!-- <div class="col-span-3 sm:col-span-3">
                            <label class="block text-sm font-medium text-gray-700"> Photo </label>
--- a/web/layouts/solidarity_transport/ext/booking_proposal.html
+++ b/web/layouts/solidarity_transport/ext/booking_proposal.html
@@ -14,7 +14,6 @@
  <script src="https://cdn.jsdelivr.net/npm/@protomaps/basemaps@5/dist/basemaps.js" crossorigin="anonymous"></script>
  <script src="https://cdn.jsdelivr.net/npm/@turf/turf@7/turf.min.js"></script>
  <script src="https://cdn.jsdelivr.net/npm/polyline@0.2.0/src/polyline.js"></script>
-  <meta name=viewport content="width=device-width" />
  <!--<script defer type="text/javascript" src="/public/js/main.js" defer></script>-->
    </head>
    <body class="h-full">
--- a/web/layouts/solidarity_transport/overview.html
+++ b/web/layouts/solidarity_transport/overview.html
@@ -1,10 +1,10 @@
 {{ define "content" }}
-{{$defaultTab := "solidarityService"}}
+
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
  <h1 class="text-2xl font-semibold text-gray-900">Transport solidaire</h1>

    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
-	    tab: '{{or .ViewState.tab $defaultTab}}',
+        tab: 'drivers',
        to(event) {
            this.tab = event.target.value
        }
@@ -12,13 +12,8 @@
        <div class="divide-y divide-gray-200">
            <div>
                <div class="hidden sm:block">
-                    <div class="border-b border-gray-200 pl-4 flex justify-between items-center">
+                    <div class="border-b border-gray-200 pl-4">
                        <nav class="-mb-px flex space-x-8" aria-label="Tabs"> 
-                            <a href="#" @click="tab = 'solidarityService'"
-                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                Trajets </a>
-                            
                            <a href="#" @click="tab = 'drivers'"
                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                :class="tab == 'drivers' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
@@ -29,32 +24,16 @@
                                :class="tab == 'beneficiaries' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                Bénéficiaires </a>-->

+                            <a href="#" @click="tab = 'solidarityService'"
+                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                :class="tab == 'solidarityService' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                Trajets </a>
+                            
                            <a href="#" @click="tab = 'solidarityHistory'"
                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                :class="tab == 'solidarityHistory' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                Trajets passés </a>
                        </nav>
-
-                        <div class="pr-4" x-show="tab == 'solidarityHistory'">
-                            {{$exportURL := "/exports/solidarity-transport/bookings.xlsx"}}
-                            {{$hasParams := false}}
-                            {{if .ViewState.hist_filters.date_start}}{{$exportURL = printf "%s?start_date=%s" $exportURL .ViewState.hist_filters.date_start}}{{$hasParams = true}}{{end}}
-                            {{if .ViewState.hist_filters.date_end}}{{if $hasParams}}{{$exportURL = printf "%s&end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{else}}{{$exportURL = printf "%s?end_date=%s" $exportURL .ViewState.hist_filters.date_end}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.status}}{{if $hasParams}}{{$exportURL = printf "%s&status=%s" $exportURL .ViewState.hist_filters.status}}{{else}}{{$exportURL = printf "%s?status=%s" $exportURL .ViewState.hist_filters.status}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.departure_geo}}{{if $hasParams}}{{$exportURL = printf "%s&departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{else}}{{$exportURL = printf "%s?departure_geo=%s" $exportURL .ViewState.hist_filters.departure_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.destination_geo}}{{if $hasParams}}{{$exportURL = printf "%s&destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{else}}{{$exportURL = printf "%s?destination_geo=%s" $exportURL .ViewState.hist_filters.destination_geo}}{{$hasParams = true}}{{end}}{{end}}
-                            {{if .ViewState.hist_filters.passenger_address_geo}}{{if $hasParams}}{{$exportURL = printf "%s&passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{else}}{{$exportURL = printf "%s?passenger_address_geo=%s" $exportURL .ViewState.hist_filters.passenger_address_geo}}{{$hasParams = true}}{{end}}{{end}}
-
-                            <a href="{{$exportURL}}">
-                                <button type="button"
-                                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                                    <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 mr-3" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
-                                    </svg>
-                                    Exporter
-                                </button>
-                            </a>
-                        </div>
                    </div>
                </div>
            </div>
--- a/web/layouts/vehicles/booking-display.html
+++ b/web/layouts/vehicles/booking-display.html
@@ -132,14 +132,14 @@
                                </div>
                                {{end}}
                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Date et heure de prise en charge</dt>
+                                    <dt class="text-sm font-medium text-gray-500">Date de récupération</dt>
                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{(timeFrom .ViewState.booking.Startdate).Format
-                                        "02/01/2006 à 15:04"}}</dd>
+                                        "02/01/2006"}}</dd>
                                </div>
                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Date et heure de restitution</dt>
+                                    <dt class="text-sm font-medium text-gray-500">Date de retour</dt>
                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{(timeFrom .ViewState.booking.Enddate).Format
-                                        "02/01/2006 à 15:04"}}</dd>
+                                        "02/01/2006"}}</dd>
                                </div>
                                <div>
                                    <p class="text-sm font-medium text-gray-500 my-4">Documents</p>
--- a/web/layouts/vehicles/bookings-list.html
+++ b/web/layouts/vehicles/bookings-list.html
@@ -55,11 +55,7 @@
                            {{range .ViewState.bookings}}
                            <tr>
                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
-                                    {{if .Deleted}}
-                                    <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
-                                        Supprimé
-                                    </span>
-                                    {{else if .Data.administrator_unavailability}}
+                                    {{if .Data.administrator_unavailability}}
                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                        Retiré
                                    </span>
--- a/web/layouts/vehicles/create-booking-diag.html
+++ b/web/layouts/vehicles/create-booking-diag.html
@@ -0,0 +1,110 @@
+{{define "content"}}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            name: null,
+            namespace: 'parcoursmob_bookings',
+        },
+        rules: {
+            name: ['required'],
+            namespace: ['required'],
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
+                        pour créer un diagnostic dans PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="name" id="name" autocomplete="given-name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" name="namespace" value="parcoursmob_bookings" />
+        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
+                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.json_schema" @blur="validateField('json_schema')"
+                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
+                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
+                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div> -->
+        <div class="flex justify-end">
+            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
+            <a href="/app/vehicles/bookings/{{.ViewState.booking}}">
+                <button type="button"
+                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+            </a>
+            <button type="submit"
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
+        </div>
+    </form>
+</div>
+{{end}}
--- a/web/layouts/vehicles/search.html
+++ b/web/layouts/vehicles/search.html
@@ -21,8 +21,9 @@
            <div class="bg-white shadow sm:rounded-2xl">
                <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Chercher un véhicule</h2>
                <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                    <form method="GET" x-data="{
-                        beneficiarySelected: {{if .ViewState.search}}true{{else}}false{{end}},
+                    <form method="GET">
+                        
+                    <div x-data="{
                        text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
                        beneficiariesListOpen: false,
                        beneficiaries: {{json .ViewState.beneficiaries}},
@@ -39,13 +40,10 @@
                            this.fields.beneficiaryid = beneficiary.id 
                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
                            this.beneficiariesListOpen = false
-                            this.beneficiarySelected = true
                        },
-                    }" @submit="if(!beneficiarySelected) { $event.preventDefault(); alert('Veuillez sélectionner un bénéficiaire'); }">
-
-                    <div>
+                    }">
                        <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
-                        <label for="combobox" class="block text-sm font-medium text-gray-700">Bénéficiaire <span class="text-red-600">*</span></label>
+                        <label for="combobox" class="block text-sm font-medium text-gray-700">Bénéficiaire</label>
                        <div class="relative mt-1 mb-4">
                          <input autocomplete="off" @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
                          
@@ -91,37 +89,21 @@
                        {{ template "address_autocomplete" dict "FieldName" $fieldName }} -->
                        <div class="py-4 grid grid-cols-2">
                            <div class="lg:col-span-1">
-                                <label for="startdate" class="block text-sm font-medium text-gray-700">Du <span class="text-red-600">*</span></label>
+                                <label for="startdate" class="block text-sm font-medium text-gray-700">Du</label>
                                <div class="mt-1">
-                                    <input type="date" id="startdate" name="startdate" value="{{if .ViewState.search}}{{(timeFrom .ViewState.search.startdate).Format "2006-01-02"}}{{end}}" required
+                                    <input type="date" id="startdate" name="startdate" value="{{.ViewState.search.startdate}}"
                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
                                </div>
                            </div>
                            <div class="lg:col-span-1">
-                                <label for="enddate" class="block text-sm font-medium text-gray-700">Au <span class="text-red-600">*</span></label>
+                                <label for="enddate" class="block text-sm font-medium text-gray-700">Au</label>
                                <div class="mt-1">
-                                    <input type="date" id="enddate" name="enddate" value="{{if .ViewState.search}}{{(timeFrom .ViewState.search.enddate).Format "2006-01-02"}}{{end}}" required
+                                    <input type="date" id="enddate" name="enddate" value="{{.ViewState.search.enddate}}"
                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
                                </div>
                            </div>
                            
                        </div>
-                        <div class="py-4 grid grid-cols-2 gap-4">
-                            <div class="lg:col-span-1">
-                                <label for="starttime" class="block text-sm font-medium text-gray-700">Prise en charge</label>
-                                <div class="mt-1">
-                                    <input type="time" id="starttime" name="starttime" value="{{if .ViewState.search}}{{(timeFrom .ViewState.search.startdate).Format "15:04"}}{{else}}09:00{{end}}"
-                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">
-                                </div>
-                            </div>
-                            <div class="lg:col-span-1">
-                                <label for="endtime" class="block text-sm font-medium text-gray-700">Restitution</label>
-                                <div class="mt-1">
-                                    <input type="time" id="endtime" name="endtime" value="{{if .ViewState.search}}{{(timeFrom .ViewState.search.enddate).Format "15:04"}}{{else}}18:00{{end}}"
-                                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">
-                                </div>
-                            </div>
-                        </div>
                        <div class="py-4"
                          x-data="{
                            type: {{if .ViewState.searched}}'{{.ViewState.search.selected_type}}'{{else}}null{{end}},
@@ -165,6 +147,20 @@
        <div class="lg:col-start-2 lg:col-span-2">
            {{if .ViewState.searched}}
            <div class="bg-white px-4 py-5 shadow sm:rounded-2xl sm:px-6">
+              <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Documents demandés</h2>
+              <table>
+                <tbody>
+                  {{range .ViewState.search.mandatory_documents}}
+                  <tr>
+                    <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">
+                      {{index $.ViewState.search.file_types_map .}}
+                    </td>
+                  </tr>
+                  {{end}}
+                </tbody>
+              </table>
+            </div>            
+            <div class="bg-white mt-8 px-4 py-5 shadow sm:rounded-2xl sm:px-6">
                <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Véhicules disponibles</h2>
                <div class="mt-8 flex flex-col">
                    <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
@@ -173,6 +169,7 @@
                          <thead>
                            <tr>
                              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 md:pl-0">Véhicule</th>
+                              <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Numéro</th>
                              <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Gestionnaire</th>
                              <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Lieu</th>
                              <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6 md:pr-0">
@@ -183,7 +180,7 @@
                          <tbody class="divide-y divide-gray-200">
                            {{range .ViewState.search.vehicles}}
                            <tr>
-                              <td class="py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 md:pl-0">
+                              <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 md:pl-0">
                                <div class="font-medium text-gray-900">{{.Data.name}}</div>
                                <div class="text-gray-500">
                                  {{.Type}}
@@ -191,12 +188,10 @@
                                  {{ if .Data.automatic}} (boite auto){{ end }}
                                  {{end}}
                                </div>
-                                {{if .Data.licence_plate}}
-                                <div class="text-gray-500 text-xs mt-1">{{.Data.licence_plate}}</div>
-                                {{end}}
                              </td>
+                              <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{.Data.licence_plate}}</td>
                              <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{(index $.ViewState.search.admingroups (index .Administrators 0)).Data.name}}</td>
-                              <td class="py-4 px-3 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
+                              <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
                              <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6 md:pr-0"
                                x-data="{
                                  documentsdialog: false
@@ -209,103 +204,46 @@
                                
                                  <div class="fixed inset-0 z-10 overflow-y-auto">
                                    <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-                                      <div class="relative transform overflow-hidden rounded-2xl bg-white text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-lg">
-                                        <!-- Header -->
-                                        <div class="bg-co-blue px-6 py-5">
-                                          <div class="flex items-center">
-                                            <div class="flex-shrink-0 flex h-12 w-12 items-center justify-center rounded-xl bg-white/20 backdrop-blur">
-                                              {{$.IconSet.Icon "hero:outline/document-text" "h-6 w-6 text-white"}}
+                                      <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
+                                        <div>
+                                          <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue">
+                                            {{$.IconSet.Icon "hero:outline/folder-plus" "h-6 w-6 text-white"}}
                                          </div>
-                                            <div class="ml-4">
-                                              <h3 class="text-lg font-semibold text-white" id="modal-title">Documents demandés</h3>
-                                              <p class="text-sm text-white/70">{{len $.ViewState.search.mandatory_documents}} document(s) requis pour cette réservation</p>
+                                          <div class="mt-3 text-center sm:mt-5">
+                                            <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Documents demandés</h3>
+                                            <div class="mt-2">
+                                              <p class="text-sm text-gray-500">Ajoutez des documents pour finaliser</p>
                                            </div>
                                          </div>
                                        </div>
-
-                                        <form enctype="multipart/form-data" method="POST" action="/app/vehicles/v/{{.ID}}/b/{{$.ViewState.search.beneficiary.ID}}?startdate={{(timeFrom $.ViewState.search.startdate).Format "2006-01-02"}}&enddate={{(timeFrom $.ViewState.search.enddate).Format "2006-01-02"}}&starttime={{(timeFrom $.ViewState.search.startdate).Format "15:04"}}&endtime={{(timeFrom $.ViewState.search.enddate).Format "15:04"}}">
-                                          <div class="px-6 py-5 space-y-4 max-h-96 overflow-y-auto">
-                                            {{range $type := $.ViewState.search.mandatory_documents}}
-                                            <div class="bg-gray-50 rounded-2xl p-4 border border-gray-200"
+                                        <form enctype="multipart/form-data" method="POST" action="/app/vehicles/v/{{.ID}}/b/{{$.ViewState.search.beneficiary.ID}}?startdate={{$.ViewState.search.startdate}}&enddate={{$.ViewState.search.enddate}}">
+                                          {{range $.ViewState.search.mandatory_documents}}
+                                          {{$type := .}}
+                                          <div class="p-2"
                                            x-data="{
-                                                select: '{{index $.ViewState.search.documents_defaults $type}}',
-                                                dragover: false
+                                              select: '{{index $.ViewState.search.documents_defaults $type}}'
                                            }">
-                                              <div class="flex items-start justify-between mb-3">
-                                                <div class="flex items-center">
-                                                  <span class="flex-shrink-0 inline-flex items-center justify-center h-8 w-8 rounded-xl bg-co-blue text-white">
-                                                    {{$.IconSet.Icon "hero:outline/document" "h-4 w-4"}}
-                                                  </span>
-                                                  <div class="ml-3">
-                                                    <label for="type-{{$type}}" class="block text-sm font-semibold text-gray-900">{{index $.ViewState.search.file_types_map $type}}</label>
-                                                    <p class="text-xs text-gray-500">Document obligatoire</p>
-                                                  </div>
-                                                </div>
-                                                <span x-show="select !== ''" class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-co-green/20 text-co-green">
-                                                  {{$.IconSet.Icon "hero:solid/check-circle" "h-3.5 w-3.5 mr-1"}}
-                                                  Sélectionné
-                                                </span>
-                                              </div>
-
-                                              <select x-model="select" id="type-{{$type}}" name="type-{{$type}}"
-                                                class="block w-full rounded-2xl border-gray-300 py-2.5 pl-3 pr-10 text-sm focus:border-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue/20 transition-shadow">
+                                            <label for="type" class="block text-sm font-medium text-gray-700">{{index $.ViewState.search.file_types_map $type}}</label>
+                                            <select x-model="select" id="type-{{$type}}" name="type-{{$type}}" class="mt-1 block w-full rounded-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-co-blue focus:outline-none focus:ring-co-blue sm:text-sm">
                                            {{range $.ViewState.search.beneficiary_documents}}
                                              {{if eq $type .Metadata.Type}}
-                                                  <option value="{{.Key}}">{{.Metadata.Name}}</option>
+                                              <option value="{{.Key}}">Fichier bénéficiaire : {{.Metadata.Name}}</option>
                                              {{end}}
                                            {{end}}
-                                                <option value="">Téléverser un nouveau fichier</option>
+                                              <option value="">Ajouter un fichier</option>
                                            </select>
-
-                                              <!-- File upload area -->
-                                              <div x-show="select == ''" x-transition class="mt-3"
-                                                x-data="{ fileName: '' }">
-                                                <input type="file" name="doc-{{$type}}" x-ref="fileInput"
-                                                  @change="fileName = $event.target.files[0]?.name || ''"
-                                                  class="hidden" />
-                                                <!-- Empty state: drop zone -->
-                                                <div x-show="!fileName"
-                                                  class="relative border-2 border-dashed rounded-2xl p-4 text-center transition-colors cursor-pointer"
-                                                  :class="dragover ? 'border-co-blue bg-co-blue/5' : 'border-gray-300 hover:border-gray-400'"
-                                                  @click="$refs.fileInput.click()"
-                                                  @dragover.prevent="dragover = true"
-                                                  @dragleave.prevent="dragover = false"
-                                                  @drop.prevent="dragover = false; $refs.fileInput.files = $event.dataTransfer.files; fileName = $event.dataTransfer.files[0]?.name || ''">
-                                                  <div class="space-y-1">
-                                                    {{$.IconSet.Icon "hero:outline/cloud-arrow-up" "mx-auto h-8 w-8 text-gray-400"}}
-                                                    <p class="text-sm text-gray-600">Glissez un fichier ou <span class="text-co-blue font-medium">parcourir</span></p>
-                                                    <p class="text-xs text-gray-400">PDF, JPG, PNG jusqu'à 10Mo</p>
-                                                  </div>
-                                                </div>
-                                                <!-- File selected state -->
-                                                <div x-show="fileName" class="flex items-center justify-between p-3 bg-co-green/10 border border-co-green/30 rounded-2xl">
-                                                  <div class="flex items-center min-w-0 cursor-pointer flex-1" @click="$refs.fileInput.click()">
-                                                    {{$.IconSet.Icon "hero:solid/document-check" "h-5 w-5 text-co-green flex-shrink-0"}}
-                                                    <span class="ml-2 text-sm text-gray-800 truncate" x-text="fileName"></span>
-                                                    <span class="ml-2 text-xs text-co-green hover:text-co-green/80">(modifier)</span>
-                                                  </div>
-                                                  <button type="button" @click="fileName = ''; $refs.fileInput.value = ''" class="ml-2 flex-shrink-0 text-co-red hover:text-co-red/80">
-                                                    {{$.IconSet.Icon "hero:outline/x-mark" "h-5 w-5"}}
-                                                  </button>
-                                                </div>
+                                            <div x-show="select == ''" class="p-2">
+                                              <input type="file" name="doc-{{$type}}" />
                                            </div>
                                          </div>
                                          {{end}}
-                                          </div>
-
-                                          <!-- Footer -->
-                                          <div class="bg-gray-50 px-6 py-4 flex flex-col-reverse sm:flex-row sm:justify-end gap-3 border-t border-gray-200">
-                                            <button @click="documentsdialog=false" type="button"
-                                              class="w-full sm:w-auto inline-flex justify-center items-center px-4 py-2.5 border border-gray-300 rounded-2xl text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue transition-colors">
-                                              Annuler
-                                            </button>
-                                            <button type="submit"
-                                              class="w-full sm:w-auto inline-flex justify-center items-center px-6 py-2.5 border border-transparent rounded-2xl text-sm font-medium text-white bg-co-blue hover:bg-co-blue/90 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue shadow-sm transition-colors">
-                                              {{$.IconSet.Icon "hero:outline/check" "h-4 w-4 mr-2"}}
-                                              Confirmer la réservation
-                                            </button>
+                                          <div class="mt-5 sm:mt-6">
+                                            <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Réserver</button>
                                          </div>
                                        </form>
+                                        <div class="mt-5 sm:mt-6">
+                                          <button @click="documentsdialog=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+                                        </div>
                                      </div>
                                    </div>
                                  </div>
--- a/web/layouts/vehicles_management/_partials/booking-diags.html
+++ b/web/layouts/vehicles_management/_partials/booking-diags.html
@@ -0,0 +1,56 @@
+{{define "booking_diags"}}
+{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
+{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
+<div class="bg-white shadow sm:rounded-lg">
+    <div class="px-4 py-5 flex items-center space-x-5 sm:px-6">
+        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
+        <a href="{{.ViewState.booking.ID}}/create-diag">
+            <button type="button"
+            class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
+            {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
+            Créer un diagnostic
+            </button>
+        </a>
+    </div>
+    <div class="border-t border-gray-200">
+        {{ $diagCount := len .ViewState.diags }}
+        <ul role="list" class="divide-y divide-gray-200 flex-1">
+            {{if eq $diagCount 0}}
+                <li class="py-2 px-4">
+                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
+                </li>
+            {{else}}
+                {{range .ViewState.diags}}
+                {{ $diags := .ID }}
+                {{if eq .Deleted false}}
+                    <li class="py-5 px-4 flex">
+                            <div class="flex-1 ml-3">
+                                <a href="/app/diags/{{$diags}}" class="mt-1 text-sm text-gray-900">{{.Name}}</a>
+                            </div>
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
+                            </div>
+                            <a href="/app/diags/{{$diags}}" target="_blank">
+                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
+                            </a>
+                    </li>
+                {{end}}
+                {{if eq .Deleted true}}
+                    <li class="py-5 px-4 flex">
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
+                            </div>
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
+                            </div>
+                        <div class="flex-1 ml-3">
+                            <p class="mt-1 text-sm text-gray-900">Ce diagnostique a été retiré</p>
+                        </div>
+                    </li>
+                {{end}}
+                {{end}}
+            {{end}}
+        </ul>
+    </div>
+</div>
+{{end}}
--- a/web/layouts/vehicles_management/_partials/booking_filters.html
+++ b/web/layouts/vehicles_management/_partials/booking_filters.html
@@ -1,41 +0,0 @@
-{{ define "vehicle_booking_filters" }}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-<form>
-
-<div class="flex flex-row justify-end flex-wrap">
-
-<div class="m-4">
-<div>
-  <label for="vehicles_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
-  <div class="mt-2 flex">
-	  <input id="vehicles_date_start" type="date" name="date_start" class="block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.ViewState.filters.date_start}}" onchange="this.form.submit()" />
-	  <input id="vehicles_date_end" type="date" name="date_end" class="mx-2 block w-full rounded-md bg-white px-3 py-1.5 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 placeholder:text-gray-400 focus:outline-2 focus:-outline-offset-2 focus:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:placeholder:text-gray-500 dark:focus:outline-co-blue" value="{{.ViewState.filters.date_end}}" onchange="this.form.submit()" />
-  </div>
-</div>
-</div>
-
-<div class="m-4">
-<label for="vehicles_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
-<div class="mt-2 grid grid-cols-1">
-<select id="vehicles_status" name="status" class="col-start-1 row-start-1 w-full appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option></option>
-    <option value="FORTHCOMING"{{if eq .ViewState.filters.status "FORTHCOMING"}} selected{{end}}>A venir</option>
-    <option value="ONGOING"{{if eq .ViewState.filters.status "ONGOING"}} selected{{end}}>En cours</option>
-    <option value="TERMINATED"{{if eq .ViewState.filters.status "TERMINATED"}} selected{{end}}>Terminé</option>
-    <option value="CANCELLED"{{if eq .ViewState.filters.status "CANCELLED"}} selected{{end}}>Annulé</option>
-  </select>
-  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
-    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
-  </svg>
-</div>
-</div>
-
-<div class="m-4">
-
-</div>
-
-</div>
-
-</form>
-</div>
-{{ end }}
--- a/web/layouts/vehicles_management/_partials/bookings-list.html
+++ b/web/layouts/vehicles_management/_partials/bookings-list.html
@@ -39,7 +39,7 @@
                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                        Retiré
                                    </span>
-                                    {{else if .Deleted}}
+                                    {{else if or .Deleted .Data.Deleted}}
                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                        Annulé
                                    </span>
@@ -78,14 +78,11 @@
                                    </div>
                                    {{end}}
                                </td>
-                                <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                    {{if .Data.administrator_unavailability}}
                                    <div class="text-gray-900" >Retiré du {{(timeFrom .Unavailablefrom).Format "02/01/2006"}} au {{(timeFrom .Unavailableto).Format "02/01/2006"}}</div>
                                    {{else}}
-                                    <div class="text-gray-900" >
-                                        <div>Du {{(timeFrom .Startdate).Format "02/01/2006 à 15:04"}}</div>
-                                        <div>au {{(timeFrom .Enddate).Format "02/01/2006 à 15:04"}}</div>
-                                    </div>
+                                    <div class="text-gray-900" >Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}</div>
                                    {{end}}
                                </td>
                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
--- a/web/layouts/vehicles_management/_partials/vehicle-diags.html
+++ b/web/layouts/vehicles_management/_partials/vehicle-diags.html
@@ -0,0 +1,56 @@
+{{define "vehicle_diags"}}
+{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
+{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
+<div class="bg-white shadow sm:rounded-lg">
+    <div class="px-4 py-5 flex items-center space-x-5 sm:px-6">
+        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Diagnostics réalisés</h2>
+        <a href="{{.ViewState.vehicle.ID}}/create-diag">
+            <button type="button"
+            class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
+            {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
+            Créer un diagnostic
+            </button>
+        </a>
+    </div>
+    <div class="border-t border-gray-200">
+        {{ $diagCount := len .ViewState.diags }}
+        <ul role="list" class="divide-y divide-gray-200 flex-1">
+            {{if eq $diagCount 0}}
+                <li class="py-2 px-4">
+                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun diagnostique effectué pour le moment.</p>
+                </li>
+            {{else}}
+                {{range .ViewState.diags}}
+                {{ $diags := .ID }}
+                {{if eq .Deleted false}}
+                    <li class="py-5 px-4 flex">
+                            <div class="flex-1 ml-3">
+                                <a href="app/diags/{{$diags}}" class="mt-1 text-sm text-gray-900">{{.Name}}</a>
+                                <div class="flex-1 ml-3">
+                                    <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
+                                </div>
+                            </div>
+                            <a href="/app/diags/{{$diags}}" target="_blank">
+                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le diagnostic</span></button>
+                            </a>
+                    </li>
+                {{end}}
+                {{if eq .Deleted true}}
+                    <li class="py-5 px-4 flex">
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{.Name}}</p>
+                            </div>
+                            <div class="flex-1 ml-3">
+                                <p class="mt-1 text-sm text-gray-900">{{(timeFrom .Diagdate).Format "02/01/2006"}}</p>
+                            </div>
+                        <div class="flex-1 ml-3">
+                            <p class="mt-1 text-sm text-gray-900">Ce diagnostique a été retiré</p>
+                        </div>
+                    </li>
+                {{end}}
+                {{end}}
+            {{end}}
+        </ul>
+    </div>
+</div>
+{{end}}
--- a/web/layouts/vehicles_management/booking-display.html
+++ b/web/layouts/vehicles_management/booking-display.html
@@ -17,7 +17,7 @@
                    return true
                }
            }">
-            {{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Deleted)}}
+            {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
            <button type="button" @click="changeVehicle = ! changeVehicle"
                class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
                Changer de véhicule
@@ -39,11 +39,6 @@
                            <div class="text-center">
                                <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Changer de véhicule</h3>
                            </div>
-                            {{if eq (len .ViewState.alternative_vehicles) 0}}
-                            <div class="mt-4 text-center">
-                                <p class="text-sm text-gray-500">Aucun véhicule disponible pour les dates de cette réservation.</p>
-                            </div>
-                            {{else}}
                            <form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/change-vehicle" class="mt-4" @submit="submitSelectedvehicle">
                                <select x-model="selectedvehicle" id="vehicle" name="vehicle" class="mt-1 block w-full rounded-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-co-blue focus:outline-none focus:ring-co-blue sm:text-sm">
                                    <option value=""></option>
@@ -55,7 +50,6 @@
                                    <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Changer de véhicule</button>
                                </div>
                            </form>
-                            {{end}}
                            <div class="mt-5 sm:mt-6">
                                <button @click="changeVehicle=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
                              </div>
@@ -132,24 +126,18 @@
                    </div>
                </div>
            </div>
+            <!--<div>
+                {{template "booking_diags" .}}
+            </div>-->
        </div>
        <div class="lg:col-start-2 lg:col-span-2">
            <div class="bg-white  shadow sm:rounded-2xl sm:px-6">
                <div class="bg-white px-4 py-5 border-b border-gray-200 sm:px-6">
                    <div class="-ml-4 -mt-4 flex justify-between items-center flex-wrap sm:flex-nowrap">
                        <div class="ml-4 mt-4">
-                            {{if .ViewState.booking.Deleted}}
-                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation annulée le {{if .ViewState.booking.Data.deleted_at}}{{(timeFrom .ViewState.booking.Data.deleted_at).Format "02/01/2006"}}{{else}}{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}{{end}}</h3>
-                            {{if .ViewState.booking.Data.deleted_by}}
-                            <p class="mt-1 text-sm text-gray-500">
-                                Annulée par : {{index (index .ViewState.booking.Data.deleted_by "user") "display_name"}} ({{index (index .ViewState.booking.Data.deleted_by "group") "name"}})
-                            </p>
-                            {{end}}
-                            {{if .ViewState.booking.Data.reason}}
-                            <p class="mt-1 text-sm text-gray-500">Motif : {{.ViewState.booking.Data.reason}}</p>
-                            {{else if .ViewState.booking.Data.motif}}
+                            {{if or .ViewState.booking.Data.Deleted .ViewState.booking.Deleted}}
+                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation annulée le {{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</h3>
                            <p class="mt-1 text-sm text-gray-500">Motif : {{.ViewState.booking.Data.motif}}</p>
-                            {{end}}
                            {{else}}
                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation</h3>
                            <p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
@@ -218,48 +206,44 @@
                                </div>
                                {{end}}
                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Date et heure de prise en charge</dt>
-                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
+                                    <dt class="text-sm font-medium text-gray-500">Date de récupération</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2 inline-flex"
                                    x-data="{ updateOpen: false }">
                                    <div class="w-full inline-flex" x-show="!updateOpen">
-                                        <div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006 à 15:04"}}</div>
-                                        {{if (not .ViewState.booking.Deleted)}}
+                                        <div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006"}}</div>
+                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                        <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
                                        {{end}}
                                    </div>
-                                    <form method="POST" class="inline-flex flex-col gap-2" x-show="updateOpen">
-                                        <div class="flex gap-2">
+                                    <form method="POST" class="inline-flex" x-show="updateOpen">
+                                        <div class="flex-1">
                                            <input type="date" name="startdate" value="{{(timeFrom .ViewState.booking.Startdate).Format "2006-01-02"}}"
                                            class="shadow-sm focus:ring-co-blue focus:border-co-blue block sm:text-sm border-gray-300 rounded-2xl">
-                                            <input type="time" name="starttime" value="{{(timeFrom .ViewState.booking.Startdate).Format "15:04"}}"
-                                            class="shadow-sm focus:ring-co-blue focus:border-co-blue block sm:text-sm border-gray-300 rounded-2xl">
                                        </div>
                                        <button 
-                                            class="justify-center text-co-blue px-4 self-start">
+                                            class=" justify-center text-co-blue px-4">
                                            OK
                                        </button>
                                    </form>
                                    </dd>
                                </div>
                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
-                                    <dt class="text-sm font-medium text-gray-500">Date et heure de restitution</dt>
+                                    <dt class="text-sm font-medium text-gray-500">Date de retour</dt>
                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"
                                        x-data="{ updateOpen: false }">
                                        <div class="w-full inline-flex" x-show="!updateOpen">
-                                            <div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006 à 15:04"}}</div>
-                                            {{if (not .ViewState.booking.Deleted)}}
+                                            <div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}</div>
+                                            {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                            <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
                                            {{end}}
                                        </div>
-                                        <form method="POST" class="inline-flex flex-col gap-2" x-show="updateOpen">
-                                            <div class="flex gap-2">
+                                        <form method="POST" class="inline-flex" x-show="updateOpen">
+                                            <div class="flex-1">
                                                <input type="date" name="enddate" value="{{(timeFrom .ViewState.booking.Enddate).Format "2006-01-02"}}"
                                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block sm:text-sm border-gray-300 rounded-2xl">
-                                                <input type="time" name="endtime" value="{{(timeFrom .ViewState.booking.Enddate).Format "15:04"}}"
-                                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block sm:text-sm border-gray-300 rounded-2xl">
                                            </div>
                                            <button 
-                                                class="justify-center text-co-blue px-4 self-start">
+                                                class=" justify-center text-co-blue px-4">
                                                OK
                                            </button>
                                        </form>
@@ -271,7 +255,7 @@
                                    x-data="{ updateOpen: false }">
                                    <div class="w-full inline-flex" x-show="!updateOpen">
                                        <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailablefrom).Format "02/01/2006"}}</div>
-                                        {{if (not .ViewState.booking.Deleted)}}
+                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                        <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
                                        {{end}}
                                    </div>
@@ -293,7 +277,7 @@
                                    x-data="{ updateOpen: false }">
                                    <div class="w-full inline-flex" x-show="!updateOpen">
                                        <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</div>
-                                        {{if (not .ViewState.booking.Deleted)}}
+                                        {{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
                                        <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
                                        {{end}}
                                    </div>
--- a/web/layouts/vehicles_management/bookings-list.html
+++ b/web/layouts/vehicles_management/bookings-list.html
@@ -9,7 +9,7 @@
        </div>
        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
            
-            <a href="/exports/fleets/bookings/group_bookings.xlsx?status={{.ViewState.filters.status}}&date_start={{.ViewState.filters.date_start}}&date_end={{.ViewState.filters.date_end}}">
+            <a href="/exports/fleets/bookings">
                <button type="button"
                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
@@ -20,8 +20,6 @@
    </div>
 </div>

-{{template "vehicle_booking_filters" .}}
-
 {{template "bookings_list" .}}

 {{end}}
--- a/web/layouts/vehicles_management/create-booking-diag.html
+++ b/web/layouts/vehicles_management/create-booking-diag.html
@@ -0,0 +1,116 @@
+{{define "content"}}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            name: null,
+            namespace: 'parcoursmob_bookings',
+            json_schema: null,
+            ui_schema: null,
+        },
+        rules: {
+            name: ['required']
+            namespace: ['required']
+            json_schema: ['required']
+            ui_schema: ['required']
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+                json_schema: {valid: null},
+                ui_schema: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
+                        pour créer un diagnostic dans PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="name" id="name" autocomplete="given-name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" name="namespace" value="parcoursmob_bookings" />
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
+                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.json_schema" @blur="validateField('json_schema')"
+                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
+                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
+                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="flex justify-end">
+            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
+            <a href="/app/vehicles-management/bookings/{{.ViewState.booking}}">
+                <button type="button"
+                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+            </a>
+            <button type="submit"
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
+        </div>
+    </form>
+</div>
+{{end}}
--- a/web/layouts/vehicles_management/create-vehicle-diag.html
+++ b/web/layouts/vehicles_management/create-vehicle-diag.html
@@ -0,0 +1,110 @@
+{{define "content"}}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Ajouter un diagnostic</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            name: null,
+            namespace: 'parcoursmob_vehicles',
+        },
+        rules: {
+            name: ['required'],
+            namespace: ['required'],
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations obligatoires
+                        pour créer un diagnostic dans PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="name" id="name" autocomplete="given-name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <input type="hidden" name="namespace" value="parcoursmob_vehicles" />
+        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma JSON</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma JSON pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="json_schema" class="block text-sm font-medium text-gray-700">Schéma JSON</label>
+                            <textarea name="json_schema" id="json_schema" autocomplete="json_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.json_schema" @blur="validateField('json_schema')"
+                                :class="formValidation.fields.json_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Schéma UI</h3>
+                    <p class="mt-1 text-sm text-gray-500">Schéma UI pour le diagnostic</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="ui_schema" class="block text-sm font-medium text-gray-700">Schéma UI</label>
+                            <textarea name="ui_schema" id="ui_schema" autocomplete="ui_schema"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.ui_schema" @blur="validateField('ui_schema')"
+                                :class="formValidation.fields.ui_schema.valid == false ? 'border-co-red border-2' : 'border-gray-300'"></textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div> -->
+        <div class="flex justify-end">
+            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
+            <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle}}">
+                <button type="button"
+                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+            </a>
+            <button type="submit"
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique</button>
+        </div>
+    </form>
+</div>
+{{end}}
--- a/web/layouts/vehicles_management/fleet-add.html
+++ b/web/layouts/vehicles_management/fleet-add.html
@@ -138,48 +138,6 @@
            </div>
        </div>

-        {{if .ViewState.vehicle_optional_fields}}
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Autres propriétés</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations complémentaires sur le véhicule</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        {{range .ViewState.vehicle_optional_fields}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}">{{.label}}</option>
-                                    {{end}}
-                                </select>
-                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
-                        </div>
-                        {{end}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        {{end}}
-
        <div class="flex justify-end">
            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
            <a href="/app/vehicles-management/">
--- a/web/layouts/vehicles_management/fleet-display.html
+++ b/web/layouts/vehicles_management/fleet-display.html
@@ -110,7 +110,7 @@
                                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                                        Retiré
                                                    </span>
-                                                    {{else if .Deleted}}
+                                                    {{else if or .Deleted .Data.Deleted}}
                                                    <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
                                                        Annulé
                                                    </span>
@@ -170,37 +170,26 @@
                    </div>
                </div>
            </div>
-            {{if .ViewState.vehicle_optional_fields}}
-            <section aria-labelledby="vehicle-other-properties-title" class="lg:col-start-3 lg:col-span-1">
-                <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
-                        <h2 id="vehicle-other-properties-title" class="text-lg leading-6 font-medium text-gray-900">Autres propriétés</h2>
-                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations complémentaires sur le véhicule</p>
+            <section aria-labelledby="timeline-title" class="lg:col-start-3 lg:col-span-1">
+                <div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6">
+                    <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Réservations à venir</h2>
+                    {{if eq (len .ViewState.vehicle.Bookings) 0}}
+                    <p class="p-12 text-gray-500 text-center text-md">Aucune réservation à venir</p>
+                    {{end}}
+                    <ul role="list" class="divide-y divide-gray-200">
+                        {{range .ViewState.vehicle.Bookings}}
+                        <li class="py-4 flex">
+                        <div class="ml-3">
+                            <a href="/app/vehicles-management/bookings/{{.ID}}" class="hover:bg-gray-200">
+                                <p class="text-sm font-medium text-gray-900">Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}</p>
+                                <p class="text-sm text-gray-500"></p>
+                            </a>
                        </div>
-                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                        <dl class="space-y-4">
-                        {{range .ViewState.vehicle_optional_fields}}
-                        {{if index $.ViewState.vehicle.Data .name}}
-                        <div>
-                            <dt class="text-sm font-medium text-gray-500">{{.label}}</dt>
-                            <dd class="mt-1 text-sm text-gray-900">
-                                {{if eq .type "select"}}
-                                    {{$fieldValue := index $.ViewState.vehicle.Data .name}}
-                                    {{range .options}}
-                                        {{if eq .value $fieldValue}}{{.label}}{{end}}
+                        </li>
                        {{end}}
-                                {{else}}
-                                    {{index $.ViewState.vehicle.Data .name}}
-                                {{end}}
-                            </dd>
-                        </div>
-                        {{end}}
-                        {{end}}
-                    </dl>
-                    </div>
+                    </ul>
                </div>
            </section>
-            {{end}}
        </div>
    </main>

--- a/web/layouts/vehicles_management/fleet-update.html
+++ b/web/layouts/vehicles_management/fleet-update.html
@@ -9,9 +9,8 @@
        fields: {
            licence_plate: '{{ .ViewState.vehicle.Data.licence_plate }}',
            name: '{{ .ViewState.vehicle.Data.name }}',
-            type: '{{ .ViewState.vehicle.Type }}',
            kilometers: '{{ .ViewState.vehicle.Data.kilometers }}',
-            informations: '{{ .ViewState.vehicle.Data.informations}}',
+            informations: '{{ .ViewState.vahicle.Data.informations}}',
        },
        rules: {
            licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'],
@@ -87,7 +86,7 @@
                                    <legend class="sr-only">Automatique</legend>
                                    <div class="relative flex items-start">
                                        <div class="flex h-5 items-center">
-                                        <input id="automatic" aria-describedby="automatic-description" name="automatic" type="checkbox" {{if .ViewState.vehicle.Data.automatic}}checked{{end}} class="h-4 w-4 rounded border-gray-300 text-co-blue focus:ring-co-blue">
+                                        <input id="automatic" aria-describedby="automatic-description" name="automatic" type="checkbox" class="h-4 w-4 rounded border-gray-300 text-co-blue focus:ring-co-blue">
                                        </div>
                                        <div class="ml-3 text-sm">
                                        <label for="automatic" class="font-medium text-gray-700">Automatique</label>
@@ -127,8 +126,8 @@
                </div>
                <div class="mt-5 md:mt-0 md:col-span-2">
                    {{ $fieldName := "address" }}
-                    {{if .ViewState.vehicle.Data.address}}
-                    {{$default := .ViewState.vehicle.Data.address}}
+                    {{if .ViewState.Data.address}}
+                    {{$default := .ViewState.Data.address}}
                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
                    {{else}}
                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
@@ -145,48 +144,6 @@
            </div>
        </div>

-        {{if .ViewState.vehicle_optional_fields}}
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Autres propriétés</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations complémentaires sur le véhicule</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-6 gap-6">
-                        {{range .ViewState.vehicle_optional_fields}}
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="{{.name}}" class="block text-sm font-medium text-gray-700">{{.label}}</label>
-                            {{if eq .type "select"}}
-                            <div class="sm:mt-0 sm:col-span-2">
-                                <select id="{{.name}}" name="{{.name}}"
-                                    class="p-2 max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm border-gray-300 rounded-2xl">
-                                    {{range .options}}
-                                    <option value="{{.value}}" {{if eq .value (index $.ViewState.vehicle.Data .name)}}selected{{end}}>{{.label}}</option>
-                                    {{end}}
-                                </select>
-                            </div>
-                            {{else if eq .type "textarea"}}
-                            <textarea id="{{.name}}" name="{{.name}}" rows="3"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">{{index $.ViewState.vehicle.Data .name}}</textarea>
-                            {{else if eq .type "date"}}
-                            <input type="date" id="{{.name}}" name="{{.name}}" value="{{index $.ViewState.vehicle.Data .name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else if eq .type "number"}}
-                            <input type="number" id="{{.name}}" name="{{.name}}" value="{{index $.ViewState.vehicle.Data .name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{else}}
-                            <input type="text" id="{{.name}}" name="{{.name}}" value="{{index $.ViewState.vehicle.Data .name}}"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl">
-                            {{end}}
-                        </div>
-                        {{end}}
-                    </div>
-                </div>
-            </div>
-        </div>
-        {{end}}
-
        <div class="flex justify-end">
            <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
            <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}">
--- a/web/public/css/main.css
+++ b/web/public/css/main.css
--- a/web/public/images/departement06.png
+++ b/web/public/images/departement06.png
--- a/web/public/images/main_logo.svg
+++ b/web/public/images/main_logo.svg
@@ -1 +1,91 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 374.2 33.2"><defs><style>.cls-1{fill:#ff1300;}.cls-2{fill:#fff;}</style></defs><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path class="cls-1" d="M300.9.6a4.7,4.7,0,0,1,4.9,4.9V32.6h-8.6a4.7,4.7,0,0,1-4.9-4.9V14.1h-.9c-.6,0-1,.6-1,1.5v17H282a4.7,4.7,0,0,1-4.9-4.9V14.1h-1a1.4,1.4,0,0,0-.9,1.5v17H263a1.2,1.2,0,0,1-1.2-1.2V5.5A4.7,4.7,0,0,1,266.7.6h17.9l-.7,5a.9.9,0,0,0,.7,1.1.9.9,0,0,0,1-.8l.8-4.6a.9.9,0,0,1,.9-.7Z"/><path class="cls-1" d="M341.1,16.4c0,9.1-1.9,16.8-16.5,16.8S307.8,25,307.8,16.4,310.6,0,324.6,0,341.1,7.8,341.1,16.4Z"/><path class="cls-1" d="M344.3,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,344.3.6h18.8c6.9,0,10.4,2.9,10.4,8.1s-1.6,6.9-4.5,7.5h0c2.9.6,5.2,3.2,5.2,7.7s-3.5,8.6-10.4,8.6Z"/><path class="cls-2" d="M16.2,11.6c0-.6-.4-.9-1-.9h-.8V31.4a1.2,1.2,0,0,1-1.2,1.2H1.2A1.2,1.2,0,0,1,0,31.4V1.8A1.2,1.2,0,0,1,1.2.6H16.8C25.7.6,30.9,4.2,31,10.7s-4.1,9.9-9.4,10H16.1Z"/><path class="cls-2" d="M44.9,23.1H43.2L40,31.9a1.1,1.1,0,0,1-1.2.7H26.9a1.3,1.3,0,0,1-1.3-1.9L37,3.4A4.5,4.5,0,0,1,41.3.6h5.8a4.1,4.1,0,0,1,4,2.6L62.6,30.8c.5,1-.2,1.8-1.3,1.8H41.7Z"/><path class="cls-2" d="M66.1,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,66.1.6H83.2C92.7.6,95.5,7,95.6,12.3c0,3.3-.8,6.9-3.4,8.3l3.4,12H84.4c-2.3,0-5.2-.7-5.9-2.7L71.9,10.7a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"/><path class="cls-2" d="M129.6,17.1c.8,0,1.3.5,1.2,1.2-.2,8.3-2.9,14.9-16.4,14.9-15.8.1-16.8-8.2-16.8-16.8S100.5,0,114.4,0c15.7,0,16.5,8,16.5,15.4H115.3V11.3c0-.8-.4-1.2-1-1.2s-.9.4-.9,1.2V21.9c0,.9.4,1.2.9,1.2s1-.3,1-1.2V17.1Z"/><path class="cls-2" d="M166.2,16.4c0,9.1-2,16.8-16.6,16.8S132.8,25,132.8,16.4,135.7,0,149.6,0,166.2,7.8,166.2,16.4Z"/><path class="cls-2" d="M200.5,1.8V12.2c0,12.7-1.4,21-16.3,21s-16-8.4-16-20.9V1.8A1.2,1.2,0,0,1,169.4.6h13a.9.9,0,0,1,.9.9V21.8c0,.9.4,1.2,1,1.2s.9-.3.9-1.2V1.5a.9.9,0,0,1,.9-.9h13.1A1.2,1.2,0,0,1,200.5,1.8Z"/><path class="cls-2" d="M203.9,32.6a1.2,1.2,0,0,1-1.3-1.2V1.8A1.2,1.2,0,0,1,203.8.6h17.1c9.5,0,12.3,6.4,12.4,11.7,0,3.3-.8,6.9-3.4,8.3l3.4,12H222.1c-2.3,0-5.2-.7-5.9-2.7l-6.6-19.2a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"/><path class="cls-2" d="M235.8,29.2v-10a1,1,0,0,1,1.5-1l11.1,5.1a1,1,0,0,0,1.2-.4.9.9,0,0,0-.6-1.2l-9.3-4.4c-4.5-2.2-4.4-5.5-4.4-8.2,0-7.6,7.4-9.1,14.6-9.1,5.4,0,12.1,1.8,14.3,4.4v9.2a1,1,0,0,1-1.5,1L252.3,9.8a1,1,0,0,0-1.3.4q-.3.8.6,1.2l8.5,4.1c5.3,2.6,4.7,4.9,4.7,9.2s-6.3,8.5-14.9,8.5C244.7,33.2,238,31.6,235.8,29.2Z"/></g></g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 374.2 33.2"
+   version="1.1"
+   id="svg30"
+   sodipodi:docname="main_logo.svg"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview32"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="4.0700159"
+     inkscape:cx="317.93488"
+     inkscape:cy="16.707551"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Calque_1-2" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:#ff1300;}.cls-2{fill:#fff;}</style>
+  </defs>
+  <g
+     id="Calque_2"
+     data-name="Calque 2">
+    <g
+       id="Calque_1-2"
+       data-name="Calque 1">
+      <path
+         class="cls-1"
+         d="M300.9.6a4.7,4.7,0,0,1,4.9,4.9V32.6h-8.6a4.7,4.7,0,0,1-4.9-4.9V14.1h-.9c-.6,0-1,.6-1,1.5v17H282a4.7,4.7,0,0,1-4.9-4.9V14.1h-1a1.4,1.4,0,0,0-.9,1.5v17H263a1.2,1.2,0,0,1-1.2-1.2V5.5A4.7,4.7,0,0,1,266.7.6h17.9l-.7,5a.9.9,0,0,0,.7,1.1.9.9,0,0,0,1-.8l.8-4.6a.9.9,0,0,1,.9-.7Z"
+         id="path6"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         class="cls-1"
+         d="M341.1,16.4c0,9.1-1.9,16.8-16.5,16.8S307.8,25,307.8,16.4,310.6,0,324.6,0,341.1,7.8,341.1,16.4Z"
+         id="path8"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         class="cls-1"
+         d="M344.3,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,344.3.6h18.8c6.9,0,10.4,2.9,10.4,8.1s-1.6,6.9-4.5,7.5h0c2.9.6,5.2,3.2,5.2,7.7s-3.5,8.6-10.4,8.6Z"
+         id="path10"
+         style="fill:#ffffff;fill-opacity:1" />
+      <path
+         class="cls-2"
+         d="M16.2,11.6c0-.6-.4-.9-1-.9h-.8V31.4a1.2,1.2,0,0,1-1.2,1.2H1.2A1.2,1.2,0,0,1,0,31.4V1.8A1.2,1.2,0,0,1,1.2.6H16.8C25.7.6,30.9,4.2,31,10.7s-4.1,9.9-9.4,10H16.1Z"
+         id="path12" />
+      <path
+         class="cls-2"
+         d="M44.9,23.1H43.2L40,31.9a1.1,1.1,0,0,1-1.2.7H26.9a1.3,1.3,0,0,1-1.3-1.9L37,3.4A4.5,4.5,0,0,1,41.3.6h5.8a4.1,4.1,0,0,1,4,2.6L62.6,30.8c.5,1-.2,1.8-1.3,1.8H41.7Z"
+         id="path14" />
+      <path
+         class="cls-2"
+         d="M66.1,32.6a1.2,1.2,0,0,1-1.2-1.2V1.8A1.2,1.2,0,0,1,66.1.6H83.2C92.7.6,95.5,7,95.6,12.3c0,3.3-.8,6.9-3.4,8.3l3.4,12H84.4c-2.3,0-5.2-.7-5.9-2.7L71.9,10.7a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"
+         id="path16" />
+      <path
+         class="cls-2"
+         d="M129.6,17.1c.8,0,1.3.5,1.2,1.2-.2,8.3-2.9,14.9-16.4,14.9-15.8.1-16.8-8.2-16.8-16.8S100.5,0,114.4,0c15.7,0,16.5,8,16.5,15.4H115.3V11.3c0-.8-.4-1.2-1-1.2s-.9.4-.9,1.2V21.9c0,.9.4,1.2.9,1.2s1-.3,1-1.2V17.1Z"
+         id="path18" />
+      <path
+         class="cls-2"
+         d="M166.2,16.4c0,9.1-2,16.8-16.6,16.8S132.8,25,132.8,16.4,135.7,0,149.6,0,166.2,7.8,166.2,16.4Z"
+         id="path20" />
+      <path
+         class="cls-2"
+         d="M200.5,1.8V12.2c0,12.7-1.4,21-16.3,21s-16-8.4-16-20.9V1.8A1.2,1.2,0,0,1,169.4.6h13a.9.9,0,0,1,.9.9V21.8c0,.9.4,1.2,1,1.2s.9-.3.9-1.2V1.5a.9.9,0,0,1,.9-.9h13.1A1.2,1.2,0,0,1,200.5,1.8Z"
+         id="path22" />
+      <path
+         class="cls-2"
+         d="M203.9,32.6a1.2,1.2,0,0,1-1.3-1.2V1.8A1.2,1.2,0,0,1,203.8.6h17.1c9.5,0,12.3,6.4,12.4,11.7,0,3.3-.8,6.9-3.4,8.3l3.4,12H222.1c-2.3,0-5.2-.7-5.9-2.7l-6.6-19.2a1,1,0,0,0-1.2-.7,1,1,0,0,0-.5,1.3l7.2,21.3Z"
+         id="path24" />
+      <path
+         class="cls-2"
+         d="M235.8,29.2v-10a1,1,0,0,1,1.5-1l11.1,5.1a1,1,0,0,0,1.2-.4.9.9,0,0,0-.6-1.2l-9.3-4.4c-4.5-2.2-4.4-5.5-4.4-8.2,0-7.6,7.4-9.1,14.6-9.1,5.4,0,12.1,1.8,14.3,4.4v9.2a1,1,0,0,1-1.5,1L252.3,9.8a1,1,0,0,0-1.3.4q-.3.8.6,1.2l8.5,4.1c5.3,2.6,4.7,4.9,4.7,9.2s-6.3,8.5-14.9,8.5C244.7,33.2,238,31.6,235.8,29.2Z"
+         id="path26" />
+    </g>
+  </g>
+</svg>
--- a/web/public/images/mobicoop-solidaire.png
+++ b/web/public/images/mobicoop-solidaire.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Arnaud Delcasse	a2edc2179f	Merge branch 'main' into spie06	2025-06-19 09:03:11 +02:00
Arnaud Delcasse	a2b58f0386	automatic	2025-06-19 09:00:11 +02:00
Arnaud Delcasse	f671ac5d70	automatic	2025-06-19 08:54:21 +02:00
Arnaud Delcasse	9a4aa0c7bb	Merge branch 'main' into spie06	2025-06-19 08:34:13 +02:00
Arnaud Delcasse	6d5d77902c	Merge branch 'main' into spie06	2025-06-19 07:38:55 +02:00
Arnaud Delcasse	d4c08e993d	Merge branch 'main' into spie06	2025-06-19 07:32:30 +02:00
Arnaud Delcasse	a8fbcdc4e2	resolve conflicts	2025-06-19 07:28:29 +02:00
Arnaud Delcasse	6bf5f4a7e5	fix templates	2025-02-26 14:42:20 +01:00
Arnaud Delcasse	1f951da1fa	Merge branch 'main' into spie06	2024-01-30 12:20:29 +01:00
Arnaud Delcasse	2747ce67fa	Merge branch 'main' into spie06	2023-11-28 11:38:08 +01:00
Arnaud Delcasse	672fdb98fd	Merge branch 'main' into spie06	2023-11-27 08:32:29 +01:00
Arnaud Delcasse	03b9044ffc	Merge branch 'main' into spie06	2023-04-12 22:21:43 +02:00
Arnaud Delcasse	0ecee50d1c	Merge branch 'main' into spie06	2023-04-12 10:55:41 +02:00
Arnaud Delcasse	96205b81df	Merge branch 'main' into spie06	2023-03-15 16:48:27 +01:00
Arnaud Delcasse	ea71e44837	Merge branch 'main' into spie06	2023-03-13 16:58:35 +01:00
Arnaud Delcasse	1da9c68690	Merge branch 'main' into spie06	2023-03-13 16:31:26 +01:00
Arnaud Delcasse	a548f50234	Merge branch 'main' into spie06	2023-03-13 16:22:58 +01:00
Arnaud Delcasse	2ea7cf99f6	Merge branch 'main' into spie06	2023-03-10 15:44:01 +01:00
Arnaud Delcasse	2056bc72e2	Merge branch 'main' into spie06	2023-03-10 14:52:58 +01:00
Arnaud Delcasse	dbeac9bec7	Merge branch 'spie06' of https://git.coopgo.io/coopgo-apps/parcoursmob-default-theme into spie06	2023-03-10 13:20:42 +01:00
Arnaud Delcasse	388b6366df	Merge branch 'main' into spie06	2023-03-10 13:20:22 +01:00
soukainna	7c620ba09a	Merge branch 'dev' into spie06	2023-03-08 10:35:39 +01:00
Arnaud Delcasse	29060f8ab3	Merge branch 'main' into spie06	2023-01-17 08:57:53 +01:00
Arnaud Delcasse	21d6e27e0c	Merge branch 'main' into spie06	2023-01-17 08:27:06 +01:00
Arnaud Delcasse	cf780cb9c8	Merge branch 'main' into spie06	2022-12-05 20:27:22 +01:00
Arnaud Delcasse	a3a48d3882	Fix profile picture issue	2022-12-05 20:25:56 +01:00
Arnaud Delcasse	0278e4b97f	Merge branch 'main' into spie06	2022-12-05 20:05:16 +01:00
Arnaud Delcasse	aa97b97f22	Merge branch 'main' into spie06	2022-12-05 19:17:01 +01:00
Arnaud Delcasse	f6e3ba11db	Merge	2022-12-05 18:00:32 +01:00
Arnaud Delcasse	2cb8d7e1a9	Fix new email URL issue	2022-11-07 01:32:15 +01:00
Arnaud Delcasse	0b5ea8cb05	Rebuild tailwind css after merge	2022-11-07 01:30:27 +01:00
Arnaud Delcasse	8f4e9a1170	Merge branch 'main' into spie06	2022-11-07 01:28:13 +01:00
Arnaud Delcasse	d4fc469f49	Updates for SPIE06	2022-11-06 18:38:49 +01:00