diff --git a/src/cljs/airsonic_ui/views/song.cljs b/src/cljs/airsonic_ui/views/song.cljs
index 0c4c241..98f7f7d 100644
--- a/src/cljs/airsonic_ui/views/song.cljs
+++ b/src/cljs/airsonic_ui/views/song.cljs
@@ -1,7 +1,8 @@
 (ns airsonic-ui.views.song
   (:require [re-frame.core :refer [dispatch]]
             [airsonic-ui.events :as events]
-            [airsonic-ui.routes :as routes :refer [url-for]]))
+            [airsonic-ui.routes :as routes :refer [url-for]]
+            [airsonic-ui.views.icon :refer [icon]]))
 
 (defn item [songs song]
   (let [artist-id (:artistId song)]
@@ -19,5 +20,10 @@
 ;; FIXME: This is very similar to album-listing
 
 (defn listing [songs]
-  [:ul (for [[idx song] (map-indexed vector songs)]
-         [:li {:key idx} [item songs song]])])
+  [:table.table.is-striped.is-hoverable.is-fullwidth>tbody
+   (for [[idx song] (map-indexed vector songs)]
+     ^{:key idx} [:tr
+                  [:td.grow [item songs song]]
+                  ;; FIXME: Not implemented yet
+                  [:td>a {:title "Play next"} [icon :plus]]
+                  [:td>a {:title "Play last"} [icon :arrow-thick-right]]])])
diff --git a/src/sass/app.sass b/src/sass/app.sass
index 1056156..f79d9d3 100644
--- a/src/sass/app.sass
+++ b/src/sass/app.sass
@@ -61,3 +61,8 @@
     height: auto
     max-width: 256px
     max-height: 256px
+
+// occurs in album detail view
+.table
+  .grow
+    width: 100%