diff --git a/src/molecules/Photo.svelte b/src/molecules/Photo.svelte
index 88ea361..b025aca 100644
--- a/src/molecules/Photo.svelte
+++ b/src/molecules/Photo.svelte
@@ -18,6 +18,7 @@
     const { name, date, location } = photo
     const { private_hash } = photo.image
     const imgAlt = `${name}, ${location.region}, ${location.country.name}`
+    const nameSplit = name.split(', ')
 
     // Photo index
     const photoIndex = (index < 10 ? '0': '') + index
@@ -35,9 +36,11 @@
     <div class="photo__location wrap">
         <div class="wrapper">
             <h2 class="title-location" id="photo-{index + 1}">
-                {#each name.split(', ') as line, i}
+                {#each nameSplit as line, i}
                 <span class="line">
-                    <span>{name.split(', ')[i]},</span>
+                    <span>
+                        {nameSplit[i]}{#if i < nameSplit.length - 1},{/if}
+                    </span>
                 </span>
                 {/each}
             </h2>
diff --git a/src/style/molecules/_photo.scss b/src/style/molecules/_photo.scss
index 1f596fa..44c4fe8 100644
--- a/src/style/molecules/_photo.scss
+++ b/src/style/molecules/_photo.scss
@@ -1,5 +1,4 @@
 .photo {
-
     /*
     ** Location
     */
@@ -13,6 +12,7 @@
             margin-bottom: 56px;
         }
 
+        // Street name
         h2 {
             text-align: left;
 
@@ -22,7 +22,8 @@
         }
         .line {
             overflow: hidden;
-            padding-bottom: 3px;
+            margin: -12px 0 -16px;
+            padding: 12px 0;
             display: block;
 
             span {