                               {:react-key (:index container)}))
                   (if (> subsequent-container-count 0)
                     [:a.container-selector-v2.page-container-pills
-                     {:on-click #(om/set-state! owner :container-index (+ container-index paging-width))}
+                     {:on-click #(om/set-state! owner :paging-offset (+ paging-offset paging-width))}
                      [:div.pill-details ;; just for flexbox container
                       [:div "Next " subsequent-container-count]
                       [:div container-count " total"]]

                                    :running "Status-Running"
                                    :waiting "Status-Queued"
                                    nil))]]
         [:span.lower-pill-section "(" (formatter duration-ms) ")"]])))))

(defn container-pills-v2 [data owner]
  (reify

;; TODO this seems a little bit slow when calculating durations for really complex builds with
;; lots of containers. Is there a good way to avoid recalculating this when selecting container pills? (Perhaps caching the calculated value using IWillUpdate / IShouldUpdate?)
(defn container-utilization-duration
  [actions]
  (apply + (map action-duration-ms actions)))

(defn container-duration-label [{:keys [actions]}]
  (reify
    om/IRender
    (render [_]
      (html
        [:span.lower-pill-section
         "("
         (datetime/as-duration (container-utilization-duration actions))
         ")"]))))

(defn container-pill-v2 [{:keys [container current-container-id build-running?]} owner]
  (reify
