diff --git a/AmFormsPlugin.php b/AmFormsPlugin.php
index e6a691d..c1007a4 100644
--- a/AmFormsPlugin.php
+++ b/AmFormsPlugin.php
@@ -28,7 +28,7 @@ public function getName()
      */
     public function getVersion()
     {
-        return '1.3.0';
+        return '1.3.1';
     }
 
     /**
@@ -36,7 +36,7 @@ public function getVersion()
      */
     public function getSchemaVersion()
     {
-        return '1.3.0';
+        return '1.3.1';
     }
 
     /**
diff --git a/templates/forms/_edit.twig b/templates/forms/_edit.twig
index 9ca399a..7d59e8c 100644
--- a/templates/forms/_edit.twig
+++ b/templates/forms/_edit.twig
@@ -13,6 +13,10 @@
 ] %}
 
 {% set tabs = {
+    form: {
+        label: "General"|t,
+        url: '#form'
+    },
     formfields: {
         label: "Fields"|t,
         url: '#designer'
@@ -37,30 +41,25 @@
     <input type="hidden" name="redirect" value="amforms/forms/edit/{id}">
     {% if formId is defined -%}<input type="hidden" name="formId" value="{{ formId }}">{% endif %}
 
-    <div class="grid first">
-        <div class="item first" data-position="left" data-min-colspan="2" data-max-colspan="3">
-            <div class="pane">
-                {% include "_includes/tabs" %}
+    <div class="pane">
+        {% include "_includes/tabs" %}
 
-                <div id="designer">
-                    {% include 'amforms/forms/_fields/designer' %}
-                </div>
+        <div id="form">
+            {% include 'amforms/forms/_fields/form' %}
+        </div>
 
-                <div id="notification" class="hidden">
-                    {% include 'amforms/forms/_fields/notifications' %}
-                </div>
+        <div id="designer" class="hidden">
+            {% include 'amforms/forms/_fields/designer' %}
+        </div>
 
-                {% if currentUser.admin -%}
-                    <div id="templates" class="hidden">
-                        {% include 'amforms/forms/_fields/templates' %}
-                    </div>
-                {% endif %}
-            </div>
+        <div id="notification" class="hidden">
+            {% include 'amforms/forms/_fields/notifications' %}
         </div>
-        <div class="item" data-position="right" data-colspan="1">
-            <div class="pane">
-                {% include 'amforms/forms/_fields/form' %}
+
+        {% if currentUser.admin -%}
+            <div id="templates" class="hidden">
+                {% include 'amforms/forms/_fields/templates' %}
             </div>
-        </div>
+        {% endif %}
     </div>
 {% endblock %}