           :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- form-name [value]
  (form/comp
    "NAME"
    (comp/vtext-field
      {:name     "name"
       :key      "name"

(ns swarmpit.component.volume.create
  (:require [material.icon :as icon]
            [material.component :as comp]
            [material.component.list-table-form :as list]
            [material.component.form :as form]
            [material.component.panel :as panel]
            [swarmpit.component.mixin :as mixin]
            [swarmpit.component.state :as state]
            [swarmpit.component.message :as message]
            [swarmpit.ajax :as ajax]
            [swarmpit.routes :as routes]
            [swarmpit.url :refer [dispatch!]]
            [sablono.core :refer-macros [html]]
            [rum.core :as rum]))

(enable-console-print!)

(def form-driver-opts-cursor (conj state/form-value-cursor :options))

(def form-driver-opts-headers
  [{:name  "Name"
    :width "35%"}
   {:name  "Value"
    :width "35%"}])

(defn- volume-plugin-handler
  []
