diff --git a/config.yaml b/config.yaml
index 3f4b4e1..dd9f1b3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -33,7 +33,13 @@ views:
       files:
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/beneficiaries/update.html
-  
+  conseillers:
+    display:
+      files:
+        - web/layouts/conseillers/display.html
+    update:
+      files:
+        - web/layouts/conseillers/update.html
   vehicles:
     search: 
       files: 
@@ -99,6 +105,17 @@ views:
         - web/layouts/journeys/_partials/journeys-carpool.html
         - web/layouts/journeys/_partials/journeys-public-transit.html
         - web/layouts/journeys/search.html
+    list:
+      files:
+        - web/layouts/journeys/group_management.html
+    create:
+      files:
+        - web/layouts/journeys/create_groups.html
+        - web/layouts/_partials/address_autocomplete.html
+    display:
+      files:
+        - web/layouts/journeys/display_groups.html
+        - web/layouts/journeys/_partials/map.html
   support:
     request:
       files:
diff --git a/web/layouts/administration/_partials/groups_admins.html b/web/layouts/administration/_partials/groups_admins.html
index 3495123..2debd04 100644
--- a/web/layouts/administration/_partials/groups_admins.html
+++ b/web/layouts/administration/_partials/groups_admins.html
@@ -11,7 +11,7 @@
         <img class="h-10 w-10 rounded-co" src="/app/beneficiaries/{{.ID}}/picture" alt="">
       </div>
       <div class="flex-1 min-w-0">
-        <a href="#" class="focus:outline-none">
+        <a href="/app/profile/{{.ID}}" class="focus:outline-none">
           <span class="absolute inset-0" aria-hidden="true"></span>
           <p class="text-sm font-medium text-gray-900">{{.Data.first_name}} {{.Data.last_name}}</p>
           <p class="text-sm text-gray-500 truncate">{{.Data.email}}</p>
diff --git a/web/layouts/administration/create_group.html b/web/layouts/administration/create_group.html
index c5485ab..deaff46 100644
--- a/web/layouts/administration/create_group.html
+++ b/web/layouts/administration/create_group.html
@@ -122,6 +122,28 @@
                                     </p>
                                 </div>
                             </div>
+                            <div class="flex items-start">
+                                <div class="flex items-center h-5">
+                                    <input id="support" name="modules.support" 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.support" class="font-medium text-gray-700">Support</label>
+                                    <p class="text-gray-500">Contacter notre support en cas de problème.
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="flex items-start">
+                                <div class="flex items-center h-5">
+                                    <input id="group_module" name="modules.group_module" 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.group_module" class="font-medium text-gray-700">Groupes/Communautés</label>
+                                    <p class="text-gray-500">Créer des groupes pour ses bénéficiaires.
+                                    </p>
+                                </div>
+                            </div>
                         </div>
                     </fieldset>
                 </div>
diff --git a/web/layouts/administration/display_group.html b/web/layouts/administration/display_group.html
index eece157..c1dc8f5 100644
--- a/web/layouts/administration/display_group.html
+++ b/web/layouts/administration/display_group.html
@@ -119,6 +119,28 @@
                                 </p>
                             </div>
                         </div>
+                        <div class="flex items-start">
+                            <div class="flex items-center h-5">
+                                <input id="support" name="modules.support" type="checkbox" disabled {{if .ViewState.group.Data.modules.support}} checked{{end}}
+                                    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.support" class="font-medium text-gray-700">Support</label>
+                                <p class="text-gray-500">Contacter notre support en cas de problème.
+                                </p>
+                            </div>
+                        </div>
+                        <div class="flex items-start">
+                            <div class="flex items-center h-5">
+                                <input id="group_module" name="modules.group_module" type="checkbox" disabled {{if .ViewState.group.Data.modules.group_module}} checked{{end}}
+                                    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.group_module" class="font-medium text-gray-700">Groupes/Communautés</label>
+                                <p class="text-gray-500">Créer des groupes pour ses bénéficiaires.
+                                </p>
+                            </div>
+                        </div>
                         <div class="flex items-start">
                             <div class="flex items-center h-5">
                                 <input id="events" name="modules.events" type="checkbox" disabled {{if .ViewState.group.Data.modules.administration}} checked{{end}}
