diff --git a/resources/views/v1/accounts/create.twig b/resources/views/v1/accounts/create.twig
index 1b01a989b4..228f70233c 100644
--- a/resources/views/v1/accounts/create.twig
+++ b/resources/views/v1/accounts/create.twig
@@ -37,7 +37,6 @@
             </div>
 
             <div class="col-lg-6 col-md-6 col-sm-12">
-
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -61,8 +60,10 @@
                         {{ ExpandedForm.location('location', null, {locations: locations}) }}
                     </div>
                 </div>
-
-
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12">
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
@@ -76,7 +77,6 @@
                         </button>
                     </div>
                 </div>
-
             </div>
         </div>
     </form>
diff --git a/resources/views/v1/accounts/edit.twig b/resources/views/v1/accounts/edit.twig
index 936edd1099..109e3a0a68 100644
--- a/resources/views/v1/accounts/edit.twig
+++ b/resources/views/v1/accounts/edit.twig
@@ -85,7 +85,10 @@
                     </div>
                 </div>
             {% endif %}
-
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12">
             {# panel for options  #}
             <div class="box">
                 <div class="box-header with-border">
@@ -102,7 +105,7 @@
             </div>
         </div>
     </div>
-    {{ Form.close|raw }}
+    </form>
 {% endblock %}
 {% block scripts %}
     <script src="v1/lib/leaflet/leaflet.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
diff --git a/resources/views/v1/accounts/reconcile/edit.twig b/resources/views/v1/accounts/reconcile/edit.twig
index 9a02947a4d..575d274051 100644
--- a/resources/views/v1/accounts/reconcile/edit.twig
+++ b/resources/views/v1/accounts/reconcile/edit.twig
@@ -72,7 +72,10 @@
                         </div>
                     </div>
                 {% endif %}
-
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12">
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/v1/admin/link/create.twig b/resources/views/v1/admin/link/create.twig
index 45272d6079..cf4b130715 100644
--- a/resources/views/v1/admin/link/create.twig
+++ b/resources/views/v1/admin/link/create.twig
@@ -21,6 +21,8 @@
                     </div>
                 </div>
             </div>
+        </div>
+        <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
diff --git a/resources/views/v1/admin/link/edit.twig b/resources/views/v1/admin/link/edit.twig
index 560c69188b..32ffb9a680 100644
--- a/resources/views/v1/admin/link/edit.twig
+++ b/resources/views/v1/admin/link/edit.twig
@@ -22,6 +22,8 @@
                 </div>
             </div>
         </div>
+    </div>
+    <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
             {# panel for options #}
diff --git a/resources/views/v1/admin/users/edit.twig b/resources/views/v1/admin/users/edit.twig
index bd4834c61e..7468734f2e 100644
--- a/resources/views/v1/admin/users/edit.twig
+++ b/resources/views/v1/admin/users/edit.twig
@@ -26,7 +26,9 @@
                 </div>
             </div>
         </div>
-        <div class="col-lg-6 col-md-6 col-sm-12">
+    </div>
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
@@ -43,5 +45,5 @@
             </div>
         </div>
     </div>
-    {{ Form.close|raw }}
+    </form>
 {% endblock %}
diff --git a/resources/views/v1/attachments/edit.twig b/resources/views/v1/attachments/edit.twig
index d80bde0fba..e2bb7265b7 100644
--- a/resources/views/v1/attachments/edit.twig
+++ b/resources/views/v1/attachments/edit.twig
@@ -35,7 +35,10 @@
                         {{ ExpandedForm.textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }}
                     </div>
                 </div>
-
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/v1/bills/create.twig b/resources/views/v1/bills/create.twig
index bc299a9c54..dcf45256f6 100644
--- a/resources/views/v1/bills/create.twig
+++ b/resources/views/v1/bills/create.twig
@@ -37,7 +37,10 @@
                         {{ ExpandedForm.integer('skip',0) }}
                     </div>
                 </div>
-
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/v1/bills/edit.twig b/resources/views/v1/bills/edit.twig
index a1bdb1a002..216b6b7a40 100644
--- a/resources/views/v1/bills/edit.twig
+++ b/resources/views/v1/bills/edit.twig
@@ -42,6 +42,10 @@
 
                 </div>
             </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'options'|_ }}</h3>
