diff --git a/_includes/streamer.html b/_includes/streamer.html
index 26cca166..000448fa 100644
--- a/_includes/streamer.html
+++ b/_includes/streamer.html
@@ -45,8 +45,14 @@
   </section>
 {% else %}
 <section class="streambox" style="margin-top:40px;">
+  {% if page.collection == 'albums' %}
+  <h3 style="text-align: center;display: block;">This release&nbsp; can't be bought</h3>
+  <p>But other releases are available here:</p>
+  {% else %}
   <h3 style="text-align: center;display: block;">This track can't be bought</h3>
   <p>But other tracks are available here:</p>
+  {% endif %}
+
   <div class="streamer">
     {% for shop in site.data.stores %}
     {% if shop.download == true %}
@@ -54,18 +60,6 @@
     {% endif %}
     {% endfor %}
   </div>
-<!--   
-  <h3 style="text-align: center;display: block;margin-top:40px;">Stream</h3>
-  <div class="streamer">
-  
-    {% for shop in site.data.stores %}
-    {% if shop.download != true %}
-    
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " " }}']);" style="flex: 0 0 75px;margin:10px; font-size: 75px;" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="icon style2 brands {{ shop.icon }}"><span class="label">{{ shop.name }}</span></a>
-    {% endif %}
-    {% endfor %}
-  </div> 
--->
   </section>
 {% endif %}
 {% endif %}
\ No newline at end of file
diff --git a/_layouts/track.html b/_layouts/track.html
index 3f104e95..d1a3f275 100644
--- a/_layouts/track.html
+++ b/_layouts/track.html
@@ -30,7 +30,7 @@ layout: default
   </div>
 
   <div class="image">
-    <img src="{{ relBase }}{{ page.cover }}" alt="{{ page.title }} logo" id="coverart" />
+    <img src="https://media.basspistol.com/panix/{{ page.slug }}.jpeg" alt="{{ page.title }} logo" id="coverart" />
   </div>
 </section>
 {% if page.all.UNSYNCEDLYRICS != nil %}
@@ -72,15 +72,15 @@ layout: default
           <div class="post-nav">
             <div>
               {% if page.previous.url and page.lang == page.previous.lang %}
-              <h4><a href="{{ relBase }}/{{ page.previousTrack.slug }}/" alt="Read {{ page.previousTrack.common.title }}" title="Read {{ page.previousTrack.common.title }}"><i class="fas fa-arrow-left"></i></a> <a
-                  href="{{ relBase }}/{{ page.previousTrack.slug }}/">&nbsp;{{ page.previousTrack.common.title }}</a>
+              <h4><a href="{{ relBase }}/albums/{{ page.previousTrack.slug }}/" alt="Read {{ page.previousTrack.common.title }}" title="Read {{ page.previousTrack.common.title }}"><i class="fas fa-arrow-left"></i></a> <a
+                  href="{{ relBase }}/albums/{{ page.previousTrack.slug }}/">&nbsp;{{ page.previousTrack.common.title }}</a>
               </h4>
               {% endif %}
             </div>
             <div class="post-nav-next">
               {% if page.next.url and page.lang == page.next.lang  %}
-              <h4><a href="{{ relBase }}/{{ page.nextTrack.slug }}/">&nbsp;{{ page.nextTrack.common.title }}</a> <a
-                  href="{{ relBase }}/{{ page.nextTrack.slug }}/" alt="Read {{ page.nextTrack.common.title }}" title="Read {{ page.nextTrack.common.title }}"><i class="fas fa-arrow-right"></i></a></h4>
+              <h4><a href="{{ relBase }}/albums/{{ page.nextTrack.slug }}/">&nbsp;{{ page.nextTrack.common.title }}</a> <a
+                  href="{{ relBase }}/albums/{{ page.nextTrack.slug }}/" alt="Read {{ page.nextTrack.common.title }}" title="Read {{ page.nextTrack.common.title }}"><i class="fas fa-arrow-right"></i></a></h4>
               {% endif %}
             </div>
           </div>
@@ -92,7 +92,7 @@ layout: default
 </section>
 <!-- Audio player-->
 <audio autoplay preload="true" data-matomo-title="{{ page.common.title }}">
-  <source src="{{ relBase }}{{ page.audio }}" type="audio/mpeg" ontimeupdate='updateTrackTime(this);' />
+  <source src="https://media.basspistol.com/panix/{{ page.slug }}.mp3" type="audio/mpeg" ontimeupdate='updateTrackTime(this);' />
   <h1>Your browser isn't ready for so much hotness. Use the download-link instead.</h1>.
 </audio>
 {% include footer.html %}