diff --git a/_includes/streamer.html b/_includes/streamer.html
index 8e4b047..4e5c809 100644
--- a/_includes/streamer.html
+++ b/_includes/streamer.html
@@ -1,13 +1,58 @@
-<section class="streambox" style="padding: 40px;">
-{% if page.collection == 'posts' %}
-  {% if page.category == 'releases' %}
-  {% if page.check_this_if_cannot_be_bought == false %}
 
+{% if page.collection == 'posts' %}
+{% if page.category == 'releases' %}
+{% if page.check_this_if_cannot_be_bought == false %}
+<section class="streambox" style="padding: 40px;">
+<h2 style="text-align: center;display: block;">Get this release</h2>
+<div class="streamer">
+  {% for shop in page.stores %}
+  {% if shop.download == true %}
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  {% endif %}
+  {% endfor %}
+</div>
+
+<p style="text-align: center;display: block;margin-top:40px;">Stream it, follow, like and subscribe!</p>
+<div class="streamer">
+
+  {% for shop in page.stores %}
+  {% if shop.download != true %}
+  
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " " }}']);" style="flex: 0 0 45px;margin:10px; font-size: 45px;" 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>
+{% else %}
+<section class="streambox" style="padding: 40px;">
+<h2 style="text-align: center;display: block;">This release can't be obtained</h2>
+<p>Stream, follow, like and subscribe!</p>
+<div class="streamer">
+  {% for shop in site.data.stores %}
+  {% if shop.download == true %}
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  {% endif %}
+  {% endfor %}
+</div>
+<h2 style="text-align: center;display: block;">&nbsp;</h2>
+
+<div class="streamer">
+  {% for shop in site.data.stores %}
+  {% if shop.download != true %}
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  {% endif %}
+  {% endfor %}
+</div>
+</section>
+{% endif %}
+{% else %}
+{% if page.check_this_if_cannot_be_bought == false %}
+<section class="streambox" style="padding: 40px;">
   <h2 style="text-align: center;display: block;">Get this release</h2>
   <div class="streamer">
     {% for shop in page.stores %}
     {% if shop.download == true %}
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
+    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
     {% endif %}
     {% endfor %}
   </div>
@@ -22,95 +67,25 @@
     {% endif %}
     {% endfor %}
   </div>
-
-  {% else %}
-
-  <h2 style="text-align: center;display: block;">This release can't be bought</h2>
-  <p>Stream, follow, like and subscribe!</p>
-  <div class="streamer">
-    {% for shop in site.data.stores %}
-    {% if shop.download == true %}
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
-    {% endif %}
-    {% endfor %}
-  </div>
-  <h2 style="text-align: center;display: block;">&nbsp;</h2>
-
-  <div class="streamer">
-    {% for shop in site.data.stores %}
-    {% if shop.download != true %}
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
-    {% endif %}
-    {% endfor %}
-  </div>
-  {% endif %}
-  {% endif %}
-  
-  {% elsif page.collection == 'tracks' %}
+</section>
+{% else %}
+{% endif %}
+{% endif %}
 
 
-  {% for post in site.posts %}
-  {% if post.album == page.albumSlug %}
-  {% if post.check_this_if_cannot_be_bought == false %}
-  
-  <h2 style="text-align: center;display: block;">Get this track</h2>
-  <div class="streamer">
-    {% for shop in post.stores %}
-    {% if shop.download == true %}
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
-    {% endif %}
-    {% endfor %}
-  </div>
-  
-  <p style="text-align: center;display: block;margin-top:40px;">Stream it, follow, like and subscribe!</p>
-  <div class="streamer">
-  
-    {% for shop in post.stores %}
-    {% if shop.download != true %}
-    
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " " }}']);" style="flex: 0 0 45px;margin:10px; font-size: 45px;" 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>
-  {% else %}
-  
-  <h2 style="text-align: center;display: block;">This track can't be bought</h2>
-  <p>Stream, follow, like and subscribe!</p>
-  <div class="streamer">
-    {% for shop in site.data.stores %}
-    {% if shop.download == true %}
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
-    {% endif %}
-    {% endfor %}
-  </div>
-  <h2 style="text-align: center;display: block;">&nbsp;</h2>
-  
-  <div class="streamer">
-    {% for shop in site.data.stores %}
-    {% if shop.download != true %}
-    <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
-    {% endif %}
-    {% endfor %}
-  </div>
-  {% break %}
-  
-  {% endif %}
-  {% endif %}
-  {% endfor %}
-
-
-{% elsif page.collection == 'albums' %}
+{% elsif page.collection == 'tracks' %}
 
