diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html
index 129673ef..806d19ff 100644
--- a/compensation/templates/compensation/detail/compensation/includes/actions.html
+++ b/compensation/templates/compensation/detail/compensation/includes/actions.html
@@ -21,16 +21,13 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
@@ -39,7 +36,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -47,23 +46,26 @@
             <tbody>
             {% for action in actions %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
+                <td class="">
+                    <span>{{ action.action_type }}</span>
+                    {% if action.action_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Action type details' %}:</span>
+                        {% for detail in action.action_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
                     <div class="scroll-150">
                         {{ action.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td class="">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
index dcf3894a..da4e21d6 100644
--- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -35,7 +35,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -54,7 +56,7 @@
                 </td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/documents.html b/compensation/templates/compensation/detail/compensation/includes/documents.html
index 108db76c..0615d4be 100644
--- a/compensation/templates/compensation/detail/compensation/includes/documents.html
+++ b/compensation/templates/compensation/detail/compensation/includes/documents.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -32,7 +32,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -52,7 +54,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html
index 408689a7..026d0a51 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-after.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html
index 991f6c23..b9eeb341 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-before.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-before.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html
index b4701744..2acd2594 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/actions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@@ -20,16 +20,13 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
@@ -38,7 +35,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -46,23 +45,26 @@
             <tbody>
             {% for action in actions %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
+                <td class="">
+                    <span>{{ action.action_type }}</span>
+                    {% if action.action_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Action type details' %}:</span>
+                        {% for detail in action.action_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
                     <div class="scroll-150">
                         {{ action.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td class="">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
index b57c4ad0..ff8a5291 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -34,7 +34,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -52,7 +54,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deductions.html b/compensation/templates/compensation/detail/eco_account/includes/deductions.html
index ca97f005..e72ab2ab 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deductions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deductions.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -37,7 +37,9 @@
                     {% trans 'Created' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -60,7 +62,7 @@
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html
index 3c8d89aa..b3895eac 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/documents.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -31,7 +31,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -50,7 +52,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
index 17e7d44a..0cec0144 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
index 3a1136ca..8c4a094a 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
@@ -20,27 +20,26 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 {% if is_default_member and has_access %}
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
                 {% endif %}
             </tr>
@@ -48,20 +47,21 @@
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html
index 7425e3c3..d5852197 100644
--- a/ema/templates/ema/detail/includes/actions.html
+++ b/ema/templates/ema/detail/includes/actions.html
@@ -20,16 +20,13 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
                 <th class="w-25" scope="col">
                     {% trans 'Action type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Action type details' %}
-                </th>
                 <th scope="col">
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
@@ -37,30 +34,35 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for action in obj.actions.all %}
             <tr>
-                <td class="align-middle">
-                    {{ action.action_type }}
+                <td class="">
+                    <span>{{ action.action_type }}</span>
+                    {% if action.action_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Action type details' %}:</span>
+                        {% for detail in action.action_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for detail in action.action_type_details.all %}
-                        <div class="mb-2" title="{{detail}}">{{detail.long_name}}</div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">
+                <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="">
                     <div class="scroll-150">
                         {{ action.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td class="">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
+                    <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/deadlines.html b/ema/templates/ema/detail/includes/deadlines.html
index 83ba4067..02efaf8b 100644
--- a/ema/templates/ema/detail/includes/deadlines.html
+++ b/ema/templates/ema/detail/includes/deadlines.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -34,7 +34,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -52,7 +54,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/documents.html b/ema/templates/ema/detail/includes/documents.html
index 3218917c..dbc8927b 100644
--- a/ema/templates/ema/detail/includes/documents.html
+++ b/ema/templates/ema/detail/includes/documents.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -31,7 +31,9 @@
                     {% trans 'Comment' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
@@ -50,7 +52,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/states-after.html b/ema/templates/ema/detail/includes/states-after.html
index db9e75b9..05876405 100644
--- a/ema/templates/ema/detail/includes/states-after.html
+++ b/ema/templates/ema/detail/includes/states-after.html
@@ -20,46 +20,46 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states > sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states > sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for state in after_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/ema/templates/ema/detail/includes/states-before.html b/ema/templates/ema/detail/includes/states-before.html
index a4da5538..1d142cef 100644
--- a/ema/templates/ema/detail/includes/states-before.html
+++ b/ema/templates/ema/detail/includes/states-before.html
@@ -20,46 +20,46 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
-        {% if sum_before_states < sum_after_states %}
-            <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
-            </div>
-        {% endif %}
+    {% if sum_before_states < sum_after_states %}
+    <div class="alert alert-danger mb-0">
+        {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+    </div>
+    {% endif %}
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th class="w-25" scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
-                <th class="w-25" scope="col">
-                    {% trans 'Biotope additional type' %}
-                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Action' %}
+                    <span class="float-right">
+                        {% trans 'Action' %}
+                    </span>
                 </th>
             </tr>
             </thead>
             <tbody>
             {% for state in before_states %}
             <tr>
-                <td class="align-middle">
-                    {{ state.biotope_type }}
+                <td>
+                    <span>{{ state.biotope_type }}</span>
+                    {% if state.biotope_type_details.count > 0 %}
+                        <hr>
+                        <span>{% trans 'Biotope additional type' %}:</span>
+                        {% for detail in state.biotope_type_details.all %}
+                            <br>
+                            <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
+                        {% endfor %}
+                    {% endif %}
                 </td>
-                <td class="align-middle">
-                    {% for biotope_extra in state.biotope_type_details.all %}
-                    <div class="mb-2" title="{{ biotope_extra }}">
-                        {{ biotope_extra.long_name }}
-                    </div>
-                    {% endfor %}
-                </td>
-                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td class="align-middle">
+                <td>{{ state.surface|floatformat:2 }} m²</td>
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                    <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/compensations.html b/intervention/templates/intervention/detail/includes/compensations.html
index 79fcaa09..442d5d83 100644
--- a/intervention/templates/intervention/detail/includes/compensations.html
+++ b/intervention/templates/intervention/detail/includes/compensations.html
@@ -22,11 +22,11 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Identifier' %}
                 </th>
                 <th scope="col">
@@ -34,7 +34,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -50,7 +52,7 @@
                 <td class="align-middle">{{ comp.title }}</td>
                 <td>
                 {% if is_default_member and has_access %}
-                    <button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove compensation' %}">
+                    <button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove compensation' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                 {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/deductions.html b/intervention/templates/intervention/detail/includes/deductions.html
index 3e320a1b..bc169082 100644
--- a/intervention/templates/intervention/detail/includes/deductions.html
+++ b/intervention/templates/intervention/detail/includes/deductions.html
@@ -20,11 +20,11 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Account Identifier' %}
                 </th>
                 <th scope="col">
@@ -35,7 +35,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -55,7 +57,7 @@
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}">
+                    <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html
index b8e8ab39..f536f154 100644
--- a/intervention/templates/intervention/detail/includes/documents.html
+++ b/intervention/templates/intervention/detail/includes/documents.html
@@ -20,19 +20,21 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
                 <th scope="col">
                     {% trans 'Title' %}
                 </th>
-                <th scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -40,19 +42,19 @@
             <tbody>
             {% for doc in obj.documents.all %}
             <tr>
-                <td class="align-middle">
+                <td>
                     <a href="{% url 'intervention:get-doc' doc.id %}">
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">
+                <td>
                     <div class="scroll-150">
                         {{ doc.comment }}
                     </div>
                 </td>
-                <td class="align-middle">
+                <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                    <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html
index 641f2c2f..53a17f8f 100644
--- a/intervention/templates/intervention/detail/includes/payments.html
+++ b/intervention/templates/intervention/detail/includes/payments.html
@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -30,12 +30,14 @@
                 <th scope="col">
                     {% trans 'Due on' %}
                 </th>
-                <th scope="col">
+                <th class="w-50" scope="col">
                     {% trans 'Comment' %}
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -54,7 +56,7 @@
                 </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
+                    <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove payment' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html
index 66e89261..9fb2989d 100644
--- a/intervention/templates/intervention/detail/includes/revocation.html
+++ b/intervention/templates/intervention/detail/includes/revocation.html
@@ -23,7 +23,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300">
+    <div class="card-body scroll-300 p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -38,7 +38,9 @@
                 </th>
                 {% if is_default_member and has_access %}
                     <th scope="col">
-                        {% trans 'Action' %}
+                        <span class="float-right">
+                            {% trans 'Action' %}
+                        </span>
                     </th>
                 {% endif %}
             </tr>
@@ -63,7 +65,7 @@
                     </td>
                     <td class="align-middle">
                         {% if is_default_member and has_access  %}
-                        <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
+                        <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove revocation' %}">
                             {% fa5_icon 'trash' %}
                         </button>
                         {% endif %}
diff --git a/templates/base.html b/templates/base.html
index ccbd8f9f..d0656ee3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -23,15 +23,14 @@
             {% include 'navbars/navbar.html' %}
         {% endblock %}
     </header>
-    <div class="container-fluid mt-3">
-        <div class="">
+    <div class="col">
         {% for message in messages %}
-            <div class="row alert alert-{{ message.tags }}">
-                {{ message }}
-            </div>
-        {% endfor %}
+        <div class="row alert alert-{{ message.tags }}">
+            {{ message }}
         </div>
-
+        {% endfor %}
+    </div>
+    <div class="container-fluid mt-3">
         {% comment %}
             The modal wrapper, which can be used on every view can stay on the base.html template
         {% endcomment %}