           :primary    true
           :onTouchTap create-volume-handler} processing?)]]
      [:div.form-edit
-      (form/form
-        {:onValid   #(state/update-value [:valid?] true state/form-state-cursor)
-         :onInvalid #(state/update-value [:valid?] false state/form-state-cursor)}
-        (form-name volumeName)
-        (form-driver driver plugins))]]))+      [:div.form-layout
+       (form/form
+         {:onValid   #(state/update-value [:valid?] true state/form-state-cursor)
+          :onInvalid #(state/update-value [:valid?] false state/form-state-cursor)}
+         (html
+           [:div.form-layout-group
+            (form-name volumeName)])
+         (html
+           [:div.form-layout-group.form-layout-group-border
+            (form/section "Driver")
+            (form-driver driver plugins)
+            (form/subsection-add "Add volume driver option" add-driver-opt)
+            (when (not (empty? options))
+              (form-driver-opts-table options))]))]]]))
(defn- init-form-value
  []
  (state/set-value {:volumeName nil
                    :driver     "local"} state/form-value-cursor))

(def mixin-init-form
  (mixin/init-form


(defn- form-driver [value plugins]
  (form/comp
    "NAME"
    (comp/select-field
      {:value    value
       :onChange (fn [_ _ v]
