diff --git a/src/components/atoms/Button.svelte b/src/components/atoms/Button.svelte
new file mode 100644
index 0000000..215464f
--- /dev/null
+++ b/src/components/atoms/Button.svelte
@@ -0,0 +1,10 @@
+<script lang="ts">
+    export let text: string
+    export let tag: string
+</script>
+
+{#if tag === 'button'}
+    <button class="{$$props.class}">
+        {text}
+    </button>
+{/if}
\ No newline at end of file
diff --git a/src/components/molecules/Location.svelte b/src/components/molecules/Location.svelte
index b8c4994..614e446 100644
--- a/src/components/molecules/Location.svelte
+++ b/src/components/molecules/Location.svelte
@@ -1,3 +1,14 @@
 <script lang="ts">
-    export let location
-</script>
\ No newline at end of file
+    export let location: any
+
+    const { name, slug, country, last_updated } = location
+</script>
+
+<div class="location" role="listitem">
+    <a href="/location/{country.slug}/{slug}" rel="prefetch" sveltekit-noscroll>
+        <img src="//api.housesof.localhost:8055/assets/{country.flag.id}" alt="Flag of {country.name}">
+        <h3 class="location__name">
+            {name}
+        </h3>
+    </a>
+</div>
\ No newline at end of file
diff --git a/src/components/organisms/Locations.svelte b/src/components/organisms/Locations.svelte
index 16fbd9d..ce365f0 100644
--- a/src/components/organisms/Locations.svelte
+++ b/src/components/organisms/Locations.svelte
@@ -1,9 +1,9 @@
-<script>
+<script lang="ts">
     // Components
     import Button from '$components/atoms/Button.svelte'
     import Location from '$components/molecules/Location.svelte'
 
-    export let locations
+    export let locations: any
 </script>
 
 <div class="browse">
@@ -13,12 +13,12 @@
 
     <ul class="browse__continents" id="continents">
         <li>
-            <Button type="button" text="All" class="button-outline" />
+            <Button tag="button" text="All" class="button-outline" />
         </li>
     </ul>
 
     <div class="browse__locations" id="locations_list" role="list">
-        {#each locations as location (location.id)}
+        {#each locations as location (location.slug)}
             <Location
                 location={location}
             />
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 59af724..bce8595 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -24,13 +24,21 @@
                     name
                     slug
                     country {
-                        id
+                        name
+                        slug
+                        flag {
+                            id
+                        }
                     }
+                    date_updated
                 }
 
                 country {
                     name
                     slug
+                    flag {
+                        id
+                    }
                 }
 
                 continent {
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 29140fa..f36c60b 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -5,7 +5,6 @@
     import Locations from '$components/organisms/Locations.svelte'
 
     const globalData: any = getContext('global')
-    console.log(globalData)
 </script>
 
 <Metas
diff --git a/src/routes/location/[country]/[location].svelte b/src/routes/location/[country]/[location].svelte
new file mode 100644
index 0000000..12fd75f
--- /dev/null
+++ b/src/routes/location/[country]/[location].svelte
@@ -0,0 +1 @@
+<h1>Hello location</h1>
\ No newline at end of file