   :tab-updated
   (fn [app-state [_ msg]]
     (console/trace "Updated:" msg)
-    (assoc app-state
-      :tabs
-      (-> (:tabs app-state)
+    (assoc-in app-state
+      [:data :tabs]
+      (-> (get-in app-state [:data :tabs])
           (remove-tab (:tabId msg))
           (conj (:tab msg))))
     ))

     [:td (:url tab)]]))

(defn tab-list []
  (let [tabs (reaction (filter-tabs @(subscribe [:tabs])))]
    (fn []
      [:div
       [:div {:class "page-header"} [:h2 "Current tabs"]]

  (for [group groups]
    ^{:key (:date group)}
    [:div
     [:div
      [:h3 (:date group)]
      [:small [:a {:on-click #(console/log "Deleting" group)} "Delete"]]
      ]

     [:table {:class "table table-striped table-hover"}
      [:thead
       [:tr
