diff --git a/_layouts/album.html b/_layouts/album.html
index 0c777d6b..1fbf44e6 100644
--- a/_layouts/album.html
+++ b/_layouts/album.html
@@ -115,33 +115,39 @@ lang: en
 
 <!-- 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 }}/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>
-        <p>
-          <strong>{{ track.common.genre }}</strong>
-          <br />{{ track.common.year }}</p>
-        <ul class="actions fixed">
-          <li><span class="editable button small icon fa-play-circle">Play</span></li>
-        </ul>
-      </div>
-    </article>
-    {% endfor %}
+<section class="wrapper style1 align-center">
 
+  <div class="inner">
+    <h2>Track list</h2>
+    <p>Use thses pages to share one song in particulare</p>
+  </div>
 
-      {% include streamer.html %}
+</section>
 
+{% for track in page.tracks %}
+
+<section
+  class="spotlight style4 orient-{% cycle 'left', 'right' %} content-align-{% cycle 'right', 'left' %} image-position-center onscroll-image-fade-in"
+  {% if forloop.index == 1 %}style="box-shadow: none;" {% endif %}>
+  <div class="content">
+    <h3>{{ track.common.title }}</h3>
+    <p>
+      {% 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 }}
+      <br /><strong>{{ track.common.genre }}</strong>
+      <br />{{ track.common.year }}</p>
+
+    <ul class="actions stacked">
+      <li><a href="{{ relBase }}/albums/{{ track.slug }}/" class="button">Track</a></li>
+    </ul>
+  </div>
+  <div class="image">
+    <img src="https://media.basspistol.com/panix/{{ track.albumSlug }}/{{ track.trackSlug }}.jpeg" alt="{{ track.common.title }}" />
   </div>
 </section>
-<!-- END Tracks -->
 
+{% endfor %}
+
+{% include streamer.html %}
 
 <section class="wrapper style1 align-center">
   <div class="inner">