     (fn []
       [:div
        [modal-button
-        "5.1. CPU-M Modify EDN in steps (unchunked)"
-        #(modal-multi-chunk-runner
-          mwi-steps
-          [0]
-          calculating?)]
+        :label   "5.1. CPU-M Modify EDN in steps (unchunked)"
+        :on-click #(modal-multi-chunk-runner
+                    mwi-steps
+                    [0]
+                    calculating?)]
        (when @calculating?
          [mwi-steps-modal
           mwi-steps-progress-msg       ;; Not necessary with global atoms

    (fn []
      [:div
       [modal-button
        "[TODO] 6. CPU-M Create JSON (chunked), write to disk"
        #(modal-multi-chunk-runner
          chunked-json
          [0]
          calculating?)]
       (when @calculating?
         [chunked-json-modal
          chunked-json-progress-msg

    (fn []
      [:div
       [modal-button
        :label    "3. CPU-S Pivot calc"
        :on-click #(do
                     (reset! calculating? true)
                     (start-cpu-intensive (fn [] (calc-pivot-totals calculating?)))
                     )] ;; Delay call to allow modal to show
       (when @calculating?
         [calcing-pivot-totals-modal])
       ])
