diff --git a/_layouts/track.html b/_layouts/track.html
index 0f39de2..b60b66c 100644
--- a/_layouts/track.html
+++ b/_layouts/track.html
@@ -14,8 +14,9 @@ layout: default
   <div class="playbutton hideWhenNoJS">
   <a id="mu_pause" class="button">Play!</a>
   </div>
-<p><strong>{% for style in page.common.genre %}{{ style }}{% endfor %}</strong> by <strong>{{ page.common.artist }}</strong>
-  <br />{{ page.common.year }}
+  <h1>{{ page.common.title }}</h1>
+
+  
 </p>
 
 </section>
@@ -23,8 +24,8 @@ layout: default
 <!-- Content -->
 <div id="trackInfo">
 <section>
-
-  <h1>{{ page.common.title }}</h1>
+  <p>{% for style in page.common.genre %}{{ style }}{% endfor %} by <strong>{{ page.common.artist }}</strong></p>
+  <p>{{ page.common.year }}</p>
   <p><strong>{% assign round_seconds = page.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 }}</strong></p> 
    
 
diff --git a/_sass/trackplayer.scss b/_sass/trackplayer.scss
index 84ae4dc..1031db0 100644
--- a/_sass/trackplayer.scss
+++ b/_sass/trackplayer.scss
@@ -66,7 +66,7 @@
       margin: 20px;
       padding: 0;
     }
-    h1 {
+    p:first-child {
       margin-top:80px;
     }
   }
@@ -99,8 +99,8 @@
     height: unset;
     overflow-y: unset;
     section {
-      h1 {
-        margin-top:0;
+      p:first-child {
+        margin-top:20px;
       }
     }
   }