diff --git a/_includes/article-heading.html b/_includes/article-heading.html
index 3aeae19..b118fac 100644
--- a/_includes/article-heading.html
+++ b/_includes/article-heading.html
@@ -1,4 +1,5 @@
-<div class="parallax-section article-title-section" data-jarallax data-speed="{{ site.parallax-speed }}" style="background-image: url('/images/{{ page.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}.jpg');">
+{% assign article_url = page.url | relative_url %}
+<div class="parallax-section article-title-section" data-jarallax data-speed="{{ site.parallax-speed }}" style="background-image: url('/images/{{ article_url | slice: 1, article_url.size | remove: '.html' | replace: '/', '-' }}.jpg');">
     <h2 class="mdc-typography--headline3">{{ page.title }}</h2>
 </div>
 <figcaption class="mdc-typography--caption-text">{{ page.image-caption }} &bull; &copy; {{ page.copyright }}</figcaption>
diff --git a/_includes/image.html b/_includes/image.html
index f3f63e1..fa56829 100644
--- a/_includes/image.html
+++ b/_includes/image.html
@@ -1,4 +1,5 @@
+{% assign article_url = page.url | relative_url %}
 <figure>
-    <img src="/images/{{ page.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}--extra-{{ include.id }}.jpg" style="width:100%;">
+    <img src="/images/{{ article_url | slice: 1, article_url.size | remove: '.html' | replace: '/', '-' }}--extra-{{ include.id }}.jpg" style="width:100%;">
     <figcaption class="mdc-typography--caption-text">{{ include.caption }} &bull; &copy; {{ include.copyright }}</figcaption>
 </figure>
\ No newline at end of file
diff --git a/_includes/mdc-card.html b/_includes/mdc-card.html
index d8412bd..2dc211d 100644
--- a/_includes/mdc-card.html
+++ b/_includes/mdc-card.html
@@ -1,5 +1,6 @@
-<div class="mdc-card" onclick="window.location='{{ include.article.url | relative_url }}';">
-    <div class="mdc-card__media mdc-card__media--16-9" style="background-image: url('/images/{{ include.article.url | relative_url | remove: '.html' | replace: '/', '-' | remove: '-articles-' }}.jpg');"></div>
+{% assign article_url = include.article.url | relative_url %}
+<div class="mdc-card" onclick="window.location='{{ article_url }}';">
+    <div class="mdc-card__media mdc-card__media--16-9" style="background-image: url('/images/{{ article_url | slice: 1, article_url.size | remove: '.html' | replace: '/', '-' }}.jpg');"></div>
     <div class="mdc-card-content">
         <h2 class="mdc-typography--headline6">{{ include.article.title }}</h2>
         <h3 class="mdc-typography--subtitle2">
@@ -10,7 +11,7 @@
     </div>
     <div class="mdc-card__actions">
         <div class="mdc-card__action-buttons">
-            <button class="mdc-button mdc-card__action mdc-card__action--button" data-mdc-auto-init="MDCRipple" onclick="window.location='{{ include.article.url | relative_url }}';">Read</button>
+            <button class="mdc-button mdc-card__action mdc-card__action--button" data-mdc-auto-init="MDCRipple" onclick="window.location='{{ article_url }}';">Read</button>
         </div>
     </div>
 </div>
\ No newline at end of file