+<section class="streambox" style="padding: 40px;">
 
 {% for post in site.posts %}
-{% if post.album == page.slug %}
+{% if post.album == page.albumSlug %}
 {% if post.check_this_if_cannot_be_bought == false %}
 
-<h2 style="text-align: center;display: block;">Get this album</h2>
+<h2 style="text-align: center;display: block;">Get this track</h2>
 <div class="streamer">
   {% for shop in post.stores %}
   {% if shop.download == true %}
-  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
   {% endif %}
   {% endfor %}
 </div>
@@ -127,12 +102,12 @@
 </div>
 {% else %}
 
-<h2 style="text-align: center;display: block;">This album can't be bought</h2>
+<h2 style="text-align: center;display: block;">This track can't be obtained</h2>
 <p>Stream, follow, like and subscribe!</p>
 <div class="streamer">
   {% for shop in site.data.stores %}
   {% if shop.download == true %}
-  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
   {% endif %}
   {% endfor %}
 </div>
@@ -141,7 +116,60 @@
 <div class="streamer">
   {% for shop in site.data.stores %}
   {% if shop.download != true %}
-  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  {% endif %}
+  {% endfor %}
+</div>
+{% break %}
+
+{% endif %}
+{% endif %}
+{% endfor %}
+</section>
+
+{% elsif page.collection == 'albums' %}
+
+<section class="streambox" style="padding: 40px;">
+{% for post in site.posts %}
+{% if post.album == page.slug %}
+{% if post.check_this_if_cannot_be_bought == false %}
+
+<h2 style="text-align: center;display: block;">Get this album</h2>
+<div class="streamer">
+  {% for shop in post.stores %}
+  {% if shop.download == true %}
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  {% endif %}
+  {% endfor %}
+</div>
+
+<p style="text-align: center;display: block;margin-top:40px;">Stream it, follow, like and subscribe!</p>
+<div class="streamer">
+
+  {% for shop in post.stores %}
+  {% if shop.download != true %}
+  
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " " }}']);" style="flex: 0 0 45px;margin:10px; font-size: 45px;" 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>
+{% else %}
+
+<h2 style="text-align: center;display: block;">This album can't be obtained</h2>
+<p>Stream, follow, like and subscribe!</p>
+<div class="streamer">
+  {% for shop in site.data.stores %}
+  {% if shop.download == true %}
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+  {% endif %}
+  {% endfor %}
+</div>
+<h2 style="text-align: center;display: block;">&nbsp;</h2>
+
+<div class="streamer">
+  {% for shop in site.data.stores %}
+  {% if shop.download != true %}
+  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
   {% endif %}
   {% endfor %}
 </div>
@@ -151,26 +179,27 @@
 {% endif %}
 {% endfor %}
 
-
+</section>
 
 {% else %}
+<section class="streambox" style="padding: 40px;">
 <h2 style="text-align: center;display: block;">Support {{ site.title }}</h2>
 <p>Stream, follow, like and subscribe!</p>
 <div class="streamer">
-  {% for shop in site.data.stores %}
-  {% if shop.download == true %}
-  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
-  {% endif %}
-  {% endfor %}
+{% for shop in site.data.stores %}
+{% if shop.download == true %}
+<a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+{% endif %}
+{% endfor %}
 </div>
 <h2 style="text-align: center;display: block;">&nbsp;</h2>
 
 <div class="streamer">
-  {% for shop in site.data.stores %}
-  {% if shop.download != true %}
-  <a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button icon brands {{ shop.icon }}">{{ shop.name }}</a>
-  {% endif %}
-  {% endfor %}
-</div>
+{% for shop in site.data.stores %}
+{% if shop.download != true %}
+<a onclick="_paq.push(['trackEvent', 'StoreLink', '{{ shop.name | remove: " "  }}']);" target="_blank" rel="noopener" href="{{ shop.url }}" alt="Stream from {{ shop.name }}" title="Stream from {{ shop.name }}" class="button small icon brands {{ shop.icon }}">{{ shop.name }}</a>
+{% endif %}
+{% endfor %}
+</div>
+</section>
 {% endif %}
-</section>
\ No newline at end of file