diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 95c08d2..2f45d0b 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -2,6 +2,7 @@ import { provideHttpClient } from '@angular/common/http';
 import {
   ApplicationConfig,
   isDevMode,
+  LOCALE_ID,
   provideZoneChangeDetection,
 } from '@angular/core';
 import { provideRouter } from '@angular/router';
@@ -13,6 +14,7 @@ export const appConfig: ApplicationConfig = {
     provideZoneChangeDetection({ eventCoalescing: true }),
     provideRouter(routes),
     provideHttpClient(),
+    { provide: LOCALE_ID, useValue: 'fr-FR' },
     provideServiceWorker('ngsw-worker.js', {
       enabled: !isDevMode(),
       registrationStrategy: 'registerWhenStable:30000',
diff --git a/src/app/components/leaflet-map/leaflet-map.component.html b/src/app/components/leaflet-map/leaflet-map.component.html
index 7429922..a3f5313 100644
--- a/src/app/components/leaflet-map/leaflet-map.component.html
+++ b/src/app/components/leaflet-map/leaflet-map.component.html
@@ -23,7 +23,7 @@
         stroke-linecap="round"
         stroke-linejoin="round"
         stroke-width="2"
-        d="M9 5l7 7-7 7"
+        d="m15 19-7-7 7-7"
       />
     </svg>
   </button>
@@ -56,7 +56,7 @@
       <button
         *ngIf="!isDesktop()"
         (click)="toggleFilters()"
-        class="text-xl text-gray-700 dark:text-white focus:outline-none ml-2 p-0 pl-4 bg-transparent border-0"
+        class="text-xl text-gray-700 dark:text-white focus:outline-none p-0 ml-4"
         aria-label="Fermer les filtres"
       >
         <svg
diff --git a/src/app/components/timeline/timeline.component.html b/src/app/components/timeline/timeline.component.html
index b7c43ca..c078c4d 100644
--- a/src/app/components/timeline/timeline.component.html
+++ b/src/app/components/timeline/timeline.component.html
@@ -23,7 +23,7 @@
         class="absolute left-1/2 transform -translate-x-1/2 h-16 w-8 bg-blue-500 z-0"
       ></div>
       <div
-        class="bg-blue-600 text-white text-4xl font-bold px-10 py-5 rounded-full shadow-2xl z-10 border-4 border-white"
+        class="bg-blue-600 text-white text-2xl font-bold px-10 py-5 rounded-full shadow-2xl z-10 border-4 border-white"
       >
         {{ year }}
       </div>
@@ -42,33 +42,43 @@
 
         <!-- Bulle centrale avec la date -->
         <div
-          class="z-20 flex items-center justify-center bg-white border-[6px] border-blue-600 text-blue-700 font-bold text-lg shadow-2xl w-32 h-32 rounded-full text-center px-4 leading-tight"
+          class="z-20 flex items-center justify-center bg-white border-[6px] md:border-blue-600 border-gray-800 md:text-blue-700 text-gray-800 font-bold text-base sm:text-lg shadow-2xl md:rounded-full rounded-t-3xl sm:w-32 sm:h-32 text-center leading-tight px-4 py-2 sm:px-10 sm:py-5 date-bubble"
           [ngClass]="{
             'sm:order-2': i % 2 === 0,
             'sm:order-1': i % 2 !== 0
           }"
         >
-          <span>{{ pin.date | date : "dd/MM/yyyy" }}</span>
+          <span>{{ pin.date | date : "d MMMM yyyy" }}</span>
         </div>
 
+        <!-- Ligne de liaison (desktop uniquement) -->
+        <div
+          class="hidden -z-10 sm:block absolute top-1/2 transform -translate-y-1/2 h-2 w-[calc(50%-8rem)] bg-blue-500"
+          [ngClass]="{
+            'left-1/2': i % 2 === 0,
+            'right-1/2': i % 2 !== 0
+          }"
+        ></div>
+
         <!-- Carte de contenu -->
         <div
-          class="bg-white dark:bg-gray-800 rounded-3xl shadow-2xl px-10 py-8 w-full sm:w-5/12 transition-all duration-300 hover:scale-[1.02]"
+          class="bg-white dark:bg-gray-800 rounded-3xl shadow-2xl px-10 py-8 w-full sm:w-5/12 transition-all duration-300 hover:scale-[1.02] cursor-pointer"
           [ngClass]="{
             'sm:order-3 sm:text-left text-center': i % 2 === 0,
             'sm:order-0 sm:text-right text-left': i % 2 !== 0
           }"
+          (click)="navigateToPinOnMap(pin.id)"
         >
           <!-- Titre centré -->
           <h3
-            class="text-3xl font-extrabold text-gray-900 dark:text-white mb-4 text-center"
+            class="text-2xl font-extrabold text-gray-900 dark:text-white mb-4 text-center"
           >
             {{ pin.title || "Titre inconnu" }}
           </h3>
 
           <!-- Description justifiée tronquée -->
           <div
-            class="text-lg text-gray-700 dark:text-gray-300 mb-4 text-justify transition-all duration-300"
+            class="text-md text-gray-700 dark:text-gray-300 mb-4 text-justify transition-all duration-300"
             [ngClass]="{
               'line-clamp-5 overflow-hidden':
                 !expandedDescriptions[pins.indexOf(pin)]
