          "Select a plan to build your OS X projects now."]
         [:div.buttons
          (om/build select-plan-button {:selected-org selected-org})
+         " "
          (om/build free-trial-button {:selected-org selected-org})]]))))
 
 (defmulti repo-list (fn [{:keys [type]}] type))

                                github-authorized? "github"
                                :else "bitbucket")
            tab-content (html
                         [:div
                          (when (= "github" selected-vcs-type)
                            (if github-authorized?
                              (missing-org-info owner)
                              [:div
                               [:p "GitHub is not connected to your account yet. To connect it, click the button below:"]
                               [:a.btn.btn-primary {:href (gh-utils/auth-url)
                                                    :on-click #((om/get-shared owner :track-event) {:event-type :authorize-vcs-clicked
                                                                                                    :properties {:vcs-type selected-vcs-type}})}
                                "Authorize with GitHub"]]))
                          (when (and (= "bitbucket" selected-vcs-type)
                                     (not bitbucket-authorized?))
                            [:div
                             [:p "Bitbucket is not connected to your account yet. To connect it, click the button below:"]
                             [:a.btn.btn-primary {:href (bitbucket/auth-url)
                                                  :on-click #((om/get-shared owner :track-event) {:event-type :authorize-vcs-clicked
                                                                                                  :properties {:vcs-type selected-vcs-type}})}
                              "Authorize with Bitbucket"]])
                          (om/build org-picker/picker {:orgs (filter (partial select-vcs-type selected-vcs-type) orgs)
                                                       :selected-org selected-org
                                                       :on-org-click #(raise! owner [:selected-add-projects-org %])})
                          (when (get-in user [:repos-loading (keyword selected-vcs-type)])
                            [:div.orgs-loading
                             [:div.loading-spinner common/spinner]])])]
        (if bitbucket-possible?
          (let [tabs [{:name "github"
                       :icon (html [:i.octicon.octicon-mark-github])

            [frontend.async :refer [navigate! raise!]]
            [frontend.components.common :as common]
            [frontend.components.forms :refer [managed-button]]
            [frontend.components.pieces.button :as button]
            [frontend.components.pieces.card :as card]
            [frontend.components.pieces.org-picker :as org-picker]
            [frontend.components.pieces.tabs :as tabs]
