             [:table {:class "table table-hover table-condensed"}
              [:thead
               [:tr
-               (sorting-th owner "Description" :description)
-               (sorting-th owner "Device ID" :device_id)
+               (sorting-th owner "Unique Description" :description)
+               (sorting-th owner "Further Description" :name)
                (sorting-th owner "Location" :location)
-               (sorting-th owner "Metadata" :metadata)
-               (sorting-th owner "Name" :name)
                (sorting-th owner "Privacy" :privacy)
-               (sorting-th owner "No. of Sensors" :count)]]
+               (sorting-th owner "No. of Sensors" :count)
+               (sorting-th owner "Sensor Types" :sensor_types)
+               (sorting-th owner "Device ID" :device_id)]]
              [:tbody
               (for [row (if sort-asc
                           (sort-by sort-key devices)


(defn error-handler [event-chan]
  (fn [{:keys [status status-text]}]
    (put! event-chan {:path :event :value {:status true
                                           :class "alert alert-danger"
                                           :text status-text}})))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Adding new sensor

          [:div.btn-toolbar
           ;; Add new device
           [:button {:type "button"
                     :class (str "btn btn-primary " (when (or adding-sensor
                                                              adding-device
                                                              editing
                                                              (not (:editable property)))
                                                      "hidden"))
                     :onClick (fn [_]
                                (om/update! properties [:devices :adding-device] true))}
            [:div {:class "fa fa-plus"} " Add device"]]
           ;; Edit device
           [:button {:type "button"
                     :class (str "btn btn-primary " (when-not (and (not adding-sensor)
