   (reify
     om/IRender
     (render [_]
-      (html
-       [:a.btn.btn-primary.plan {:href (routes/v1-org-settings-path {:org login
-                                                                     :vcs_type vcs_type
-                                                                     :_fragment "osx-pricing"})
-                                 :on-click #((om/get-shared owner :track-event)
-                                             {:event-type :select-plan-clicked
-                                              :properties {:org login
-                                                           :vcs-type vcs_type
-                                                           :plan-type pm/osx-plan-type}})}
-        "Select Plan"]))))
+      (button/link {:href (routes/v1-org-settings-path {:org login
+                                                        :vcs_type vcs_type
+                                                        :_fragment "osx-pricing"})
+                    :on-click #((om/get-shared owner :track-event)
+                                {:event-type :select-plan-clicked
+                                 :properties {:org login
+                                              :vcs-type vcs_type
+                                              :plan-type pm/osx-plan-type}})
+                    :primary? true}
+                   "Select Plan"))))
 
 (defn free-trial-button [{{:keys [login vcs_type]} :selected-org} owner]
   (reify
     om/IRender
     (render [_]
-      (html
-       (managed-button
-        (let [plan-type :osx
-              template "osx-trial"]
-          [:a.btn.trial {:on-click #(do
-                                      (raise! owner [:activate-plan-trial {:plan-type plan-type
-                                                                           :template template
-                                                                           :org {:name login
-                                                                                 :vcs_type vcs_type}}]))
-                         :data-spinner true}
-           "Start 2 Week Trial"]))))))
+      (button/managed-button
+       {:on-click #(do
+                    (raise! owner
+                            [:activate-plan-trial {:plan-type :osx
+                                                   :template "osx-trial"
+                                                   :org {:name login
+                                                         :vcs_type vcs_type}}]))}
+       "Start 2 Week Trial"))))
 
 (defn no-plan-empty-state [{{:keys [login vcs_type] :as selected-org} :selected-org} owner]
   (reify

         "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))

  (reify
    om/IRender
    (render [_]
      (button/button {:on-click #(raise! owner [:refreshed-user-orgs {}])
                      :primary? true}
                     "Reload Organizations"))))

(defn- repo-title [repo link?]
  (let [repo-name (vcs-url/repo-name (:vcs_url repo))
