diff --git a/src/lib/components/MemoryCard.svelte b/src/lib/components/MemoryCard.svelte
index f183577..51a920d 100644
--- a/src/lib/components/MemoryCard.svelte
+++ b/src/lib/components/MemoryCard.svelte
@@ -1,117 +1,59 @@
 <script lang="ts">
     import { goto } from '$app/navigation';
-    import { fade } from 'svelte/transition';
-    import DeleteConfirmationPopup from './DeleteConfirmationPopup.svelte';
-    import { ref, remove } from 'firebase/database';
-    import { db } from '../../firebase';
-  
-    export let tripId: string;
-    export let memoryId: string;
-    export let destination: string;
-    export let startDate: string;
-    export let endDate: string;
-    export let image: string;
-  
-    let showDelete = false;
-    let showDeleteConfirmation = false;
-  
+    export let destination = '';
+    export let startDate = '';
+    export let endDate = '';
+    export let image = '';
+    export let tid = '';
+    export let memoryId = '';
+
     function handleClick() {
-      goto(`/viewimage/${tripId}/${memoryId}`);
-    }
-  
-    function handleMouseEnter() {
-      showDelete = true;
-    }
-  
-    function handleMouseLeave() {
-      showDelete = false;
-    }
-  
-    function handleDeleteClick(event: MouseEvent) {
-      event.stopPropagation();
-      showDeleteConfirmation = true;
-    }
-  
-    async function handleConfirmDelete() {
-        try {
-            const memoryRef = ref(db, `trips/${tripId}/memories/${memoryId}`);
-            await remove(memoryRef);
-            showDeleteConfirmation = false;
-        } catch (error) {
-            console.error('Error deleting memory:', error);
-        }
-    }
-  
-    function handleCancelDelete() {
-      showDeleteConfirmation = false;
+        goto(`/viewimage/${tid}/${memoryId}`);
     }
 </script>
-  
+
+<!-- svelte-ignore a11y_click_events_have_key_events -->
 <div 
     class="memory-card" 
     role="button" 
     tabindex="0" 
-    on:mouseenter={handleMouseEnter}
-    on:mouseleave={handleMouseLeave}
-    on:click={handleClick}
+    onclick={handleClick}
 >