diff --git a/web/layouts/conseillers/display.html b/web/layouts/conseillers/display.html
new file mode 100644
index 0000000..eb72713
--- /dev/null
+++ b/web/layouts/conseillers/display.html
@@ -0,0 +1,70 @@
+{{define "content"}}
+<main class="py-10">
+    <!-- Page header -->
+    <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 class="flex-shrink-0">
+                <div class="relative">
+                    <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/{{.ViewState.admins.ID}}/picture" alt="">
+                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
+                </div>
+            </div>
+            <div>
+                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.admins.Data.first_name}}
+                    {{.ViewState.admins.Data.last_name}}</h1>
+            </div>
+        </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">
+        <!-- <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/profile/{{.ViewState.admins.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>
+
+    <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="admins-information-title">
+                <div class="bg-white shadow sm:rounded-lg">
+                    <div class="px-4 py-5 sm:px-6">
+                        <h2 id="admins-information-title" class="text-lg leading-6 font-medium text-gray-900">
+                            Informations personnelles</h2>
+                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations générales sur le conseiller.</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">
+                            {{if .ViewState.admins.Data.email}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Email</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.email}}</dd>
+                            </div>
+                            {{end}}
+                            {{if .ViewState.admins.Data.phone_number}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Télephone</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.phone_number}}
+                               </dd>
+                            </div>
+                            {{end}}
+                            
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Nom</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.first_name}}</dd>
+                            </div>
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Prénon</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.last_name}}
+                               </dd>
+                            </div>
+                            
+                        </dl>
+                    </div>
+                </div>
+            </section>
+        </div>
+
+    </div>
+</main>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/conseillers/update.html b/web/layouts/conseillers/update.html
new file mode 100644
index 0000000..82afce3
--- /dev/null
+++ b/web/layouts/conseillers/update.html
@@ -0,0 +1,131 @@
+{{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 vos informations</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.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'],
+            last_name: ['required'],
+            email: ['required', 'email'],
+            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                first_name: {valid: null},
+                last_name: {valid: null},
+                email: {valid: null},
+                phone_number: {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 personnelles sur le conseiller obligatoires
+                        pour créer son profil 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="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
+                            <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'">
+                        </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" 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'">
+                        </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" 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'">
+                        </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="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>
+                </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="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">
+                                    <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>
+                        </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/profile/{{.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>
+            <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</button>
+        </div>
+    </form>
+</div>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/journeys/_partials/map.html b/web/layouts/journeys/_partials/map.html
new file mode 100644
index 0000000..61c0f49
--- /dev/null
+++ b/web/layouts/journeys/_partials/map.html
@@ -0,0 +1,223 @@
+{{define "map"}}
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title>Add a default marker</title>
+<meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
+
+<script
+  src="https://code.jquery.com/jquery-3.4.1.min.js"
+  integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo="
+  crossorigin="anonymous"></script>
+<script src='https://api.mapbox.com/mapbox-gl-js/v2.11.0/mapbox-gl.js'></script>
+<link href='https://api.mapbox.com/mapbox-gl-js/v2.11.0/mapbox-gl.css' rel='stylesheet' />
+<script src=https://cdnjs.cloudflare.com/ajax/libs/mapbox-polyline/1.1.1/polyline.js></script>
+
+<script src='https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.js'></script>
+<link href='https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.css' rel='stylesheet' />
+
+
+</head>
+<body>
+	
+	<input id="de" type="hidden" value="{{.ViewState.group.Data.depart.geometry.coordinates}}">
+	<input id="ar" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
+	<input id="des" type="hidden" value="{{.ViewState.group.Data.depart.geometry.coordinates}}">
+	<input id="arri" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
+
+<div>
+        <span id="polyline-info-content"></span>
+        <div id='map' style='width: 730px; height: 300px;'></div>
+        <script>
+
+        function routeNotOptimized(body) {
+            $.ajax({
+                url: 'https://routing.geo.scity.coop/route?json=' + JSON.stringify(body),
+                type: "GET",
+                success : retrievePolylineInfo,
+                error: errorRoute,
+            });
+        }
+
+function errorRoute() {
+    console.log("errorRoute : couldn't find a route")
+}
+
+            function reverseCoord(geojsonCoord){
+    if(geojsonCoord != null) {
+        var tmpGeojsonCoord =[];
+        for (var i=0; i<geojsonCoord.length; i++) {
+            tmpGeojsonCoord.push([geojsonCoord[i][1],geojsonCoord[i][0]]);
+        }
+        return tmpGeojsonCoord;
+    }
+}
+
+ function drawPolylineOnMap(polylineCoord) {
+    var memberSource;
+
+    var mapLayer = map.getLayer('route');
+    var memberSource = map.getSource('route');
+    if(typeof mapLayer !== 'undefined') {
+        map.removeLayer('route')
+        map.removeSource('route')
+    }
+        map.addLayer({
+            'id': 'route',
+            'type': 'line',
+            'source': {
+                "type": "geojson",
+                "data": {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "LineString",
+                        "coordinates": reverseCoord(polylineCoord)
+                    },
+                }
+            },
+            'layout': {
+                'line-join': 'round',
+                'line-cap': 'round'
+            },
+            'paint': {
+            'line-color': '#03A9F4',
+                'line-width': 7
+            }
+        });
+        var i = document.getElementById('de').value
+		var words = i.split(' ');
+		 const w = words[0].split('[')
+		 const ww = words[1].split(']')
+		 a = (w[1]);
+		 b = (ww[0])
+         depCoord = [a, b]
+         var ar = document.getElementById('ar').value
+		var wordsr = ar.split(' ');
+		 const wr = wordsr[0].split('[')
+		 const wwr = wordsr[1].split(']')
+		 var r = (wr[1]);
+		 var br = (wwr[0])
+         destCoord = [r, br]
+        map.setZoom(9);
+        //console.log("Ici : " [depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]])
+        map.fitBounds([[depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]]],{padding: 40});   
+}
+
+    function retrievePolylineInfo(polylineInfo) {
+        var polylineString = ""
+        for (var i=0; i < polylineInfo.trip.legs.length ; i++){
+            polylineString = polylineString + polylineInfo.trip.legs[i].shape
+        }
+        var polylineCoord = polyline.decode(polylineString, 6)
+        var rideDuration =  polylineInfo.trip.summary.time
+        var rideDistance = polylineInfo.trip.summary.length
+        if (rideDuration != null && rideDistance != null) {
+            document.getElementById("polyline-info-content").innerHTML = "Durée : " + (Math.round(((rideDuration / 60) + Number.EPSILON) * 100) / 100) + " min<br/>Distance : " + rideDistance + " km";
+        }
+        // $("#polyline-str").val(polylineString);
+        // $("#ride-duration").val(rideDuration);
+        // $("#ride-distance").val(rideDistance);
+        console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
+        if(polylineCoord != null && polylineCoord.length > 0 ){
+        
+            drawPolylineOnMap(polylineCoord)
+        }
+}
+
+function createPolyline() {
+    origin= [a, b]
+
+    destination = [r, br]
+
+    console.log("origin : ", origin)
+
+    if(origin != null && destination != null && origin != "" && destination != ""){
+        console.log("Get polyline infos")
+        var hash_locs = [];
+        hash_locs.push({
+            'lat' : (origin[1]),
+            'lon' : (origin[0])
+          })
+          hash_locs.push({
+            'lat' : (destination[1]),
+            'lon' : (destination[0])
+          })
+        var body = {"locations":[{
+            'lat' : (origin[1]),
+            'lon' : (origin[0])
+          },{
+            'lat' : (destination[1]),
+            'lon' : (destination[0])
+          }],"costing":"auto"}
+        $.ajax({
+            url: 'https://routing.geo.scity.coop/route?json=' + JSON.stringify(body),
+            type: "GET",
+            success : retrievePolylineInfo,
+            error: routeNotOptimized(body),
+        });
+        console.log("JSON.stringify(body)",JSON.stringify(body))
+    }
+}
+            var depCoord = []
+            var destCoord = []
+            var a, b
+            depCoord = [a, b]
+            console.log("yeeesss: ", a)
+            //////////////////////////////
+            
+        //mapboxgl.accessToken = 'pk.eyJ1Ijoic291a2FpbmFsYWZkaWxpIiwiYSI6ImNsYjB1djUxNjAwaWQzdm82dnJ5OXJrZzcifQ.0i8xkskwRps3W1PFwApL_Q';
+        const map = new maplibregl.Map({
+            container: 'map', 
+            style: 'https://api.maptiler.com/maps/streets/style.json?key=get_your_own_OpIi9ZULNHzrESv6T2vL', 
+            center: [-74.5, 40],
+            zoom: 9, 
+        });
+        map.addControl(new maplibregl.NavigationControl(), 'bottom-right');
+        var markers = []
+
+
+		//destination
+		 var i = document.getElementById('de').value
+		var words = i.split(' ');
+		 const w = words[0].split('[')
+		 const ww = words[1].split(']')
+		 a = (w[1]);
+		 b = (ww[0])
+         depCoord = [a, b]
+         console.log("yeeesss: ", depCoord[0])
+		 console.log(b)
+		//arrive
+		var ar = document.getElementById('ar').value
+		var wordsr = ar.split(' ');
+		 const wr = wordsr[0].split('[')
+		 const wwr = wordsr[1].split(']')
+		 var r = (wr[1]);
+		 var br = (wwr[0])
+         destCoord = [r, br]
+		 console.log(br)
+		 /////
+		{var marker = new maplibregl.Marker();
+		marker.setLngLat([a, b])//starting position
+		departureMarker = marker.addTo(map);
+		
+		map.flyTo({
+        center: [a, b]
+       
+    });
+    console.log("again: ", a , b)
+    markers.push(marker)
+  createPolyline()
+}
+   
+	{var marker = new maplibregl.Marker();
+	marker.setLngLat([r, br])//ending position
+		destinationMarker = marker.addTo(map);
+		createPolyline()
+		}
+    markers.push(marker)
+    
+        </script>
+</body>
+</html>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/journeys/create_groups.html b/web/layouts/journeys/create_groups.html
new file mode 100644
index 0000000..433ead7
--- /dev/null
+++ b/web/layouts/journeys/create_groups.html
@@ -0,0 +1,318 @@
+{{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">Groups > Créer un group</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
+        fields: {
+            name: null,
+            number: null,
+            ponctuelle: false,
+            recurrent: false,
+          
+        },
+        rules: {
+            name: ['required'],
+            number: ['required'],
+           
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+                number: {valid: null},
+                ponctuelle: {valid: null},
+                recurrent: {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">Nouveau groupe</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations de base sur le groupe à créer</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-5">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom de groupe</label>
+                            <input type="text" name="name" id="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 class="col-span-5">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nombre maximum de personne</label>
+                            <input type="text" name="number" id="number"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.number" @blur="validateField('number')"
+                                :class="formValidation.fields.number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                        <div class="col-span-5">
+                        <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}},
+                            filteredBeneficiaries: (text) => {
+                                if(text=='') return beneficiaries
+                                return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
+                            },
+                            fields: {
+                                beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
+                            },
+                            selectbeneficiary(beneficiary) {
+                                console.log(beneficiary)
+                                this.fields.beneficiaryid = beneficiary.id 
+                                this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
+                                this.beneficiariesListOpen = false
+                            }
+                        }">
+                            <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid"  class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                            >
+                            <label for="combobox" class="block text-sm font-medium text-gray-700">Conducteur</label>
+                            <div class="relative mt-1 mb-4">
+                              <input @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">
+                              
+                              <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
+                             
+                                <svg class="h-5 w-5 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="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
+                                </svg>
+                              </button>
+                          
+                              <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
+                              
+                                <template x-for="beneficiary in beneficiaries">
+                                    <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
+                                  
+                                    <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
+                            
+                                    <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
+                                    
+                                    </span>
+                                    </li>
+                                </template>
+                          
+                             
+                              </ul>
+                            </div>
+                            </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 groupe, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
+
+                  
+                    {{ $departureField := "departure" }}
+                    {{ $departureLabel := "Départ" }}
+                    {{ $departure := .ViewState.departure }}
+                    {{ template "address_autocomplete" dict "FieldName" $departureField "FieldLabel" $departureLabel "Address" $departure }}
+
+                    {{ $destinationField := "destination" }}
+                    {{ $destinationLabel := "Destination" }}
+                    {{ $destination := .ViewState.destination }}
+                    {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }}
+                    <!-- will dolater : tags, groups, ... -->
+
+                </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">Planification</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations liés a la planification de groupe, veuillez cocher la solution qui vous convient </p>
+                </div>
+            
+        <div class="mt-5 md:mt-0 md:col-span-2">
+            <!-- <div class="flex items-start">
+                <div class="flex items-center h-5">
+                    <input id="ponctuelleuelle" name="ponctuelleuelle" 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="ponctuelleuelle" class=" text-lg font-medium leading-6 text-gray-900">ponctuelleuelle</label>
+                   
+                </div>
+            </div> -->
+            <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
+            <div x-data="{selectedListID: ''}" x-init="$watch('selectedListID', value => console.log(value))">
+            <input type="radio" value="recurrent" x-model="selectedListID">&nbsp Recurrent &nbsp&nbsp
+            <input type="radio"  value="ponctuelle" x-model="selectedListID">&nbsp Ponctuelle
+            <!-- <p>value: <span x-text="selectedListID" name="selectedListID"></span></p> -->
+
+           
+<!-- <div x-data="{lists: [{id: 'ponctuelle', name: 'ponctuelle'}, {id: 'recurrent', name: 'recurrent'}], selectedListID: ''}">
+    <template x-for="list in lists" :key="list.id">
+      <div>
+        <input x-model="selectedListID" type="radio" :value="list.id.toString()" :id="list.name" >
+        <label :for="list.name" x-text="list.name"></label>
+      </div>
+    </template> -->
+    <input id="t" :name="selectedListID" type="hidden" :value="selectedListID">
+
+    <!-- <p name="selectedListID">Selected value: <code x-text="selectedListID" ></code></p> -->
+    <!-- ******************************* -->
+    <div class="sm:col-span-6"  x-show="selectedListID == 'ponctuelle'" >
+        <div class="py-4 grid grid-cols-2">
+            <div class="lg:col-span-1">
+                <label for="departdate" class="block text-sm font-medium text-gray-700">le</label>
+                <div class="mt-1">
+                    <input type="date" id="departdate" name="departdate"
+                        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" class="sr-only">
+                </div>
+
+            </div>
+            <div class="lg:col-span-1">
+                <label for="departtime" class="block text-sm font-medium text-gray-700">A</label>
+                <div class="mt-1">
+                    <input type="time" id="departtime" name="departtime"
+                        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>
+    <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
+    <div x-show="selectedListID == 'recurrent'">
+        <div class="flex items-start mt-6">
+            <div class="flex items-center h-5">
+                <input id="lundi" name="lundi" 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="lundi" class="font-medium text-gray-700">Lundi &nbsp</label>
+               
+            </div>
+            <div class="flex items-center h-5">
+                <input id="mardi" name="mardi" 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="mardi" class="font-medium text-gray-700">Mardi &nbsp</label>
+               
+            </div>
+            <div class="flex items-center h-5">
+                <input id="mercredi" name="mercredi" 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="mercredi" class="font-medium text-gray-700">Mercredi &nbsp</label>
+               
+            </div>
+            <div class="flex items-center h-5">
+                <input id="jeudi" name="jeudi" 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="jeudi" class="font-medium text-gray-700">Jeudi &nbsp</label>
+               
+            </div>
+            <div class="flex items-center h-5">
+                <input id="vendredi" name="vendredi" 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="vendredi" class="font-medium text-gray-700">Vendredi &nbsp</label>
+               
+            </div>
+            <div class="flex items-center h-5">
+                <input id="samedi" name="samedi" 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="samedi" class="font-medium text-gray-700">Samedi &nbsp</label>
+               
+            </div>
+            <div class="flex items-center h-5">
+                <input id="dimanche" name="dimanche" 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="dimanche" class="font-medium text-gray-700">Dimanche &nbsp</label>
+               
+            </div>
+            
+        </div>
+            
+        <div class="py-4 grid grid-cols-2" >
+            <div class="lg:col-span-1">
+                <label for="date" class="block text-sm font-medium text-gray-700">Du</label>
+                <div class="mt-1">
+                    <input type="date" id="date" name="date"
+                        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</label>
+                <div class="mt-1">
+                    <input type="date" id="enddate" name="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" >
+        <div class="lg:col-span-1">
+            <label for="time" class="block text-sm font-medium text-gray-700">A</label>
+            <div class="mt-1">
+                <input type="time" id="time" name="time"
+                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>
+ 
+</div>
+</div>
+
+    <!-- ************************************ -->
+  </div>
+    </div>
+      
+        </div>
+        <div class="flex justify-end">
+            <a href="/app/journeys">
+                <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 groupe</button>
+        </div>
+    </form>
+   
+</div>
+
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/journeys/display_groups.html b/web/layouts/journeys/display_groups.html
new file mode 100644
index 0000000..90c2641
--- /dev/null
+++ b/web/layouts/journeys/display_groups.html
@@ -0,0 +1,344 @@
+{{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">Gestion du groupe</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>
+    
+    <!-- ****************************** -->
+    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-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-1 ">
+            <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">Info du groupe</h2>
+                <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                    <div>
+                        <div class="mt-5 border-gray-200">
+                            <dl class="sm:divide-y sm:divide-gray-200">
+                                <div class="sm:pb-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                    <dt class="text-sm font-medium text-gray-500">Nom</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.name}}</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">Type de covoiturage</dt>
+                                    {{if .ViewState.group.Data.recurrent}}
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        Recurrent </dd> {{else}}
+                                        <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                            Ponctuelle </dd>{{end}}
+                                </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">Conducteur</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.driver_first_name}}&nbsp
+                                        {{.ViewState.group.Data.driver_last_name}}</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">N° de passager</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.number}}</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">Départ</dt>
+                                    <dd id="depart" class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.depart.properties.label}}</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">Déstination</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.arrive.properties.label}}</dd>
+                                </div>
+                               
+                               
+                                
+                                
+                                {{if .ViewState.group.Data.recurrent}}
+                                <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">Les jours de covoiturage </dt> 
+                                        {{if .ViewState.group.Data.planDays.lundi}}
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"  >
+                                        Lundi  &nbsp
+                                        {{if .ViewState.group.Data.planDays.mardi}}
+                                        Mardi  &nbsp {{end}}
+                                        {{if .ViewState.group.Data.planDays.mercredi}}
+                                        Mercredi  &nbsp {{end}}
+                                        {{if .ViewState.group.Data.planDays.jeudi}}
+                                        Jeudi  &nbsp {{end}}
+                                        {{if .ViewState.group.Data.planDays.vendredi}}
+                                        Vendredi  &nbsp {{end}}
+                                        {{if .ViewState.group.Data.planDays.samedi}}
+                                        Samedi  &nbsp {{end}}
+                                        {{if .ViewState.group.Data.planDays.dimanche}}
+                                        Dimanche  &nbsp{{end}}
+                                    </dd>
+                                        {{end}}  
+                                </div>
+                               
+                                {{end}}
+                                {{if .ViewState.group.Data.recurrent}}
+                                <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 de départ</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.date}}</dd>
+                                </div>
+                                {{else}}
+                                <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 de départ</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.departdate}}</dd>
+                                </div>
+                               {{end}}
+                              
+                               
+                                {{if .ViewState.group.Data.recurrent}}
+                                <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 de fin</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.enddate}}</dd>
+                                      
+                                </div>
+                                {{end}}
+                                {{if .ViewState.group.Data.recurrent}}
+                                <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">Heure de départ</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.time}}</dd>
+                                </div>
+                                {{else}}
+                                <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">Heure de départ</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.departtime}}</dd>
+                                </div>
+                                {{end}}
+                            </dl>
+                        </div>
+                       
+                    </div>
+                </div>
+            </div>
+            
+        </div>
+      
+   
+    <!-- *********************************** -->
+
+   
+    <div class="lg:col-start-2 lg:col-span-2" x-data="{
+        state: {{.ViewState.list.JSONWithLimits 0 10}},
+        current: 0,
+        nb_pages() {
+            let nbEl = this.state.count 
+            return Math.ceil(nbEl/10)
+        },
+        async paginate(page) {
+            let start = (page-1)*10
+            if(start < 0|| start > this.state.count) {
+                return
+            }
+            let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+            let data = await resp.json()
+            this.state.beneficiaries = data
+            this.current=page-1
+            this.state.group = data
+        }
+    }">
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-2 mb-4">
+        <div class="sm:flex sm:items-center">
+            <div class="sm:flex-auto">
+                {{template "map" .}}
+            </div>
+        </div>
+    </div>
+    <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
+    
+    <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8 mt-2">
+    <!--  -->
+        <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="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                Nom du bénéficiaire
+                            </th>
+                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                Téléphone
+                            </th>
+                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                Email
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody class="divide-y divide-gray-200 bg-white">
+                        <template x-for="beneficiary in state.beneficiaries">
+                            <tr>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="flex items-center">
+                                        <div class="ml-4">
+                                            <div class="font-medium text-gray-900"><span
+                                                    x-text="beneficiary.data.first_name"></span> <span
+                                                    x-text="beneficiary.data.last_name"></span></div>
+                                        </div>
+                                    </div>
+                                </td>
+                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                    <div class="text-gray-900" x-text="beneficiary.data.phone_number"></div>
+                                </td>
+                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                    x-text="beneficiary.data.email">
+                                </td>
+                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                    <template x-for="tag in beneficiary.data.tags">
+                                        <span
+                                            class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
+                                            x-text="tag"></span>
+                                    </template>
+                                </td>
+                                <td
+                                    class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                    <a :href="'/app/beneficiaries/' + beneficiary.id"
+                                        class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
+                                                x-text="beneficiary.data.first_name"></span> <span
+                                                x-text="beneficiary.data.last_name"></span></a>
+                                </td>
+                            </tr>
+                        </template>
+
+                    </tbody>
+                </table>
+                
+                <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                    <div class="flex-1 flex justify-between sm:hidden">
+                    <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                    @click="paginate(current)"> Previous </a>
+                    <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                    @click="paginate(current+2)"> Next </a>
+                    </div>
+                    <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                    <div>
+                        <p class="text-sm text-gray-700">
+                        Résultats
+                        <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                        à
+                        <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                        sur
+                        <span class="font-medium" x-text="state.count"></span>
+                        </p>
+                    </div>
+                    <div>
+                        <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                            @click="paginate(current)">
+                            <span class="sr-only">Previous</span>
+                            <!-- Heroicon name: solid/chevron-left -->
+                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                            <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                            </svg>
+                        </a>
+                        <template x-for="i in nb_pages">
+                            <a href="#" @click="paginate(i)"
+                            class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                            :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                            x-text="i"></a>
+                        </template>
+                        <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                            @click="paginate(current+2)">
+                            <span class="sr-only">Next</span>
+                            <!-- Heroicon name: solid/chevron-right -->
+                            <svg class="h-5 w-5" 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>
+                        </a>
+                        </nav>
+                    </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+      
+    </div>
+    </div>
+    </div>
+
+</div>
+<div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-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-1">
+      
+        <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">Ajouter un passager</h2>
+            <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                <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}},
+                    filteredBeneficiaries: (text) => {
+                        if(text=='') return beneficiaries
+                        return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
+                    },
+                    fields: {
+                        beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
+                    },
+                    selectbeneficiary(beneficiary) {
+                        console.log(beneficiary)
+                        this.fields.beneficiaryid = beneficiary.id 
+                        this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
+                        this.beneficiariesListOpen = false
+                    }
+                }">
+                    <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
+                    <label for="combobox" class="block text-sm font-medium text-gray-700">Passager</label>
+                    <div class="relative mt-1 mb-4">
+                      <input @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">
+                      
+                      <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
+                     
+                        <svg class="h-5 w-5 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="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
+                        </svg>
+                      </button>
+                  
+                      <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
+                      
+                        <template x-for="beneficiary in beneficiaries">
+                            <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
+                          
+                            <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
+                    
+                            <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
+                            
+                            </span>
+                            </li>
+                        </template>
+                  
+                     
+                      </ul>
+                    </div>
+                  </div>
+                
+                    <button type="submit"
+                        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">
+                        Ajouter
+                    </button>
+               
+                </form>
+            </div>
+        </div>
+        
+    </div>
+</div>
+
+</div>
+
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/journeys/group_management.html b/web/layouts/journeys/group_management.html
new file mode 100644
index 0000000..b316645
--- /dev/null
+++ b/web/layouts/journeys/group_management.html
@@ -0,0 +1,158 @@
+
+ {{define "content"}}
+ <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h2 class="text-2xl font-semibold text-gray-900">Gestion des groupes de covoiturage</h2>
+  
+    <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/journeys/groups_covoiturage/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-co-blue focus:ring-offset-2 sm:w-auto">
+            {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
+            Ajouter un groupe
+          </button>
+        </a>
+      </div>
+    </div>
+  
+  </div>
+
+  <!--  -->
+  <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+    state: {{.ViewState.JSONWithLimits 0 10}},
+    current: 0,
+    nb_pages() {
+        let nbEl = this.state.count 
+        return Math.ceil(nbEl/10)
+    },
+    async paginate(page) {
+        let start = (page-1)*10
+        if(start < 0|| start > this.state.count) {
+            return
+        }
+        let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+        let data = await resp.json()
+        this.state.beneficiaries = data
+        this.current=page-1
+    }
+}">
+<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="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                           
+                            Nom de groupe
+                        </th>
+                    </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-200 bg-white">
+                    <template x-for="beneficiary in state.beneficiaries" >
+                        <tr>
+                            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                <div class="flex items-center">
+                                    <div class="h-10 w-10 flex-shrink-0">
+                            
+                                    </div>
+                                    <div class="ml-4">
+                                     
+                                        <!-- <div class="font-medium text-gray-900"> <span
+                                                x-text="beneficiary.data.name"></span> </div> -->
+                                                <!-- <div class="flex items-center font-medium text-gray-700 text-xl">
+                                                  {{$.IconSet.Icon "hero:outline/user-group" "flex-shrink-0 mr-1.5 h-5 w-5"}}
+                                                  <p>
+                                                    <span
+                                                x-text="beneficiary.data.name"></span>
+                                                  </p>
+                                                </div> -->
+                                                <div class="truncate">
+                                                  <div class="flex text-sm">
+                                                    <p class="font-medium text-lg text-co-blue truncate" x-text="beneficiary.data.name"></p>
+                                                    <p class="ml-1 flex-shrink-0 font-normal text-gray-500"></p>
+                                                  </div>
+                                                  <div class="mt-2 flex">
+                                                    <div class="flex items-center text-sm text-gray-500" >
+                                                      {{$.IconSet.Icon "hero:outline/user-group" "flex-shrink-0 mr-1.5 h-5 w-5"}}
+                                                      <template x-if="beneficiary.members">
+                                                      <p x-text="beneficiary.members.length"> </p></template>
+                                                      <p >&nbsp passagères </p>
+                                                    </div>
+                                                  </div>
+                                                </div>
+                                    </div>
+                                </div>
+                            </td>
+                         
+                            <td
+                               >
+                                <a :href="'/app//journeys/groups_covoiturage/create/' + beneficiary.id"
+                                    class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
+                                            x-text="beneficiary.data.name"></span> </a>
+                            </td>
+                        </tr>
+                    </template>
+
+                    <!-- More people... -->
+                </tbody>
+            </table>
+            <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                <div class="flex-1 flex justify-between sm:hidden">
+                  <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                  @click="paginate(current)"> Previous </a>
+                  <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                  @click="paginate(current+2)"> Next </a>
+                </div>
+                <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                  <div>
+                    <p class="text-sm text-gray-700">
+                      Résultats
+                      <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                      à
+                      <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                      sur
+                      <span class="font-medium" x-text="state.count"></span>
+                    </p>
+                  </div>
+                  <div>
+                    <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                      <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                        @click="paginate(current)">
+                        <span class="sr-only">Previous</span>
+                        <!-- Heroicon name: solid/chevron-left -->
+                        <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                          <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                        </svg>
+                      </a>
+                      <template x-for="i in nb_pages">
+                        <a href="#" @click="paginate(i)"
+                         class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                         :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                         x-text="i"></a>
+                      </template>
+                      <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                    <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                        @click="paginate(current+2)">
+                        <span class="sr-only">Next</span>
+                        <!-- Heroicon name: solid/chevron-right -->
+                        <svg class="h-5 w-5" 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>
+                      </a>
+                    </nav>
+                  </div>
+                </div>
+              </div>
+        </div>
+    </div>
+
+</div>
+</div>
+</div>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/journeys/search.html b/web/layouts/journeys/search.html
index bbe6f8f..ab091d9 100644
--- a/web/layouts/journeys/search.html
+++ b/web/layouts/journeys/search.html
@@ -1,7 +1,20 @@
 {{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">Déplacements</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/journeys/groups_covoiturage">
+            <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-co-blue focus:ring-offset-2 sm:w-auto">
+              {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
+              Gestion des groupes
+            </button>
+          </a>
+        </div>
+      </div>
 
     <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-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-1">
@@ -116,5 +129,6 @@
             {{end}}
         </div>
     </div>
+ 
 </div>
 {{end}}
\ No newline at end of file
diff --git a/web/layouts/layout.html b/web/layouts/layout.html
index 4e678f9..9e8f2f0 100644
--- a/web/layouts/layout.html
+++ b/web/layouts/layout.html
@@ -131,7 +131,7 @@
           <div class="ml-3 relative" x-data="{ profileMenuOpen: false }">
             <div>
               <!-- <button @click="profileMenuOpen = ! profileMenuOpen" type="button" -->
-              <button type="button"
+              <button  @click="profileMenuOpen = ! profileMenuOpen" type="button"
                 class="max-w-xs bg-white flex items-center text-sm rounded-co focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue"
                 id="user-menu-button" aria-expanded="false" aria-haspopup="true">
                 <span class="sr-only">Open user menu</span>
@@ -151,14 +151,14 @@
               x-transition:leave-start="transform opacity-100 scale-100"
               x-transition:leave-end="transform opacity-0 scale-95">
               <!-- Active: "bg-gray-100", Not Active: "" -->
-              <a href="/app/profile" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/profile/{{.UserID}}" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-0">Votre profil</a>
 
-              <a href="/app/settings/" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/profile/{{.UserID}}/update" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-1">Paramètres</a>
 
-              <a href="/app/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
-                id="user-menu-item-2">Se déconnecter</a>
+              <!-- <a href="/app/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+                id="user-menu-item-2">Se déconnecter</a> -->
             </div>
           </div>
         </div>