diff --git a/_layouts/album.html b/_layouts/album.html
index a7c944ca..0c777d6b 100644
--- a/_layouts/album.html
+++ b/_layouts/album.html
@@ -31,14 +31,14 @@ lang: en
   class="banner onload-image-fade-in onload-content-fade-right style2 fullscreen content-align-center image-position-center"
   style="height:100vh;background-color: rgba(13,13,13,0.85);">
   <div class="content editable">
-    <h1 class="editable">{{ page.name }}</h1>
-
+    <h1 class="editable">{{ page.title }}</h1>
+    <p>{{ page.description }}</p>
     <ul class="actions stacked">
       <li><a href="#moe" class="button small smooth-scroll-middle">cheggit!</a></li>
     </ul>
   </div>
   <div class="image">
-    <img src="https://media.basspistol.com/panix/{{  page.slug }}/{{ page.tracks[0].trackSlug }}.jpeg" alt="{{ page.name }}" class="editable" />
+    <img src="https://media.basspistol.com/panix/{{  page.slug }}/{{ page.tracks[0].trackSlug }}.jpeg" alt="{{ page.title }}" class="editable" />
   </div>
 </section>
 <!-- Content -->
@@ -51,8 +51,10 @@ lang: en
         <!-- Content -->
         <div class="content">
 
+
           <!-- HERE BEGINS MADNESS -->
 
+
           <!-- Content -->
           <div class="content">
             <div id="mainwrap">
@@ -79,7 +81,7 @@ lang: en
                     <div class="plItem">
                       <div class="plNum">{{ track.common.track.no }}.</div>
                       <div class="plTitle">{{ track.common.title }}</div>
-                      <div class="plLength">{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{{ round_seconds | minus: leftover_seconds }}</div>
+                      <div class="plLength">{% assign round_seconds = track.format.duration | round %}{% assign minutes = round_seconds | divided_by: 60 %}{% assign leftover_seconds = minutes | times: 60 %}{{ minutes }}:{% assign seconds_without_zero = round_seconds | minus: leftover_seconds %}{% if seconds_without_zero < 10 %}0{% endif %}{{ seconds_without_zero }}</div>
                     </div>
                   </li>
                   {% endfor %}
@@ -109,16 +111,17 @@ lang: en
     </div>
   </div>
 </section>
-<!-- Tracks -->
 
+
+<!-- HERE ENDS MADNESS -->
+
+<!-- Tracks -->
 <section id="albumdata" class="wrapper style1 align-center">
   <div class="gallery style1 medium onscroll-fade-in">
-<!-- 
-
     {% for track in page.tracks %}
     <article>
-      <a href="{{ relBase }}/{{ track.slug }}/" class="image">
-        <img src="{{ relBase }}{{ track.cover}}" alt="{{ track.common.title }}" />
+      <a href="{{ relBase }}/albums/{{ track.slug }}/" class="image">
+        <img src="https://media.basspistol.com/panix/{{ track.albumSlug }}/{{ track.trackSlug }}.jpeg" alt="{{ track.common.title }}" />
       </a>
       <div class="caption">
         <h3>{{ track.common.title }}</h3>
@@ -130,20 +133,16 @@ lang: en
         </ul>
       </div>
     </article>
-    {% endfor %} -->
+    {% endfor %}
 
 
       {% include streamer.html %}
 
   </div>
 </section>
-
 <!-- END Tracks -->
 
 
-<!-- HERE ENDS MADNESS -->
-
-
 <section class="wrapper style1 align-center">
   <div class="inner">
     <div class="index align-left">
@@ -155,7 +154,7 @@ lang: en
         <div class="content">
           <!-- post Naviation -->
           <div style="text-align: center;">
-            <h3>{{ site.data.translations[page.lang].post-nav}}</h3>
+            <h3>More releases</h3>
           </div>
           <div class="post-nav">
             <div>
diff --git a/_sass/player.scss b/_sass/player.scss
index 2af80250..a963607e 100644
--- a/_sass/player.scss
+++ b/_sass/player.scss
@@ -86,7 +86,7 @@ audio {
 }
 
 .plTitle {
-  left: 50px;
+  left: 75px;
   overflow: hidden;
   position: absolute;
   right: 65px;
@@ -94,11 +94,12 @@ audio {
   top: 0;
   white-space: nowrap;
   font-weight: bold;
+  padding-right: 10px;
 }
 
 .plNum {
   padding-left: 21px;
-  width: 25px;
+  width: 65px;
 }
 
 .plLength {