diff --git a/src/animations.js b/src/animations.js
index dcc629e..a61dfec 100644
--- a/src/animations.js
+++ b/src/animations.js
@@ -1,2 +1,23 @@
 // import anime from 'animejs'
+import { crossfade } from 'svelte/transition'
+import { quartOut } from 'svelte/easing'
 
+
+// Crossfade transition
+export const [crossfadeSend, crossfadeReceive] = crossfade({
+    duration: d => Math.sqrt(d * 200),
+
+    fallback(node, params) {
+        const style = getComputedStyle(node)
+        const transform = style.transform === 'none' ? '' : style.transform
+
+        return {
+            duration: 600,
+            easing: quartOut,
+            css: t => `
+					transform: ${transform} scale(${t});
+					opacity: ${t}
+				`
+        }
+    }
+})
diff --git a/src/molecules/Location.svelte b/src/molecules/Location.svelte
index 87f2aca..c4ad539 100644
--- a/src/molecules/Location.svelte
+++ b/src/molecules/Location.svelte
@@ -1,15 +1,16 @@
 <script>
-    export let name
-    export let slug
-    export let country
-
-    const src = country.flag.full_url
+    // Props
+    export let location
 </script>
 
-<div class="location">
-    <a href="/location/{country.slug}/{slug}">
-        <img {src} alt={'Flag of ' + country.name} />
-        <h3 class="location__city">{name}</h3>
-        <p class="location__country style-caps">{country.name}</p>
+<div class="location" data-aos="location">
+    <a href="/location/{location.country.slug}/{location.slug}">
+        <img src={location.country.flag.full_url} alt="Flag of {location.country.name}">
+        <div class="anim-mask mask-city">
+            <h3 class="location__city">{location.name}</h3>
+        </div>
+        <div class="anim-mask mask-country">
+            <p class="location__country style-caps">{location.country.name}</p>
+        </div>
     </a>
 </div>
diff --git a/src/organisms/Locations.svelte b/src/organisms/Locations.svelte
index baad200..da3cf7f 100644
--- a/src/organisms/Locations.svelte
+++ b/src/organisms/Locations.svelte
@@ -1,15 +1,20 @@
 <script>
     import { onMount } from 'svelte'
     import { flip } from 'svelte/animate'
-	import { crossfade } from 'svelte/transition'
-	import { quintOut } from 'svelte/easing'
     import { locations, countries, continents } from '../store'
+    import { crossfadeReceive, crossfadeSend } from '../animations'
+    import * as fn from '../functions'
+
+    // Dependencies
+    import AOS from 'aos'
 
     // Components
     import Button from '../atoms/Button'
     import Location from '../molecules/Location'
 
     // Variables
+    const transitionDuration = 800
+    let clickOrigin = Date.now()
     let filterLocations
     let continentsToDisplay = []
     let continentsFiltered = []
@@ -20,31 +25,24 @@
     continentsFiltered = [...continentsToDisplay]
 
     // Filter by continent
-    const toggleContinents = (event, continent) => continentsFiltered = (!continent) ? [...continentsToDisplay] : [continent]
-
-    // Crossfade animation
-    const [send, receive] = crossfade({
-		duration: d => Math.sqrt(d * 200),
-		fallback(node, params) {
-			const style = getComputedStyle(node)
-			const transform = style.transform === 'none' ? '' : style.transform
-			return {
-				duration: 600,
-				easing: quintOut,
-				css: t => `
-					transform: ${transform} scale(${t});
-					opacity: ${t}
-				`
-			}
-		}
-	})
+    // detects if click difference if too short
+    const toggleContinents = (event, continent) => {
+        if (Date.now() - clickOrigin < transitionDuration) {
+            return
+        }
+        continentsFiltered = (!continent) ? [...continentsToDisplay] : [continent]
+        clickOrigin = Date.now()
+    }
 
 
     /*
     ** Run code on browser only
     */
     onMount(() => {
-
+        // Scroll apparitions
+        if (process.browser) {
+            AOS.init()
+        }
     })
 </script>
 
