diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..94a25f7f4c
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/lib/Pi/Form/View/Helper/Form.php b/lib/Pi/Form/View/Helper/Form.php
index e2c7cea57a..aae55ac6c2 100644
--- a/lib/Pi/Form/View/Helper/Form.php
+++ b/lib/Pi/Form/View/Helper/Form.php
@@ -217,6 +217,17 @@ public function render(FormInterface $form, $options = array())
     </div>
 </div>
 <div class="%error_size% help-block">%error_content%</div>
+EOT;
+                    break;
+
+                case 'button':
+                    $labelPattern = '';
+                    $elementPattern =<<<EOT
+<div class="%element_size% js-form-element">
+    %element_content%
+    %desc_html%
+</div>
+<div class="%error_size% help-block">%error_content%</div>
 EOT;
                     break;