     (let [title   (get-in @state [:info "name"])
           message (get-in @state [:info "greet_message"])
           url     (get-in @state [:info "stream_url"])]
-      [:div.info
+      [:section#info
        [:h1 title]
-       [:div.greet-message message]
-       [:div.player [:audio {:src url
-                             :controls "controls"}]]])))
+       [:p message]
+       [:audio {:src url
+                :controls "controls"}]])))
 
 (defn upload-component []
-  [:div.upload
+  [:section#upload
    [:h2 "Upload"]
-   [:form {:id "upload-form"}
+   [:form {:id "upload"}
     [:input {:type "file" :name "track"}]
-    [:input {:type "button" :value "Upload" :on-click upload!}]]
-   [:div.upload-status (@state :upload-status)]])
+    [:input {:type "button" :value "Upload" :on-submit upload!}]]
+   [:p (@state :upload-status)]])
 
 (defn playlist-add-component [track]
-  [:input.add-button
+  [:input.add
    {:type "button" :value "+"
     :on-click #(playlist-add (track "uuid"))}])
 
 (defn playlist-remove-component [track]
-  [:input.add-button
+  [:input.remove
    {:type "button" :value "-"
     :on-click #(playlist-remove (track "uuid"))}])
 

     "-")])

(defn now-playing-component []
  [:div.now-playing
   [:span "Now playing:"]
   [track-component (get-in @state [:playlist "current"])]])

(defn next-component []
  [:div.next
   [:span "Next:"]
   [:ul
    (for [track (get-in @state [:playlist "next"])]

       [track-component track]])]])

(defn playlist-component []
  [:section#playlist
   [:h2 "Playlist"]
   [now-playing-component]
   [next-component]])
