   [:div.next
    [:span "Next:"]
    [:ul
-    (for [uuid (get-in @state [:playlist "next"])]
+    (for [track (get-in @state [:playlist "next"])]
       [:li
-       [playlist-remove-component uuid]
-       [track-component uuid]])]])
+       [playlist-remove-component track]
+       [track-component track]])]])
 
 (defn playlist-component []
-  [:div.library
+  [:div.playlist
    [:h2 "Playlist"]
    [now-playing-component]
    [next-component]])

(defn library-component []
  [:div.library
   [:h2 "Library"]
   [:ul (for [uuid (@state :library)]
          [:li
           [playlist-add-component uuid]
           [track-component uuid]])]])

(defn page-component []
  [:div.page

    [:input {:type "button" :value "Upload" :on-click upload!}]]
   [:div.upload-status (@state :upload-status)]])

(defn playlist-add-component [track]
  [:input.add-button
   {:type "button" :value "+"
    :on-click #(playlist-add (track "uuid"))}])

(defn playlist-remove-component [track]
  [:input.add-button
   {:type "button" :value "-"
    :on-click #(playlist-remove (track "uuid"))}])

(defn track-component [track]
  [:span.track
   (if track
     (str " " (track "artist") " - " (track "title"))
     "-")])

(defn now-playing-component []
  [:div.now-playing
