     (matrix-plot-view @count @width @height @min-day @max-day)))
 
 (defn time-axis [yscale]
-  (c2.svg/axis yscale
-               (range 0 (* 24 60 60) (* 60 60))
-               :orientation :right
-               :formatter #(str (/ % 60 60) ":00")))
+  [:g {:style {:stroke "#396AB1"}}
+   (c2.svg/axis yscale
+                (range 0 (* 24 60 60) (* 4 60 60))
+                :orientation :right
+                :formatter #(str (/ % 60 60) ":00"))])
 
 (defn hist-axis [density-yscale]
-  (c2.svg/axis density-yscale
-               (range 0 25)
-               :orientation :left
-               :label "Hours (per day)"))
+  [:g {:style {:stroke "#DA7C30"}}
+   (c2.svg/axis density-yscale
+                [0 8 16 24]
+                :orientation :left
+                :text-margin 25
+                :label-margin 40
+                :label "Hours (per day)")])
 
 (defn days-axis [xscale]
   (c2.svg/axis
    xscale
    (let [[r0 r1] (:domain xscale)]
-     (range r0 r1 (js/Math.round (/ (- r1 r0) 10))))
+     (butlast (range r0 r1 (js/Math.round (/ (- r1 r0) 10)))))
    :orientation :bottom
+   :text-margin 25
+   :label-margin 43
+   :major-tick-width 12
    :formatter format-day-to-time
-   :label "Day"))
+   :label "Date"))
 
 (defn cum-axis [yscale]
-  (c2.svg/axis
-   yscale
-   (conj (:ticks (c2.ticks/search (:domain yscale))) (second (:domain yscale)))
-   :orientation :right
-   :label "Hours (cum)"))
+  [:g {:style {:stroke "#3E9651"}}
+   (c2.svg/axis
+    yscale
+    (timbre/spy (conj (:ticks (c2.ticks/search (:domain yscale))) (second (:domain yscale))))
+    :orientation :right
+    :label "Hours (cum)")])
 
 (defn axes [xscale yscale density-yscale count-scale width height margin min-day max-day]
   [:g {:style       {:stroke       "black"


(defn histogram [xscale density-yscale height margin]
  (let [day-totals (subscribe [:day-totals])]
    [:g
     (doall
      (for [[d freq] @day-totals]
        (let [hours  (* freq 0.75)

                                        :range [margin (- height margin)])
        density-yscale (c2.scale/linear :domain [0 24]
                                        :range [(- height margin) margin])
        count-scale    (c2.scale/linear :domain [0 (js/Math.ceil (* 0.75 count))]
                                        :range [(- height margin) margin])]
    (if-not (= (:domain count-scale) [0 0])
      [:svg {:style {:width (str width "px") :height (str height "px")
                     :background-color "#eee"
                     :border "1px solid black"}}
       [axes xscale yscale density-yscale count-scale width height margin min-day max-day]
       [:g
        ^{:key "hist"} [histogram xscale density-yscale height margin]
        ^{:key "matrix"} [matrix xscale yscale]
        ^{:key "cumulative"} [cumulative xscale count-scale width height margin]]]
      [:svg {:style {:width (str width "px") :height "1px"}}])))

(defn tag-table-row-view [tag count tag-% minutes active? time-per-day]
  [:tr (if active?
