                   :on-click (:action @modal-info)} (:action-label @modal-info)]
         ]])))
 
-(defn list-tabs [tabs]
+(defn list-tabs [tabs is-history?]
   (for [tab (sort-by :index tabs)]
-    ^{:key (:id tab)}
-    [:tr
-     [:td (:id tab)]
-     [:td (:title tab)]
-     [:td (:url tab)]]))
-
-(defn tab-list []
+    (let [url     (:url tab)
+          favicon (:favIconUrl tab)
+          action  (if is-history?
+                    {:href url :target "_blank"}
+                    {:on-click #(tabs/update (:id tab) {:highlighted true :active true})}
+                    )]
+      ^{:key (:id tab)}
+      [:tr
+       [:td {:class "col-sm-1"} (if-not is-history? (:id tab))]
+       [:td {:class "col-sm-6"} [:a
+                                 action
+                                 (if favicon
+                                   [:img {:src    favicon
+                                          :width  16
+                                          :height 16}])
+                                 (:title tab)]]
+       [:td {:class "col-sm-5"} url]])))
+
+(defn current-tabs []
   (let [tabs (reaction (filter-tabs @(subscribe [:data :tabs])))]
     (fn []
       [:div

               [:th "Title"]
               [:th "URL"]]]
             [:tbody
              (list-tabs (filter-tabs (:tabs group)))]
             ]]))
       ]
      )

          [:th "Title"]
          [:th "URL"]]]
        [:tbody
         (list-tabs @tabs false)]
        ]
       [:button {:on-click #(dispatch [:tabset-save])} "Save me"]
       [:button {:on-click #(go (console/log (<! (storage/get))))} "Get"]
