                                                         (= (:vcs_type %) vcs_type)))
                                           (group-by :vcs_type))
           selected-transfer-org-name (:org-name selected-transfer-org)]
-      [:div.row-fluid
-       [:div.span8
-        [:fieldset
-         [:legend "Transfer plan to a different organization"]
-         [:div.alert.alert-warning
-          [:strong "Warning!"]
-          [:p "If you're not an admin on the "
-           (if selected-transfer-org-name
-             (str selected-transfer-org-name " organization,")
-             "organization you transfer to,")
-           " then you won't be able to transfer the plan back or edit the plan."]
-          [:p
-           "The transferred plan will be extended to include the "
-           org-name " organization, so your builds will continue to run. Only admins of the "
-           (if selected-transfer-org-name
-             (str selected-transfer-org-name " org")
-             "organization you transfer to")
-           " will be able to edit the plan."]]
-         (if-not user-orgs
-           [:div "Loading organization list..."]
-           [:div.container-fluid
-            [:form
-             [:div.row
-              (when gh-user-orgs
-                (transfer-organizations-list gh-user-orgs selected-transfer-org owner))
-              (when bb-user-orgs
-                (transfer-organizations-list bb-user-orgs selected-transfer-org owner))]
-             [:div.row
-              [:div.form-actions.span6
-               (button/managed-button
-                {:success-text "Transferred"
-                 :loading-text "Transferring..."
-                 :disabled? (not selected-transfer-org)
-                 :kind :primary
-                 :on-click #(raise! owner
-                                    [:transfer-plan-clicked
-                                     {:from-org {:org-name org-name
-                                                 :vcs-type vcs_type}
-                                      :to-org selected-transfer-org}])}
-                "Transfer Plan")]]]])]]]))))
+      [:div
+       [:fieldset
+        [:div.alert.alert-warning
+         [:p [:strong "Warning!"]]
+         [:p "If you're not an admin on the "
+          (if selected-transfer-org-name
+            (str selected-transfer-org-name " organization,")
+            "organization you transfer to,")
+          " then you won't be able to transfer the plan back or edit the plan."]
+         [:p
+          "The transferred plan will be extended to include the "
+          org-name " organization, so your builds will continue to run. Only admins of the "
+          (if selected-transfer-org-name
+            (str selected-transfer-org-name " org")
+            "organization you transfer to")
+          " will be able to edit the plan."]]
+        (if-not user-orgs
+          [:div "Loading organization list..."]
+          [:form
+           [:div.org-lists
+            (when gh-user-orgs
+              (transfer-organizations-list gh-user-orgs selected-transfer-org owner))
+            (when bb-user-orgs
+              (transfer-organizations-list bb-user-orgs selected-transfer-org owner))]
+           [:div
+            (button/managed-button
+             {:success-text "Transferred"
+              :loading-text "Transferring..."
+              :disabled? (not selected-transfer-org)
+              :kind :primary
+              :on-click #(raise! owner
+                                 [:transfer-plan-clicked
+                                  {:from-org {:org-name org-name
+                                              :vcs-type vcs_type}
+                                   :to-org selected-transfer-org}])}
+             "Transfer plan")]])]]))))
 
 (defn organizations [app owner]
   (om/component
    (html
     [:div.organizations
-     (om/build piggieback-organizations {:current-org (get-in app state/org-data-path)
-                                         :user-orgs (get-in app state/user-organizations-path)})
-     (om/build transfer-organizations {:current-org (get-in app state/org-data-path)
-                                       :user-orgs (get-in app state/user-organizations-path)})])))
+     (card/collection
+       [(card/titled {:title "Extra Organizations"}
+                     (om/build piggieback-organizations {:current-org (get-in app state/org-data-path)
+                                                         :user-orgs (get-in app state/user-organizations-path)}))
+        (card/titled {:title "Transfer plan to a different organization"}
+                     (om/build transfer-organizations {:current-org (get-in app state/org-data-path)
+                                                       :user-orgs (get-in app state/user-organizations-path)}))])])))
 
 (defn- billing-card [app owner]
   (reify

                               (filter #(= vcs-type (:vcs_type %)))
                               (map :name))
                              piggieback-orgs)]
    ;; width has been set to 20% here
    [:div.controls.col-md-3
     [:h4 (str (utils/prettify-vcs_type vcs-type) " Organizations")]
     ;; orgs that this user can add to piggieback orgs and existing piggieback orgs
     (for [org-name (cond->> (disj (clojure.set/union vcs-org-names

                              true (map :login)
                              true (sort-by string/lower-case)
                              user-login (cons user-login))]
    [:div.controls
     [:h4 (str (utils/prettify-vcs_type vcs_type) " Organizations")]
     (for [org-name sorted-org-names
           :let [org-map {:org-name org-name
