 (let [sigma-state (atom {})]
   (defcomponent Sigma
     "Component on which the Sigma canvas is mounted."
-    :on-mount (fn [node [plot-state id] {:keys [set-force
+
+    :keyfn (fn [[plot-state id idx]] id)
+
+    :on-mount (fn [node [plot-state id idx] {:keys [drop-plot
+                                                set-force
                                                 toggle-force
                                                 toggle-lasso
                                                 merge-plot-data]}]
                 (prn "on-mount")
 
                 (let [sigma-instance   (-> (s/make-sigma-instance (graph-id id)
-                                                                  (m/sigma-settings plot-state))
-                                           (s/read (m/sigma-data plot-state))
+                                                                  (m/plot-settings plot-state))
+                                           (s/read (m/plot-data plot-state))
                                            (s/toggle-force-atlas-2 (m/force-layout-active? plot-state))
                                            (s/refresh))
 

          [:div {:class-name "mdl-grid mdl-cell mdl-cell--12-col-desktop mdl-cell--12-col-tablet mdl-cell--4-col-phone mdl-cell--top"}
           (for [[idx [id plot-state]] (->> (m/plots state)
                                            (map-indexed vector))]
             (Card [plot-state id idx] cmd-chans))]]]))

(defcomponent Menu
              [state {:keys [debug]}]

                             :title      "Add plot"
                             :hidden     (>= (m/plot-count state) 4)
                             :class-name "material-icons mdl-badge mdl-button--icon"} "add"]

                      [:button {:id "more-vert-btn"
                                :title      "More options"
