         code ((:template (status-formats format)) {:image image :target target})]
     (om/component
      (html
-      [:div.status-page
-       [:h2 "Status badges for " project-name]
-       [:div "Use this tool to easily create embeddable status badges. Perfect for your project's README or wiki!"]
-       [:div.status-page-inner
-        [:form
-
-         [:div.branch
-          [:h4 "Branch"]
-          [:div.styled-select
-           [:select {:value branch
-                     :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :branch) %)}
-            [:option {:value ""} "Default"]
-            [:option {:disabled "disabled"} "-----"]
-            (for [branch branches]
-              [:option {:value branch} branch])]
-           [:i.fa.fa-chevron-down]]]
-
-         [:div.token
-          [:h4 "API Token"]
-          (when-not (or oss (seq token))
-            [:p [:span.warning "Warning: "] "Private projects require an " [:a {:href "#api"} "API token"] "."])
-          [:div.styled-select
-           [:select {:value token
-                     :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :token) %)}
-            [:option {:value ""} "None"]
-            [:option {:disabled "disabled"} "-----"]
-            (for [{:keys [token label]} tokens]
-              [:option {:value token} label])]
-           [:i.fa.fa-chevron-down]]]
-
-         #_ ;; Hide style selector until "badge" style is improved. See PR #3140 discussion.
-         [:div.style
-          [:h4 "Style"]
-          [:fieldset
-           (for [[id {:keys [label]}] status-styles]
-             [:label.radio
-              [:input {:name "branch" :type "radio" :value id :checked (= style id)
-                       :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :style) %)}]
-              label])]]
-
-         [:div.preview
-          [:h4 "Preview"]
-          [:img {:src image}]]
-
-         [:div.embed
-          [:h4 "Embed Code"]
-          [:div.styled-select
-           [:select {:value format
-                     :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :format) %)}
-            (for [[id {:keys [label]}] status-formats]
-              [:option {:value id} label])]
-           [:i.fa.fa-chevron-down]]
-          [:textarea {:readonly true
-                      :value code
-                      :on-click #(.select (.-target %))}]]
-
-         ]]]))))
+      [:section.status-page
+       [:article
+        [:h2 "Status badges for " project-name]
+        [:div "Use this tool to easily create embeddable status badges. Perfect for your project's README or wiki!"]
+        [:div.status-page-inner
+         [:form
+
+          [:div.branch
+           [:h4 "Branch"]
+           [:div.styled-select
+            [:select {:value branch
+                      :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :branch) %)}
+             [:option {:value ""} "Default"]
+             [:option {:disabled "disabled"} "-----"]
+             (for [branch branches]
+               [:option {:value branch} branch])]
+            [:i.fa.fa-chevron-down]]]
+
+          [:div.token
+           [:h4 "API Token"]
+           (when-not (or oss (seq token))
+             [:p [:span.warning "Warning: "] "Private projects require an " [:a {:href "#api"} "API token"] "."])
+           [:div.styled-select
+            [:select {:value token
+                      :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :token) %)}
+             [:option {:value ""} "None"]
+             [:option {:disabled "disabled"} "-----"]
+             (for [{:keys [token label]} tokens]
+               [:option {:value token} label])]
+            [:i.fa.fa-chevron-down]]]
+
+          #_ ;; Hide style selector until "badge" style is improved. See PR #3140 discussion.
+          [:div.style
+           [:h4 "Style"]
+           [:fieldset
+            (for [[id {:keys [label]}] status-styles]
+              [:label.radio
+               [:input {:name "branch" :type "radio" :value id :checked (= style id)
+                        :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :style) %)}]
+               label])]]
+
+          [:div.preview
+           [:h4 "Preview"]
+           [:img {:src image}]]
+
+          [:div.embed
+           [:h4 "Embed Code"]
+           [:div.styled-select
+            [:select {:value format
+                      :on-change #(utils/edit-input controls-ch (conj state/project-data-path :status-badges :format) %)}
+             (for [[id {:keys [label]}] status-formats]
+               [:option {:value id} label])]
+            [:i.fa.fa-chevron-down]]
+           [:textarea {:readonly true
+                       :value code
+                       :on-click #(.select (.-target %))}]]
+
+          ]]]]))))
 
 (defn ssh-keys [project-data owner]
   (reify

                :experimental (om/build experiments project-data)
                :setup (om/build dependencies project-data)
                :tests (om/build tests project-data)
                :hooks (om/build chatrooms project-data)
                :webhooks (om/build webhooks project-data)
                :badges (om/build status-badges project-data)
                :ssh (om/build ssh-keys project-data)
                :checkout (om/build checkout-ssh-keys {:project-data project-data :user user})

                          :data-loading-text "Following..."}
                 "Follow"])))]])))))

(defn general [project-data owner]
  (reify
    om/IRender
    (render [_]