@@ -209,3 +219,18 @@
     ></ng-container
   >
 </div>
+
+<div
+  *ngIf="!loading && pins.length === 0"
+  class="flex flex-col items-center justify-center h-64 space-y-6"
+>
+  <p class="text-xl text-gray-800 text-center">
+    Commencez à créer votre histoire en ajoutant des souvenirs sur la carte !
+  </p>
+  <button
+    (click)="openPinModal()"
+    class="px-6 py-3 bg-gray-800 text-white rounded-lg hover:bg-gray-700 transition-colors duration-200 shadow-lg"
+  >
+    Ajouter un souvenir
+  </button>
+</div>
diff --git a/src/app/components/timeline/timeline.component.ts b/src/app/components/timeline/timeline.component.ts
index cb54777..9f0544a 100644
--- a/src/app/components/timeline/timeline.component.ts
+++ b/src/app/components/timeline/timeline.component.ts
@@ -1,8 +1,12 @@
-import { CommonModule } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
+import { CommonModule, ViewportScroller } from '@angular/common';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
+import { NavigationEnd, Router } from '@angular/router';
+import { Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
 import { Pin } from '../../model/Pin';
 import { ImageService } from '../../services/image/image.service';
+import { ModalService } from '../../services/modal/modal.service';
 import { PinService } from '../../services/pin/pin.service';
 
 @Component({
@@ -11,7 +15,7 @@ import { PinService } from '../../services/pin/pin.service';
   imports: [CommonModule],
   templateUrl: './timeline.component.html',
 })
-export class TimelineComponent implements OnInit {
+export class TimelineComponent implements OnInit, OnDestroy {
   pins: Pin[] = [];
   imageUrls: SafeUrl[][] = [];
   loading = true;
@@ -19,12 +23,52 @@ export class TimelineComponent implements OnInit {
   sortedYears: string[] = [];
   carouselIndexes: number[] = [];
   expandedDescriptions: { [index: number]: boolean } = {};
+  private navigationSubscription: Subscription;
 
   constructor(
     private pinService: PinService,
     private imageService: ImageService,
-    private sanitizer: DomSanitizer
-  ) {}
+    private sanitizer: DomSanitizer,
+    private modalService: ModalService,
+    private router: Router,
+    private viewportScroller: ViewportScroller
+  ) {
+    // Écouter les événements de navigation
+    this.navigationSubscription = this.router.events
+      .pipe(filter((event) => event instanceof NavigationEnd))
+      .subscribe(() => {
+        // Attendre que le contenu soit chargé
+        if (!this.loading) {
+          this.restoreScrollPosition();
+        }
+      });
+  }
+
+  ngOnDestroy() {
+    // Nettoyer la souscription lors de la destruction du composant
+    if (this.navigationSubscription) {
+      this.navigationSubscription.unsubscribe();
+    }
+  }
+
+  private restoreScrollPosition() {
+    const scrollPosition = sessionStorage.getItem('timelineScrollPosition');
+    if (scrollPosition) {
+      requestAnimationFrame(() => {
+        this.viewportScroller.scrollToPosition([0, parseInt(scrollPosition)]);
+      });
+    }
+  }
+
+  openPinModal() {
+    this.modalService.openModal('add-pin-modal');
+  }
+
+  navigateToPinOnMap(pinId: string) {
+    const scrollPosition = window.scrollY;
+    sessionStorage.setItem('timelineScrollPosition', scrollPosition.toString());
+    this.router.navigate(['/map'], { queryParams: { pin: pinId } });
+  }
 
   ngOnInit(): void {
     this.pinService.getPins().subscribe((pins: Pin[]) => {
@@ -46,10 +90,11 @@ export class TimelineComponent implements OnInit {
       });
 
       this.carouselIndexes = this.pins.map(() => 0);
-
       this.loading = false;
-
       this.groupPinsByYear();
+
+      // Restaurer la position de défilement après le chargement initial
+      this.restoreScrollPosition();
     });
   }
 
@@ -69,7 +114,7 @@ export class TimelineComponent implements OnInit {
       this.groupedPins[year].sort((a, b) => a.date!.localeCompare(b.date!));
     }
 
-    // Trie les années dans l’ordre croissant (utilisé dans le template)
+    // Trie les années dans l'ordre croissant (utilisé dans le template)
     this.sortedYears = Object.keys(this.groupedPins).sort((a, b) => +a - +b);
   }
 
diff --git a/src/main.ts b/src/main.ts
index 35b00f3..a5a1e49 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,11 @@
+import { registerLocaleData } from '@angular/common';
+import localeFr from '@angular/common/locales/fr';
 import { bootstrapApplication } from '@angular/platform-browser';
-import { appConfig } from './app/app.config';
 import { AppComponent } from './app/app.component';
+import { appConfig } from './app/app.config';
+
+registerLocaleData(localeFr, 'fr');
 
-bootstrapApplication(AppComponent, appConfig)
-  .catch((err) => console.error(err));
+bootstrapApplication(AppComponent, appConfig).catch((err) =>
+  console.error(err)
+);