diff --git a/src/main.rs b/src/main.rs
index 60395db..952b78b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,6 +16,11 @@ mod mpd;
 struct IndexTemplate {
     path: Vec<String>,
     entries: Vec<mpd::Entry>,
+
+    song: Option<mpdrs::Song>,
+    name: Option<String>,
+
+    queue: Vec<mpd::QueueItem>,
 }
 
 #[derive(Deserialize, Default)]
@@ -27,12 +32,28 @@ struct IndexQuery {
 async fn index(req: tide::Request<()>) -> tide::Result {
     let query: IndexQuery = req.query()?;
     let entries = mpd::ls(&query.path)?;
+    let queue = mpd::playlist()?;
+
+    // TODO dry
+    let mut mpd = mpd::connect()?;
+    let song = mpd.currentsong()?;
+
+    let name = if let Some(song) = &song {
+        let name = song.title.as_ref().unwrap_or(&song.file).to_string();
+        Some(name)
+    } else {
+        None
+    };
+
     let template = IndexTemplate {
         path: Path::new(&query.path)
             .iter()
             .map(|s| s.to_string_lossy().to_string())
             .collect(),
         entries,
+        name,
+        song,
+        queue,
     };
     Ok(askama_tide::into_response(&template))
 }
diff --git a/templates/player.html b/templates/player.html
index 5a31ca4..0860406 100644
--- a/templates/player.html
+++ b/templates/player.html
@@ -3,7 +3,11 @@
 <div class="nowplaying">
   <div class="current">
     {% if let Some(song) = song %}
-    <img class="albumart" src="/art?path={{ song.file }}">
+    <img 
+      class="albumart"
+      src="/art?path={{ song.file }}" 
+      onerror="this.style.opacity = 0"
+    >
 
     <div class="metadata">
       {% if let Some(name) = name %}