                                 :on-click #(do
                                            (raise! owner [:edited-input {:path (input-path) :value nil}])
                                            (raise! owner [:saved-project-settings {:project-id project-id}])
-                                           false)}]))]]]])))))
-
-(defn aws-codedeploy [project-data owner]
+                                           false)}]))]]])))))
+
+(defn aws [project-data owner]
+  (reify
+    om/IRender
+    (render [_]
+      (let [project (:project project-data)]
+        (html
+         [:div.aws-page
+          [:h2 "AWS keys for " (vcs-url/project-name (:vcs_url project))]
+          [:div.aws-page-inner
+            (om/build aws-keys-form project-data)]])))))
+
+
+(defn aws-codedeploy-app-settings [project-data owner]
   (reify
     om/IRender
     (render [_]

            project-id (project-model/id project)
            input-path (fn [& ks] (apply conj state/inputs-path :aws :keypair ks))]
        (html
         [:div.aws-page
          [:h2 "AWS keys for " (vcs-url/project-name (:vcs_url project))]
          [:div.aws-page-inner
           [:p "Set the AWS keypair to be used for authenticating against AWS services during your builds. "
            "Credentials are installed on your containers into the " [:code "~/.aws/config"] " and "
            [:code "~/.aws/credentials"] " properties files. These are read by common AWS libraries such as "

              " guide for detailed information on getting set up."]
          [:div.aws-page-inner
            [:div.aws-codedeploy-step
             [:h4 "Step 1"]
              (om/build aws-keys-form project-data)]

            [:div.aws-codedeploy-step
             [:h4 "Step 2"]
             [:p "[Optional] Configure application-wide settings."]
             [:p "This is useful if you deploy the same app to multiple deployment groups "
                 "(e.g. staging, production) depending on which branch was built. "
                 "With application settings configured in the UI you only need to set the "
                 "deployment group and, optionally, deployment configuration, in each deployment "
                 "block in your " [:a {:href "/docs/configuration#deployment"} "circle.yml file"] ". "
                 "If you skip this step you will need to add all deployment settings into your circle.yml file."]
             (om/build aws-codedeploy-app-settings project-data)]
            [:div.aws-codedeploy-step
             [:h4 "Step 3"]
             [:p "Add deployment settings to your "
                 [:a {:href "/docs/configuration#deployment"} "circle.yml file"]
                 " (example below)."]
             [:pre
              [:code
               "deployment:\n"
