diff --git a/_includes/header.html b/_includes/header.html
index 0fd583f..f7dbf43 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -15,7 +15,7 @@
     </div>
   </div>
   <div class="header-content">
-    <img src="/assets/images/paddy.svg" alt="Paddy, the Butter Box Mascot" class="header-image" />
+    <img src="{{ site.baseurl }}/assets/images/paddy.svg" alt="Paddy, the Butter Box Mascot" class="header-image" />
     <div class="header-title">{% t butter_box_title %}</div>
   </div>
 </header>
\ No newline at end of file
diff --git a/assets/js/main.js b/assets/js/main.js
index b76fcb2..0fe5213 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -37,7 +37,7 @@ btnModal.addEventListener('click', (event) => {
 // change display of #usb-butter to inherit
 const usbButter = document.querySelector('#usb-butter');
 if (usbButter) {
-  fetch('/usb-butter')
+  fetch(usbButter.dataset.url)
     .then(response => {
       console.log(response);
       if (response.status === 200) {
diff --git a/index.html b/index.html
index 09d1482..14600a9 100644
--- a/index.html
+++ b/index.html
@@ -7,27 +7,27 @@ layout: default
 <div class="container">
   <div class="content">
     <!-- Defaults to display: none; revealed via JS depending on USB insertion. -->
-    <a href="/usb-butter/" id="usb-butter" style="display: none;">
+    <a href="/usb-butter/" id="usb-butter" style="display: none;" data-url="{{ site.baseurl }}/usb-butter">
       <div class="card">
-          <img src="/assets/images/explore-icon.png" alt="Explore Icon" class="card-icon-big">
+          <img src="{{ site.baseurl }}/assets/images/explore-icon.png" alt="Explore Icon" class="card-icon-big">
           {% t explore %}
       </div>
     </a>
     <a href="/chat/#/room/%23public%3A{{site.data.deployment.chat_server}}">
       <div class="card">
-        <img src="/assets/images/message-icon.png" alt="Message Icon" class="card-icon">
+        <img src="{{ site.baseurl }}/assets/images/message-icon.png" alt="Message Icon" class="card-icon">
         {% t message_board %}
       </div>
     </a>
     <a class="btn-modal" href="#" data-micromodal-trigger="product-modal">
       <div class="card">
-          <img src="/assets/images/appstore-icon.png" alt="App Store Icon" class="card-icon">
+          <img src="{{ site.baseurl }}/assets/images/appstore-icon.png" alt="App Store Icon" class="card-icon">
           {% t app_store %}
       </div>
     </a>
     <!-- Hidden until we have a design ready to implement. -->
     <div class="card" style="display: none;"> 
-        <img src="/assets/images/maps-icon.png" alt="Maps Icon" class="card-icon">
+        <img src="{{ site.baseurl }}/assets/images/maps-icon.png" alt="Maps Icon" class="card-icon">
         {% t offline_maps %}
     </div>
   </div>