              (list
                [:dt (when (< 1 (count nodes)) [:span (str "container " i " ")])]
                [:dd {:class (when (:ssh_enabled node) "connected")}
-                [:span (gstring/format "ssh -p %s %s@%s " (:port node) (:username node) (:public_ip_addr node))]
+                [:span (ssh-command node)]
                 (when-not (:ssh_enabled node)
                   [:span.loading-spinner common/spinner])]))
            nodes (range))]]))
+
+(defrender ssh-node-list-v2 [nodes owner]
+  (html
+    [:ul.ssh-node-list
+     (map-indexed (fn [i node] [:li
+                                [:span.container (str "Container " i)]
+                                [:span.command (ssh-command node)]
+                                (when (:ssh_enabled node)
+                                  [:img.running-icon {:src (common/icon-path "Status-Running")}])])
+                  nodes)]))
 
 (defn ssh-instructions
   "Instructions for SSHing into a build that you can SSH into"

       [:div.build-ssh-title
        [:p "You can SSH into this build. Use the same SSH public key that you use for GitHub. SSH boxes will stay up for 30 minutes."]
        [:p "This build takes up one of your concurrent builds, so cancel it when you are done."]]
       (om/build ssh-build-list nodes)
       [:div.build-ssh-doc
        "Debugging Selenium browser tests? "
        [:a {:href "/docs/browser-debugging#interact-with-the-browser-over-vnc"}

       More information " [:a {:href (routes/v1-doc-subpage {:subpage "ssh-build"})} "in our docs"] "."
     (om/build ssh-buttons build)]])

(defn ssh-command [node]
  (gstring/format "ssh -p %s %s@%s " (:port node) (:username node) (:public_ip_addr node)))

(defrender ssh-node-list [nodes owner]
  (html
    [:div.build-ssh-list
     [:dl.dl-horizontal
