diff --git a/web/layouts/journeys/_partials/journeys-all.html b/web/layouts/journeys/_partials/journeys-all.html
index babf3af..ba67231 100644
--- a/web/layouts/journeys/_partials/journeys-all.html
+++ b/web/layouts/journeys/_partials/journeys-all.html
@@ -90,8 +90,17 @@
 
     {{end}}
 
+  {{if moduleAvailable "organized_carpool"}}
+  {{template "journeys_organized_carpool" .}}
+  {{end}}
+
+  {{if moduleAvailable "solidarity_transport"}}
+  {{template "journeys_solidarity_transport" .}}
+  {{end}}
+
+  {{if moduleAvailable "vehicles"}}
     <!--VEHICLES-->
-    <!--<div class="px-4 pt-16 flex text-sm text-grey-900">
+    <div class="px-4 pt-16 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
@@ -100,14 +109,7 @@
     </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>-->
-<h3 class="p-4 text-lg">Covoitureurs solidaires</h3>
-
-  {{template "journeys_organized_carpool" .}}
-
-<h3 class="p-4 text-lg">Transport solidaire</h3>
-
-  {{template "journeys_solidarity_transport" .}}
-
+    </div>
+  {{end}}
 </div>
 {{end}}
diff --git a/web/layouts/journeys/_partials/journeys-organized-carpools.html b/web/layouts/journeys/_partials/journeys-organized-carpools.html
index d6ec72a..8d52ed0 100644
--- a/web/layouts/journeys/_partials/journeys-organized-carpools.html
+++ b/web/layouts/journeys/_partials/journeys-organized-carpools.html
@@ -5,6 +5,7 @@
 <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>
diff --git a/web/layouts/journeys/_partials/journeys-solidarity-transport.html b/web/layouts/journeys/_partials/journeys-solidarity-transport.html
index 5cc2539..c6bb715 100644
--- a/web/layouts/journeys/_partials/journeys-solidarity-transport.html
+++ b/web/layouts/journeys/_partials/journeys-solidarity-transport.html
@@ -5,6 +5,7 @@
 <p class="p-12 text-gray-500 text-center text-md">Aucun conducteur solidaire disponible pour ce trajet.</p>
 {{else}}
 
+<h3 class="p-4 text-lg">Transport solidaire</h3>
 <table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
   <thead class="bg-gray-50">
     <tr>
diff --git a/web/layouts/journeys/search.html b/web/layouts/journeys/search.html
index d5abf0c..5b0f3aa 100644
--- a/web/layouts/journeys/search.html
+++ b/web/layouts/journeys/search.html
@@ -105,16 +105,18 @@
                                         :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'">
diff --git a/web/layouts/layout.html b/web/layouts/layout.html
index f2952b7..43f85e6 100644
--- a/web/layouts/layout.html
+++ b/web/layouts/layout.html
@@ -6,16 +6,16 @@
   <title>PARCOURSMOB</title>
   <link rel="stylesheet" href="/public/css/main.css" />
   <link href="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.snow.css" rel="stylesheet" />
+  <link href="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.css" rel="stylesheet" />
   <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
-  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
+  <script defer src="https://cdn.jsdelivr.net/npm/alpinejs@3.x.x/dist/cdn.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/quill@2.0.2/dist/quill.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.js"></script>
-  <link href="https://cdn.jsdelivr.net/npm/maplibre-gl@^5.2.0/dist/maplibre-gl.css" rel="stylesheet" />
   <script src="https://cdn.jsdelivr.net/npm/pmtiles@^4.3.0/dist/pmtiles.js"></script>
   <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>
-  <script defer type="text/javascript" src="/public/js/main.js" defer></script>
+  <!--<script defer type="text/javascript" src="/public/js/main.js" defer></script>-->
 </head>
 
 <body class="h-full" x-data="{ offCanvasMenu: false }">