diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index 242ef9b..e852196 100644
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -23,9 +23,9 @@ Neos:
               actionClassAttribute: col-12
           'Neos.Form:FormElement':
             properties:
-              labelClassAttribute: 'col-sm-2 control-label'
-              containerClassAttribute: 'form-group row'
-              containerInnerClassAttribute: col-sm-10
+              labelClassAttribute: ''
+              containerClassAttribute: 'form-group'
+              containerInnerClassAttribute: ''
               elementClassAttribute: form-control
               elementErrorClassAttribute: has-error
               elementType: text
diff --git a/Resources/Private/Templates/Form/Checkbox.html b/Resources/Private/Templates/Form/Checkbox.html
index cb698a2..fe7617d 100755
--- a/Resources/Private/Templates/Form/Checkbox.html
+++ b/Resources/Private/Templates/Form/Checkbox.html
@@ -4,7 +4,7 @@
       xmlns:form="http://typo3.org/ns/Neos/Form/ViewHelpers"
       xmlns:neos="http://typo3.org/ns/Neos/Neos/ViewHelpers">
 <body>
-<f:form.validationResults for="{element.identifier}">
+<f:validation.results for="{element.identifier}">
     <div class="{element.properties.containerClassAttribute}{f:if(condition: validationResults.flattenedErrors, then: element.properties.elementErrorClassAttribute)}"<f:if condition="{element.rootForm.renderingOptions.previewMode}"> data-element="{form:form.formElementRootlinePath(renderable:element)}"</f:if>>
     <div class="{element.properties.containerInnerClassAttribute}">
         <div class="checkbox">
@@ -29,6 +29,6 @@
         </div>
     </div>
     </div>
-</f:form.validationResults>
+</f:validation.results>
 </body>
 </html>
diff --git a/Resources/Private/Templates/Form/FormEditMode.html b/Resources/Private/Templates/Form/FormEditMode.html
new file mode 100644
index 0000000..99836e1
--- /dev/null
+++ b/Resources/Private/Templates/Form/FormEditMode.html
@@ -0,0 +1,6 @@
+{namespace form=Neos\Form\ViewHelpers}
+<form:form action="index" object="{form}" method="post" id="{form.identifier}" section="{form.identifier}" enctype="multipart/form-data">
+    <f:for each="{form.pages}" as="page">
+        <form:renderRenderable renderable="{page}" />
+    </f:for>
+</form:form>
diff --git a/Resources/Private/Templates/Form/Layouts/Field.html b/Resources/Private/Templates/Form/Layouts/Field.html
index a706ea4..52bea85 100755
--- a/Resources/Private/Templates/Form/Layouts/Field.html
+++ b/Resources/Private/Templates/Form/Layouts/Field.html
@@ -4,7 +4,7 @@
       xmlns:form="http://typo3.org/ns/Neos/Form/ViewHelpers"
       xmlns:neos="http://typo3.org/ns/Neos/Neos/ViewHelpers">
 <body>
-<f:form.validationResults for="{element.identifier}">
+<f:validation.results for="{element.identifier}">
     <div class="{element.properties.containerClassAttribute} {f:if(condition: validationResults.flattenedErrors, then: element.properties.elementErrorClassAttribute)}"<f:if condition="{element.rootForm.renderingOptions.previewMode}"> data-element="{form:form.formElementRootlinePath(renderable:element)}"</f:if>>
     <label class="{element.properties.labelClassAttribute}" for="{element.uniqueIdentifier}">
         <f:translate id="form.label.{element.identifier}"
@@ -27,6 +27,6 @@
         </f:if>
     </div>
     </div>
-</f:form.validationResults>
+</f:validation.results>
 </body>
 </html>
diff --git a/Resources/Private/Templates/Form/Partials/Field/SingleLineText.html b/Resources/Private/Templates/Form/Partials/Field/SingleLineText.html
index 7c7c9ed..cdc2eff 100755
--- a/Resources/Private/Templates/Form/Partials/Field/SingleLineText.html
+++ b/Resources/Private/Templates/Form/Partials/Field/SingleLineText.html
@@ -8,7 +8,8 @@
                       property="{element.identifier}"
                       id="{element.uniqueIdentifier}"
                       class="{element.properties.elementClassAttribute}"
-                      placeholder="{f:translate(id: 'form.placeholder.{element.identifier}', source: '{element.renderingOptions.translationSource}', package: '{element.renderingOptions.translationPackage}', value: '{element.properties.placeholder}')}"
+                      placeholder="{element -> form:translateElementProperty(property: 'placeholder')}"
+                      maxlength="{element.properties.maxlength}"
                       required="{element.required}"/>
 </f:section>
 </body>
diff --git a/Resources/Private/Templates/Form/TwoColumns.html b/Resources/Private/Templates/Form/TwoColumns.html
new file mode 100644
index 0000000..8b381e9
--- /dev/null
+++ b/Resources/Private/Templates/Form/TwoColumns.html
@@ -0,0 +1,16 @@
+{namespace form=Neos\Form\ViewHelpers}
+<div class="row">
+    <f:if condition="{container.label}">
+        <h2>{container.label}</h2>
+    </f:if>
+    <div class="col-sm-6">
+        <f:for each="{container.column1Elements}" as="element">
+            <form:renderRenderable renderable="{element}" />
+        </f:for>
+    </div>
+    <div class="col-sm-6">
+        <f:for each="{container.column2Elements}" as="element">
+            <form:renderRenderable renderable="{element}" />
+        </f:for>
+    </div>
+</div>
