diff --git a/dashboard/src/app/album.component.html b/dashboard/src/app/album.component.html
index 47c8d89..a9cef95 100644
--- a/dashboard/src/app/album.component.html
+++ b/dashboard/src/app/album.component.html
@@ -1,6 +1,6 @@
 <h1>{{albumName}}</h1>
 
-<div class="well">
+<div class="alert alert-warning">
     <h3>Debug Zone</h3>
     Returned song: {{songs.length}}<br />
     Theorical number song: {{ album ? album['Track Count'] : ""  }}
diff --git a/dashboard/src/app/artist.component.html b/dashboard/src/app/artist.component.html
index 7fff891..35c7b80 100644
--- a/dashboard/src/app/artist.component.html
+++ b/dashboard/src/app/artist.component.html
@@ -1,7 +1,39 @@
 <h1>{{albumName}}</h1>
 
-<ul class="heroes">
-    <li *ngFor="let song of songs | sortBy : 'Album':'Track Number'" >
-        {{("0" + song['Track Number']).slice(-2)}}. {{song.Name}} -- {{song.Artist}} -- {{song.Album}}
-    </li>
-</ul>
\ No newline at end of file
+<div class="alert alert-warning">
+    <h3>Debug Zone</h3>
+    Returned song: {{songs.length}}<br />
+</div>
+
+<table class="table table-striped" (window:scroll)="onScroll($event)">
+<thead>
+    <tr>
+        <th></th>
+        <th>Name</th>
+        <th>Artist</th>
+        <th>Album</th>
+        <th>Album Artist</th>
+        <th>Play Count</th>
+    </tr>
+</thead>
+<tbody>
+    <tr *ngFor="let song of songs | sortBy : 'Album':'Track Number'">
+        <td>{{song['Track Number'] ? (("0" + song['Track Number']).slice(-2)) : "--"}}</td>
+        <td [title]="song.Name">{{song.Name}}</td>
+        <td [title]="song.Artist"><a [routerLink]="['/artist', song.Artist]">{{song.Artist}}</a></td>
+        <td [title]="song.Album"><a [routerLink]="['/album', song.Album]">{{song.Album}}</a></td>
+        <td [title]="song.Album">{{song['Album Artist'] ? song['Album Artist'] : "-" }}</td>
+        <td [title]="song['Play Count']">{{song['Play Count']}}</td>
+    </tr>
+</tbody>
+</table>
+
+<button type="button" *ngIf="moreDataAvailable" class="btn btn-default" aria-label="More" (click)="loadSongs()">
+    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> More...
+</button>
+
+<!-- Go to Top Button-->
+<button type="button" class="btn btn-warning btn-top" [class.btn-top-is-visible]="atBottom"
+    aria-label="Top" (click)="scrollTop()">
+    <span class="glyphicon glyphicon-menu-up" style="color:white" aria-hidden="true"></span>
+</button>
\ No newline at end of file