@@ -57,7 +61,7 @@
             </div>
         </div>
     </div>
-    {{ Form.close|raw }}
+    </form>
 
 {% endblock %}
 {% block styles %}
diff --git a/resources/views/v1/budgets/create.twig b/resources/views/v1/budgets/create.twig
index 52966dd290..efb803bcbf 100644
--- a/resources/views/v1/budgets/create.twig
+++ b/resources/views/v1/budgets/create.twig
@@ -21,6 +21,12 @@
                     </div>
                 </div>
             </div>
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+                {# panel for auto-budget#}
+                abc
+            </div>
+        </div>
+        <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
diff --git a/resources/views/v1/budgets/edit.twig b/resources/views/v1/budgets/edit.twig
index f8c277b8a3..dd0c49b6a0 100644
--- a/resources/views/v1/budgets/edit.twig
+++ b/resources/views/v1/budgets/edit.twig
@@ -21,6 +21,12 @@
             </div>
 
         </div>
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+            {# auto budget#}
+            bla bla
+        </div>
+    </div>
+    <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             {# panel for options #}
             <div class="box">
@@ -37,7 +43,7 @@
         </div>
     </div>
 
-    {{ Form.close|raw }}
+    </form>
 
 {% endblock %}
 {% block scripts %}
diff --git a/resources/views/v1/categories/create.twig b/resources/views/v1/categories/create.twig
index 4c969aabf2..770e93106e 100644
--- a/resources/views/v1/categories/create.twig
+++ b/resources/views/v1/categories/create.twig
@@ -19,7 +19,8 @@
                     </div>
                 </div>
             </div>
-
+        </div>
+        <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
                 {# panel for options #}
diff --git a/resources/views/v1/categories/edit.twig b/resources/views/v1/categories/edit.twig
index f308b77853..2d7f2c5ac6 100644
--- a/resources/views/v1/categories/edit.twig
+++ b/resources/views/v1/categories/edit.twig
@@ -19,6 +19,8 @@
             </div>
 
         </div>
+    </div>
+    <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12">
 
 
@@ -38,7 +40,7 @@
             </div>
         </div>
     </div>
-    {{ Form.close|raw }}
+    </form>
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript" src="v1/js/ff/categories/edit.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
diff --git a/resources/views/v1/currencies/create.twig b/resources/views/v1/currencies/create.twig
index 2524659508..bab224ea4d 100644
--- a/resources/views/v1/currencies/create.twig
+++ b/resources/views/v1/currencies/create.twig
@@ -22,7 +22,8 @@
                 </div>
 
             </div>
-
+        </div>
+        <div class="row">
             <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
                 {# panel for options #}
diff --git a/resources/views/v1/currencies/edit.twig b/resources/views/v1/currencies/edit.twig
index 1aec8f112c..221b226329 100644
--- a/resources/views/v1/currencies/edit.twig
+++ b/resources/views/v1/currencies/edit.twig
@@ -23,7 +23,8 @@
                 </div>
             </div>
         </div>
-
+    </div>
+    <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
 
             {# panel for options #}
@@ -43,5 +44,5 @@
 
         </div>
     </div>
-    {{ Form.close|raw }}
+    </form>
 {% endblock %}
diff --git a/resources/views/v1/piggy-banks/create.twig b/resources/views/v1/piggy-banks/create.twig
index 06d3d5a181..8466c12749 100644
--- a/resources/views/v1/piggy-banks/create.twig
+++ b/resources/views/v1/piggy-banks/create.twig
@@ -34,7 +34,10 @@
                         {{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
                     </div>
                 </div>
-
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/v1/piggy-banks/edit.twig b/resources/views/v1/piggy-banks/edit.twig
index 668d1441a9..8dda406b0c 100644
--- a/resources/views/v1/piggy-banks/edit.twig
+++ b/resources/views/v1/piggy-banks/edit.twig
@@ -37,7 +37,10 @@
                     {{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')}) }}
                 </div>
             </div>
-
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
@@ -55,7 +58,7 @@
 
         </div>
     </div>
-    {{ Form.close|raw }}
+    </form>
 {% endblock %}
 {% block scripts %}
     <script type="text/javascript" src="v1/js/lib/modernizr-custom.js?v={{ FF_VERSION }}" nonce="{{ JS_NONCE }}"></script>
diff --git a/resources/views/v1/recurring/create.twig b/resources/views/v1/recurring/create.twig
index a02f0239d8..9de42801dd 100644
--- a/resources/views/v1/recurring/create.twig
+++ b/resources/views/v1/recurring/create.twig
@@ -140,7 +140,7 @@
 
         {# row with submit stuff. #}
         <div class="row">
-            <div class="col-lg-6 col-md-6 col-sm-12 col-lg-offset-6 lg-md-offset-6">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/v1/recurring/edit.twig b/resources/views/v1/recurring/edit.twig
index d06bf5e523..b241cd4efd 100644
--- a/resources/views/v1/recurring/edit.twig
+++ b/resources/views/v1/recurring/edit.twig
@@ -135,8 +135,8 @@
         </div>
 
         {# row with submit stuff. #}
-        <div class="row">
-            <div class="col-lg-6 col-md-6 col-sm-12 col-lg-offset-6 lg-md-offset-6">
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'options'|_ }}</h3>
diff --git a/resources/views/v1/rules/rule-group/create.twig b/resources/views/v1/rules/rule-group/create.twig
index 8873384298..1ce63b0337 100644
--- a/resources/views/v1/rules/rule-group/create.twig
+++ b/resources/views/v1/rules/rule-group/create.twig
@@ -29,7 +29,10 @@
                         {{ ExpandedForm.textarea('description') }}
                     </div>
                 </div>
-
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/v1/rules/rule-group/edit.twig b/resources/views/v1/rules/rule-group/edit.twig
index 3071059ef6..5a89eb509f 100644
--- a/resources/views/v1/rules/rule-group/edit.twig
+++ b/resources/views/v1/rules/rule-group/edit.twig
@@ -33,7 +33,10 @@
                     {{ ExpandedForm.textarea('description', ruleGroup.description) }}
                 </div>
             </div>
-
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
@@ -49,7 +52,7 @@
         </div>
     </div>
 
-    {{ Form.close|raw }}
+    </form>
 
 {% endblock %}
 {% block scripts %}
diff --git a/resources/views/v1/rules/rule/create.twig b/resources/views/v1/rules/rule/create.twig
index 3d9373c2c9..cb3e0acc28 100644
--- a/resources/views/v1/rules/rule/create.twig
+++ b/resources/views/v1/rules/rule/create.twig
@@ -124,7 +124,7 @@
         </div>
 
         <div class="row">
-            <div class="col-lg-12 col-md-12 col-sm-12">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/v1/rules/rule/edit.twig b/resources/views/v1/rules/rule/edit.twig
index 039697de70..451496da71 100644
--- a/resources/views/v1/rules/rule/edit.twig
+++ b/resources/views/v1/rules/rule/edit.twig
@@ -106,7 +106,7 @@
     </div>
 
     <div class="row">
-        <div class="col-lg-12 col-md-12 col-sm-12">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
@@ -123,7 +123,7 @@
         </div>
 
     </div>
-    {{ Form.close|raw }}
+    </form>
 
 
 {% endblock %}
diff --git a/resources/views/v1/tags/create.twig b/resources/views/v1/tags/create.twig
index e53abf4d9f..30f5a4ce51 100644
--- a/resources/views/v1/tags/create.twig
+++ b/resources/views/v1/tags/create.twig
@@ -36,7 +36,10 @@
                         {{ ExpandedForm.location('location', null, {locations: locations}) }}
                     </div>
                 </div>
-
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 {# panel for options #}
                 <div class="box">
                     <div class="box-header with-border">
diff --git a/resources/views/v1/tags/edit.twig b/resources/views/v1/tags/edit.twig
index 1c7a6b1819..e69ddfc3bd 100644
--- a/resources/views/v1/tags/edit.twig
+++ b/resources/views/v1/tags/edit.twig
@@ -39,7 +39,10 @@
                     {{ ExpandedForm.location('location', null, {locations: locations}) }}
                 </div>
             </div>
-
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
             {# panel for options #}
             <div class="box">
                 <div class="box-header with-border">
@@ -58,7 +61,7 @@
         </div>
     </div>
 
-    {{ Form.close|raw }}
+    </form>
 
 {% endblock %}
 {% block scripts %}