             [: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)

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

                        :onClick (fn [_]
                                   (put! event-chan {:event :adding-device :value false}))}
               "Cancel"]]]
            (bs/text-input-control cursor owner :device :description "Unique Description" true)
            (bs/text-input-control cursor owner :device :name "Further Description")
            (location-input cursor owner)
            (bs/checkbox cursor owner :device :privacy "Private")]]]
         [:div.col-md-12
          [:h3 "Create sensor:"]