@@ -56,29 +54,23 @@
     <ul class="browse__continents" id="continents">
         {#if continentsToDisplay.length > 1}
         <li on:click={e => toggleContinents(e)}>
-            <Button type="button" text="All" className="button-outline {(continentsFiltered.length <= 1) ? 'disabled' : ''}" />
+            <Button type="button" text="All" class="button-outline {(continentsFiltered.length <= 1) ? 'disabled' : ''}" />
         </li>
         {/if}
         {#each continentsToDisplay as continent}
         <li on:click={e => toggleContinents(e, continent)}>
-            <Button type="button" text={continent.name} className="button-outline {(!continentsFiltered.includes(continent)) ? 'disabled' : ''}" />
+            <Button type="button" text={continent.name} class="button-outline {(!continentsFiltered.includes(continent)) ? 'disabled' : ''}" />
         </li>
         {/each}
     </ul>
 
     <div class="browse__locations" id="locations_list">
     {#each filteredLocations as location (location.id)}
-        <div
-            animate:flip="{{duration: 600}}"
-            in:receive="{{key: location.id}}"
-            out:send="{{key: location.id}}"
+        <div animate:flip="{{ duration: transitionDuration }}"
+            in:crossfadeReceive="{{ key: location.id }}"
+            out:crossfadeSend="{{ key: location.id }}"
         >
-        <!-- Animation: Grid with auto-min is fucking up the transition -->
-            <Location
-                name={location.name}
-                slug={location.slug}
-                country={location.country}
-            />
+            <Location {location} />
         </div>
     {/each}
     </div>
diff --git a/src/style/_animations.scss b/src/style/_animations.scss
index 57c9672..b76a630 100644
--- a/src/style/_animations.scss
+++ b/src/style/_animations.scss
@@ -101,6 +101,40 @@
 }
 
 
+// Location reveal
+[data-aos="location"] {
+    img {
+        opacity: 0;
+        transform: scale(1.15);
+        transition: opacity 0.6s $ease-quart, transform 0.6s $ease-quart;
+        will-change: opacity, transform;
+    }
+
+    h3, p {
+        transform: translateY(150%);
+        transition: transform 0.6s $ease-quart;
+        will-change: transform;
+    }
+    h3 {
+        transition: all 0.6s $ease-quart;
+        transition-delay: 100ms;
+    }
+    p {
+        transition-delay: 200ms;
+    }
+
+    &.aos-animate {
+        img {
+            opacity: 1;
+            transform: scale(1);
+        }
+        h3, p {
+            transform: translateY(0);
+        }
+    }
+}
+
+
 
 /* ==========================================================================
    KEYFRAMES ANIMATIONS
diff --git a/src/style/organisms/_locations.scss b/src/style/organisms/_locations.scss
index 88a8728..a349248 100644
--- a/src/style/organisms/_locations.scss
+++ b/src/style/organisms/_locations.scss
@@ -37,12 +37,13 @@
 
     // Locations
     &__locations {
+        min-height: 200px;
         margin-top: 112px;
 
         @include breakpoint (sm) {
             display: flex;
             // display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+            // grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
             grid-column-gap: 120px;
             grid-row-gap: pxVW(120);
             justify-content: center;
@@ -59,7 +60,12 @@
         margin-bottom: 48px;
 
         @include breakpoint (sm) {
-            margin-bottom: 0;
+            margin-left: pxVW(72);
+            margin-right: pxVW(72);
+        }
+        @include breakpoint (xl) {
+            margin-left: 72px;
+            margin-right: 72px;
         }
 
         a {
@@ -82,17 +88,26 @@
 
         // City
         &__city {
-            margin: 24px 0 16px;
             font-family: $font-serif;
             font-size: rem(32px);
             color: $color-secondary;
-            transition: color 85ms ease-in-out;
 
             @include breakpoint (sm) {
                 font-size: rem(48px);
+            }
+        }
+        .mask-city {
+            height: 40px;
+            margin: 24px 0 16px;
+
+            @include breakpoint (sm) {
+                height: 64px;
                 margin-bottom: 24px;
             }
         }
+        .mask-country {
+            height: 16px;
+        }
 
         // Shape on hover
         &:after {