-    <div class="image" style={`background-image: url("${image || ''}")`}>
-            {#if !image}
-                <div class="placeholder">
-                    <i class="fa-solid fa-image" style="color: var(--gray-400)"></i>
-                </div>
-            {/if}
-            {#if showDelete}
-                <button 
-                    class="delete-btn"
-                    on:click={handleDeleteClick}
-                    transition:fade={{ duration: 100 }}
-                    aria-label="Delete memory"
-                >
-                    <i class="fa-solid fa-xmark"></i>
-                </button>
-            {/if}
-        </div>
-        <div class="info">
-            <h3>{destination}</h3>
-            <p class="date">{startDate} - {endDate}</p>
-        </div>
+    <div class="image" style="background-image: url({image || ''})">
+        {#if !image}
+            <div class="placeholder">
+                <i class="fa-solid fa-image" style="color: var(--gray-400)"></i>
+            </div>
+        {/if}
     </div>
-  
-<DeleteConfirmationPopup
-    showPopup={showDeleteConfirmation}
-    {destination}
-    darkMode={true}
-    onConfirm={handleConfirmDelete}
-    onCancel={handleCancelDelete}
-/>
+    <div class="info">
+        <h3>{destination}</h3>
+        <p class="date">{startDate} - {endDate}</p>
+    </div>
+</div>
 
 <style>
     .memory-card {
-        background: var(--black);
-        color: var(--white);
+        background: var(--gray-900);
         border-radius: 12px;
         overflow: hidden;
-        box-shadow: 0 2px 4px rgba(255, 255, 255, 0.05);
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
         transition: transform 0.2s ease, box-shadow 0.2s ease;
         cursor: pointer;
         font-family: 'Inter', sans-serif;
         position: relative;
     }
-
     .memory-card:hover {
         transform: translateY(-2px);
-        box-shadow: 0 4px 8px rgba(255, 255, 255, 0.1);
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
     }
-
     .image {
         height: 160px;
         background-size: cover;
         background-position: center;
-        background-color: var(--gray-900);
+        background-color: var(--gray-100);
         position: relative;
     }
-
     .placeholder {
         height: 100%;
         display: flex;
@@ -119,42 +61,18 @@
         justify-content: center;
         font-size: 2rem;
     }
-
     .info {
         padding: 1rem;
     }
-
     .info h3 {
         margin: 0;
         font-size: 1.2rem;
         font-weight: 600;
+        color: var(--white);
     }
-
     .date {
         margin: 0.25rem 0 0 0;
         font-size: 0.8rem;
-        color: var(--gray-400);
-    }
-
-    .delete-btn {
-        position: absolute;
-        top: 0.75rem;
-        right: 0.75rem;
-        background: rgba(240, 240, 240, 0.8);
-        border: none;
-        width: 2rem;
-        height: 2rem;
-        border-radius: 50%;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        cursor: pointer;
-        color: var(--gray-600);
-        transition: all 0.2s ease;
-    }
-
-    .delete-btn:hover {
-        background-color: var(--memory-50);
-        color: var(--memory-600);
+        color: var(--gray-200);
     }
 </style> 
\ No newline at end of file
diff --git a/src/lib/components/NewMemoryPopup.svelte b/src/lib/components/NewMemoryPopup.svelte
index 2f7b52c..3661745 100644
--- a/src/lib/components/NewMemoryPopup.svelte
+++ b/src/lib/components/NewMemoryPopup.svelte
@@ -233,6 +233,8 @@
     }
   
     let isUploading = false;
+
+    const isDark = document.documentElement.classList.contains('dark');
 </script>
   
 {#if showPopup}
diff --git a/src/lib/components/WorldMap.svelte b/src/lib/components/WorldMap.svelte
index 34034cb..f81f911 100644
--- a/src/lib/components/WorldMap.svelte
+++ b/src/lib/components/WorldMap.svelte
@@ -7,6 +7,7 @@
   import { ref, get } from 'firebase/database';
   import { db } from '../../firebase';
   import { goto } from '$app/navigation';
+  import NewMemoryPopup from '$lib/components/NewMemoryPopup.svelte';
 
   let mapContainer: HTMLDivElement;
 
@@ -65,6 +66,8 @@
   }
 
   let cleanup: (() => void) | undefined;
+  let showNewMemoryPopup = false;
+  let selectedTripIdForMemory = '';
 
   onMount(() => {
     let mounted = true;
@@ -176,8 +179,32 @@
                   .attr('class', 'trip-marker')
                   .attr('data-has-memory', trip.hasMemory ? 'true' : 'false')
                   .style('cursor', 'pointer')
-                  .on('click', function () {
-                    goto(`/itinerary/${trip.tid}`);
+                  .on('click', async function () {
+                    // Use document.documentElement for dark mode detection
+                    const isDark = document.documentElement.classList.contains('dark');
+                    const hasMemory = trip.hasMemory;
+
+                    if (isDark) {
+                      if (hasMemory) {
+                        // Fetch the topmost memoryId for this trip
+                        const tripRef = ref(db, `trips/${trip.tid}/memories`);
+                        const snapshot = await get(tripRef);
+                        if (snapshot.exists()) {
+                          const memoryIds = Object.keys(snapshot.val());
+                          if (memoryIds.length > 0) {
+                            const topMemoryId = memoryIds[0];
+                            goto(`/viewimage/${trip.tid}/${topMemoryId}`);
+                          }
+                        }
+                      } else {
+                        // Show NewMemoryPopup for this trip
+                        selectedTripIdForMemory = trip.tid;
+                        showNewMemoryPopup = true;
+                      }
+                    } else {
+                      // Default: go to itinerary
+                      goto(`/itinerary/${trip.tid}`);
+                    }
                   });
 
                 markerGroup.append('text')
@@ -187,8 +214,32 @@
                   .attr('class', 'trip-label')
                   .text(`${formatDate(trip.startDate)} - ${formatDate(trip.endDate)}`)
                   .style('cursor', 'pointer')
-                  .on('click', function () {
-                    goto(`/itinerary/${trip.tid}`);
+                  .on('click', async function () {
+                    // Use document.documentElement for dark mode detection
+                    const isDark = document.documentElement.classList.contains('dark');
+                    const hasMemory = trip.hasMemory;
+
+                    if (isDark) {
+                      if (hasMemory) {
+                        // Fetch the topmost memoryId for this trip
+                        const tripRef = ref(db, `trips/${trip.tid}/memories`);
+                        const snapshot = await get(tripRef);
+                        if (snapshot.exists()) {
+                          const memoryIds = Object.keys(snapshot.val());
+                          if (memoryIds.length > 0) {
+                            const topMemoryId = memoryIds[0];
+                            goto(`/viewimage/${trip.tid}/${topMemoryId}`);
+                          }
+                        }
+                      } else {
+                        // Show NewMemoryPopup for this trip
+                        selectedTripIdForMemory = trip.tid;
+                        showNewMemoryPopup = true;
+                      }
+                    } else {
+                      // Default: go to itinerary
+                      goto(`/itinerary/${trip.tid}`);
+                    }
                   });
 
                 markerGroup
@@ -235,6 +286,10 @@
 
 <div bind:this={mapContainer} class="map-wrapper"></div>
 
+{#if showNewMemoryPopup}
+  <NewMemoryPopup bind:showPopup={showNewMemoryPopup} onCancel={() => showNewMemoryPopup = false} />
+{/if}
+
 <style>
   .map-wrapper {
     width: 100%;
diff --git a/src/lib/constants/Interfaces.ts b/src/lib/constants/Interfaces.ts
index 74dd133..97374e3 100644
--- a/src/lib/constants/Interfaces.ts
+++ b/src/lib/constants/Interfaces.ts
@@ -10,6 +10,7 @@ export interface Trip {
             lng: number;
         }
     };
+    _cardImage?: string;
     startDate: string;
     endDate: string;
     tripmates: string[];
diff --git a/src/routes/mymemory/+page.svelte b/src/routes/mymemory/+page.svelte
index 83229dc..c56e6b7 100644
--- a/src/routes/mymemory/+page.svelte
+++ b/src/routes/mymemory/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+<<<<<<< HEAD
     import '../../app.css';
     import MemoryCard from '$lib/components/MemoryCard.svelte';
     import Button from '$lib/components/Button.svelte';
@@ -48,6 +49,67 @@
     function handleNewMemory() {
         showNewMemoryPopup = true;
     }
+=======
+  import '../../app.css';
+  import MemoryCard from '$lib/components/MemoryCard.svelte';
+  import Button from '$lib/components/Button.svelte';
+  import NewMemoryPopup from '$lib/components/NewMemoryPopup.svelte';
+  import Nav from '$lib/components/Nav.svelte';
+  import { onMount } from 'svelte';
+  import { ref, onValue } from 'firebase/database';
+  import { db } from '../../firebase';
+
+  let showNewMemoryPopup = false;
+  let contentContainer: HTMLElement;
+
+  interface MemoryCardData {
+    tid: string;
+    memoryId: string;
+    destination: string;
+    startDate: string;
+    endDate: string;
+    image: string;
+  }
+
+  let pastMemories: MemoryCardData[] = [];
+
+  onMount(() => {
+    const tripsRef = ref(db, 'trips');
+    onValue(tripsRef, (snapshot) => {
+      const memories: MemoryCardData[] = [];
+      snapshot.forEach((childSnapshot) => {
+        const trip = childSnapshot.val();
+        const tid = childSnapshot.key;
+        if (trip.memories && typeof trip.memories === 'object') {
+          const memoryEntries = Object.entries(trip.memories);
+          if (memoryEntries.length > 0) {
+            const [memoryId, memory] = memoryEntries[0];
+            const mem = memory as { images: string[] };
+            if (mem.images && mem.images.length > 0) {
+              const format = (d: string) => {
+                const date = new Date(d);
+                return `${String(date.getDate()).padStart(2, '0')}/${String(date.getMonth() + 1).padStart(2, '0')}/${date.getFullYear()}`;
+              };
+              memories.push({
+                tid,
+                memoryId,
+                destination: trip.destination?.name || '',
+                startDate: format(trip.startDate),
+                endDate: format(trip.endDate),
+                image: mem.images[0]
+              });
+            }
+          }
+        }
+      });
+      pastMemories = memories;
+    });
+  });
+
+  function handleNewMemory() {
+    showNewMemoryPopup = true;
+  }
+>>>>>>> 0570bcffe9996e925158c79503096d59ce341846
 </script>
 
 <main>
@@ -61,7 +123,11 @@
       <div class="memories-container">
             {#if pastMemories.length === 0}
                 <div class="empty-state">
+<<<<<<< HEAD
                     <p>There is no memory</p>
+=======
+                    <p>There is no memory yet</p>
+>>>>>>> 0570bcffe9996e925158c79503096d59ce341846
                 </div>
             {:else}
                 <div class="memories-grid">
diff --git a/src/routes/trips/+page.svelte b/src/routes/trips/+page.svelte
index 9d6d2d4..5f84784 100644
--- a/src/routes/trips/+page.svelte
+++ b/src/routes/trips/+page.svelte
@@ -21,13 +21,27 @@
         const tripsRef = ref(db, 'trips');
 
         // listen for changes in the trips data
-        onValue(tripsRef, (snapshot) => {
+        onValue(tripsRef, async (snapshot) => {
             const trips: Trip[] = [];
+            const tripImageMap: Record<string, string> = {};
+            const promises: Promise<void>[] = [];
             snapshot.forEach((childSnapshot) => {
-                trips.push({
+                const tripData = {
                     tid: childSnapshot.key,
                     ...childSnapshot.val()
-                });
+                };
+                trips.push(tripData);
+
+                // Check for memories and get the first image if exists
+                if (tripData.memories && typeof tripData.memories === 'object') {
+                    const memoryIds = Object.keys(tripData.memories);
+                    if (memoryIds.length > 0) {
+                        const firstMemory = tripData.memories[memoryIds[0]];
+                        if (firstMemory.images && firstMemory.images.length > 0) {
+                            tripImageMap[tripData.tid] = firstMemory.images[0];
+                        }
+                    }
+                }
             });
 
             // get today's date at midnight for comparison
@@ -35,7 +49,6 @@
             today.setHours(0, 0, 0, 0);
 
             // filter trips based on end date
-            // end date > today = pastTrips
             ongoingTrips = trips.filter(trip => {
                 const endDate = new Date(trip.endDate);
                 return endDate >= today;
@@ -45,6 +58,10 @@
                 const endDate = new Date(trip.endDate);
                 return endDate < today;
             }).sort((a, b) => new Date(b.endDate).getTime() - new Date(a.endDate).getTime()); // sort past trips by most recent first
+
+            // Attach the image override map to each trip for rendering
+            ongoingTrips = ongoingTrips.map(trip => ({ ...trip, _cardImage: tripImageMap[trip.tid] || trip.destination.photo }));
+            pastTrips = pastTrips.map(trip => ({ ...trip, _cardImage: tripImageMap[trip.tid] || trip.destination.photo }));
         });
     });
 
@@ -95,7 +112,7 @@
                                 destination={trip.destination.name}
                                 startDate={new Date(trip.startDate).toLocaleDateString('en-GB', { day: '2-digit', month: '2-digit', year: 'numeric' })}
                                 endDate={new Date(trip.endDate).toLocaleDateString('en-GB', { day: '2-digit', month: '2-digit', year: 'numeric' })}
-                                image={trip.destination.photo}
+                                image={trip._cardImage}
                                 tid={trip.tid}
                             />
                         {/each}
@@ -113,7 +130,7 @@
                                 destination={trip.destination.name}
                                 startDate={new Date(trip.startDate).toLocaleDateString('en-GB', { day: '2-digit', month: '2-digit', year: 'numeric' })}
                                 endDate={new Date(trip.endDate).toLocaleDateString('en-GB', { day: '2-digit', month: '2-digit', year: 'numeric' })}
-                                image={trip.destination.photo}
+                                image={trip._cardImage}
                                 tid={trip.tid}
                             />
                         {/each}
diff --git a/src/routes/viewimage/[tripId]/[memoryId]/+page.svelte b/src/routes/viewimage/[tripId]/[memoryId]/+page.svelte
index 461f190..5c1f1d0 100644
--- a/src/routes/viewimage/[tripId]/[memoryId]/+page.svelte
+++ b/src/routes/viewimage/[tripId]/[memoryId]/+page.svelte
@@ -1,38 +1,38 @@
-<script>
+<script lang="ts">
   import '../../../../app.css';
   import Nav from '$lib/components/Nav.svelte';
   import Button from '$lib/components/Button.svelte';
-  import { page } from '$app/stores';
+  import { page } from '$app/state';
   import { goto } from '$app/navigation';
   import { ref, get } from 'firebase/database';
   import { db } from '../../../../firebase';
 
   let tripId, memoryId;
-  let memory = null;
-  let tripOptions = [];
+  let memory: any = null;
+  let tripOptions: any[] = [];
   let currentImageIndex = 0;
-  let gradientLayers = [];
-  let columnGroups = [];
+  let gradientLayers: any[] = [];
+  let columnGroups: any[] = [];
   let rotationAngle = 0;
 
-  let droppedTripId = null;
-  let droppedMemory = null;
+  let droppedTripId: any = null;
+  let droppedMemory: any = null;
   let droppedImageIndex = 0;
-  let droppedColumnGroups = [];
-  let droppedGradientLayers = [];
+  let droppedColumnGroups: any[] = [];
+  let droppedGradientLayers: any[] = [];
   let droppedWheelStyle = {};
-  let droppedCurrentImage = null;
+  let droppedCurrentImage: any = null;
   let isDroppedVisible = true;
 
-  $: tripId = $page.params.tripId;
-  $: memoryId = $page.params.memoryId;
+  $: tripId = page.params.tripId;
+  $: memoryId = page.params.memoryId;
   $: currentImage = memory?.images?.[currentImageIndex];
 
   $: if (tripId && memoryId) {
     loadMemoryAndTrip(tripId, memoryId);
   }
 
-  async function loadMemoryAndTrip(tripId, memoryId) {
+  async function loadMemoryAndTrip(tripId: string, memoryId: string) {
     try {
       const memorySnap = await get(ref(db, `trips/${tripId}/memories/${memoryId}`));
       const tripSnap = await get(ref(db, `trips/${tripId}`));
@@ -79,8 +79,12 @@
     }
   }
 
+<<<<<<< HEAD
   //get information from other trip in same region
   async function loadDroppedTrip(tripId, memoryId) {
+=======
+  async function loadDroppedTrip(tripId: any, memoryId: any) {
+>>>>>>> 0570bcffe9996e925158c79503096d59ce341846
     const memorySnap = await get(ref(db, `trips/${tripId}/memories/${memoryId}`));
     if (memorySnap.exists()) {
       droppedTripId = tripId;
@@ -105,7 +109,7 @@
     transformOrigin: 'center center'
   };
 
-  async function getImageData(url) {
+  async function getImageData(url: string) {
     const img = new Image();
     img.crossOrigin = 'Anonymous';
     img.src = url;
@@ -143,8 +147,12 @@
     return [h, s * 100, v * 255];
   }
 
+<<<<<<< HEAD
   // get most frequent color from each section
   function getColumnColors(imageData, columnCount = 5) {
+=======
+  function getColumnColors(imageData: ImageData, columnCount = 5) {
+>>>>>>> 0570bcffe9996e925158c79503096d59ce341846
     const { data, width, height } = imageData;
     const columnWidth = Math.floor(width / columnCount);
     const columns = Array.from({ length: columnCount }, () => []);
@@ -170,8 +178,12 @@
     });
   }
 
+<<<<<<< HEAD
   //collect color by column
   async function extractColumnwiseColors(imageUrls, reverseColumns = true) {
+=======
+  async function extractColumnwiseColors(imageUrls: any, reverseColumns = true) {
+>>>>>>> 0570bcffe9996e925158c79503096d59ce341846
     const columnColorGroups = [[], [], [], [], []];
 
     for (const url of imageUrls) {
@@ -237,7 +249,7 @@
       gradients.push('radial-gradient(circle, var(--black) 100%)');
     }
 
-    droppedGradientLayers = gradients.map((bg, i) => {
+    droppedGradientLayers = gradients.map((bg: any, i: number) => {
       const scale = 1 - i * 0.1;
       return `background: ${bg};
               width: ${scale * 100}%;
@@ -280,7 +292,7 @@
     }
   }
 
-  function handleDrop(event) {
+  function handleDrop(event: { preventDefault: () => void; dataTransfer: { getData: (arg0: string) => any; }; }) {
     event.preventDefault();
     if (droppedMemory && isDroppedVisible) return;
 
@@ -289,7 +301,7 @@
     loadDroppedTrip(droppedTripId, droppedMemoryId);
   }
 
-  function allowDrop(event) {
+  function allowDrop(event: { preventDefault: () => void; }) {
     if (!droppedMemory || !isDroppedVisible) {
       event.preventDefault();
     }
@@ -342,20 +354,28 @@
             <img class="preview-img" src={currentImage} alt="Current Image" />
           {/if}
 
+          <!-- svelte-ignore a11y_consider_explicit_label -->
           <div class="arrow-controls">
+            <!-- svelte-ignore a11y_consider_explicit_label -->
             <button on:click={prevImage}>
-              <img src="/lucide_chevron-up.png" alt="Up" width="24" height="24" />
+              <i class="fa-solid fa-chevron-up"></i>
             </button>
             <button on:click={nextImage}>
-              <img src="/lucide_chevron-down.png" alt="Down" width="24" height="24" />
+              <i class="fa-solid fa-chevron-down"></i>
             </button>
           </div>
         </div>
 
         <!-- rightside dropped view -->
+        <!-- svelte-ignore a11y_no_static_element_interactions -->
         <div class="wheel-section drop-zone" on:drop={handleDrop} on:dragover={allowDrop}>
           {#if droppedMemory && isDroppedVisible}
-            <img src="/lucide_x.png" alt="Close" class="close-button" on:click={closeDroppedWheel} />
+            <!-- svelte-ignore a11y_click_events_have_key_events -->
+            <!-- svelte-ignore a11y_no_noninteractive_element_interactions -->
+            <!-- <img src="/lucide_x.png" alt="Close" class="close-button" on:click={closeDroppedWheel} /> -->
+            <button class="close-button" on:click={closeDroppedWheel} aria-label="Close">
+              <i class="fa-solid fa-xmark"></i>
+            </button>
         
             <div class="dropped-mask">
               <div class="dropped-wheel" style={droppedWheelStyle}>
@@ -366,15 +386,18 @@
             </div>
         
             {#if droppedCurrentImage}
+              <!-- svelte-ignore a11y_img_redundant_alt -->
               <img class="dropped-img" src={droppedCurrentImage} alt="Dropped Image" />
             {/if}
         
             <div class="dropped-controls">
+              <!-- svelte-ignore a11y_consider_explicit_label -->
               <button on:click={prevDroppedImage}>
-                <img src="/lucide_chevron-up.png" alt="Up" width="24" height="24" />
+                <i class="fa-solid fa-chevron-up"></i>
               </button>
+              <!-- svelte-ignore a11y_consider_explicit_label -->
               <button on:click={nextDroppedImage}>
-                <img src="/lucide_chevron-down.png" alt="Down" width="24" height="24" />
+                <i class="fa-solid fa-chevron-down"></i>
               </button>
             </div>
           {/if}
@@ -400,6 +423,7 @@
     display: flex;
     flex-direction: column;
     width: 100vw;
+    font-family: 'Inter', sans-serif;
   }
 
   .header {
@@ -595,10 +619,13 @@
 
   .close-button {
     position: absolute;
+    background: none;
+    border: none;
+    font-size: 1.4rem;
+    color: white;
     top: -48px;
     right: 2rem;
     width: 24px;
-    height: 24px;
     cursor: pointer;
     z-index: 5;
   }