diff --git a/templates/AdminPages/EntityAdminBase.html.twig b/templates/AdminPages/EntityAdminBase.html.twig
index 28511c28..f18ad960 100644
--- a/templates/AdminPages/EntityAdminBase.html.twig
+++ b/templates/AdminPages/EntityAdminBase.html.twig
@@ -105,7 +105,7 @@
                             <form class="form-horizontal" data-no-ajax method="post" action="{{ path('attachment_type_export', {'id': entity.id}) }}">
 
                                 <div class="form-row">
-                                    <label class="col-form-label col-md-2">{% trans %}export.format{% endtrans %}</label>
+                                    <label class="col-form-label col-md-3">{% trans %}export.format{% endtrans %}</label>
                                     <div class="col">
                                         <select class="form-control" name="format">
                                             <option value="json">JSON</option>
@@ -117,7 +117,7 @@
                                 </div>
 
                                 <div class="form-row mt-2">
-                                    <label class="col-form-label col-md-2">{% trans %}export.level{% endtrans %}</label>
+                                    <label class="col-form-label col-md-3">{% trans %}export.level{% endtrans %}</label>
                                     <div class="col">
                                         <select class="form-control" name="level">
                                             <option value="simple">{% trans %}export.level.simple{% endtrans %}</option>
@@ -128,7 +128,7 @@
                                 </div>
 
                                 <div class="form-row mt-2">
-                                    <div class="offset-2 col">
+                                    <div class="offset-3 col">
                                         <div class="custom-control custom-checkbox">
                                             <input class="form-check-input custom-control-input" name="include_children" id="include_children" type="checkbox" checked>
                                             <label class="form-check-label custom-control-label" for="include_children">
@@ -139,7 +139,7 @@
                                 </div>
 
                                 <div class="form-row mt-2">
-                                    <div class="offset-2 col">
+                                    <div class="offset-3 col">
                                         <button type="submit" class="btn btn-primary">{% trans %}export.btn{% endtrans %}</button>
                                     </div>
                                 </div>
@@ -158,7 +158,7 @@
                             <form class="form-horizontal" data-no-ajax method="post" action="{{ path('attachment_type_export_all') }}">
 
                                 <div class="form-row">
-                                    <label class="col-form-label col-md-2">{% trans %}export.format{% endtrans %}</label>
+                                    <label class="col-form-label col-md-3">{% trans %}export.format{% endtrans %}</label>
                                     <div class="col">
                                         <select class="form-control" name="format">
                                             <option value="json">JSON</option>
@@ -170,7 +170,7 @@
                                 </div>
 
                                 <div class="form-row mt-2">
-                                    <label class="col-form-label col-md-2">{% trans %}export.level{% endtrans %}</label>
+                                    <label class="col-form-label col-md-3">{% trans %}export.level{% endtrans %}</label>
                                     <div class="col">
                                         <select class="form-control" name="level">
                                             <option value="simple">{% trans %}export.level.simple{% endtrans %}</option>
@@ -181,7 +181,7 @@
                                 </div>
 
                                 <div class="form-row mt-2">
-                                    <div class="offset-2 col">
+                                    <div class="offset-3 col">
                                         <div class="custom-control custom-checkbox">
                                             <input class="form-check-input custom-control-input" name="include_children" id="include_children" type="checkbox" checked>
                                             <label class="form-check-label custom-control-label" for="include_children">
@@ -192,7 +192,7 @@
                                 </div>
 
                                 <div class="form-row mt-2">
-                                    <div class="offset-2 col">
+                                    <div class="offset-3 col">
                                         <button type="submit" class="btn btn-primary">{% trans %}export.btn{% endtrans %}</button>
                                     </div>
                                 </div>
diff --git a/templates/AdminPages/_delete_form.html.twig b/templates/AdminPages/_delete_form.html.twig
index 06210087..651fd8db 100644
--- a/templates/AdminPages/_delete_form.html.twig
+++ b/templates/AdminPages/_delete_form.html.twig
@@ -5,7 +5,7 @@
     <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ entity.id) }}">
     <div class="form-group">
         <div class=""></div>
-        <div class="col-3 offset-2 pl-1">
+        <div class="col offset-3 pl-2">
             <button class="btn btn-danger">{% trans %}entity.delete{% endtrans %}</button>
         </div>
     </div>
diff --git a/templates/Form/extendedBootstrap4_layout.html.twig b/templates/Form/extendedBootstrap4_layout.html.twig
index c0ac0ac5..5544033a 100644
--- a/templates/Form/extendedBootstrap4_layout.html.twig
+++ b/templates/Form/extendedBootstrap4_layout.html.twig
@@ -10,6 +10,14 @@
     {{ parent() }}
 {% endblock %}
 
+{% block form_label_class -%}
+    col-3
+{%- endblock form_label_class %}
+
+{% block form_group_class -%}
+    col-9
+{%- endblock form_group_class %}
+
 {#
 {% block checkbox_widget -%}
      {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}