         dom-id (gen-dom-id cursor korks)
         valid (or (nil? valid?) (valid? korks))]
     (list
-      [:div.form-group
-       (align-controls
-         inline
-         [:div {:class (str "checkbox" (when-not valid " has-error") (when inline " checkbox-inline"))}
-          [:label
-           [:input
-            (merge-attrs {:on-change #(do
-                                       (om/update! cursor korks (.. % -target -checked)))
-                          :checked   (get-in cursor korks)
-                          :type      "checkbox"
-                          :id        dom-id}
-                         attrs
-                         {})]
-           label]]
-         (when-let [validation-error (and validation-error-fn (validation-error-fn korks))]
-           (error-label validation-error)))])))
+      (unlabeled-control
+        inline
+        [:div {:class (str "checkbox" (when-not valid " has-error") (when inline " checkbox-inline"))}
+         [:label
+          [:input
+           (merge-attrs {:on-change #(do
+                                      (om/update! cursor korks (.. % -target -checked)))
+                         :checked   (get-in cursor korks)
+                         :type      "checkbox"
+                         :id        dom-id}
+                        attrs
+                        {})]
+          label]]
+        (when-let [validation-error (and validation-error-fn (validation-error-fn korks))]
+          (error-label validation-error))))))
 
 (defn radio                                                 ;; TODO: Extract common method for `radio` and `checkbox`.
   [& args]

  [warning]
  [:label {:class "warning"} warning])

(defn add-class
  [opts class]
  (as-> opts $
        (apply hash-map $)
        (update-in $ [:class] #(if % (str/join " " [% class]) class))
        (mapcat identity $)))

(defn align-controls
  [inline & xs]
  (if inline
    xs
    (list (when (form-horizontal?)
            [:div {:class (label-column-class)}])
          (input-column xs))))

(defn labeled-control
  [inline form-group-class label dom-id & xs]

        dom-id (gen-dom-id cursor korks)
        valid (or (nil? valid?) (valid? korks))]
    (list
      (unlabeled-control
        inline
        [:div {:class (str "radio" (when-not valid " has-error") (when inline " radio-inline"))}
         [:label
          [:input
           (merge-attrs {:on-change #(when (.. % -target -checked)
                                      (om/update! cursor korks value))
                         :checked   (= value (get-in cursor korks))
                         :type      "radio"
                         :id        dom-id
                         :name      dom-id
                         :value     value}
                        attrs
                        {})]
          label]]
        (when-let [validation-error (and validation-error-fn (validation-error-fn korks))]
          (error-label validation-error))))))

(defn select
  [& args]
