diff --git a/VERSION b/VERSION
index 860487ca..24ba9a38 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.1
+2.7.0
diff --git a/assets/controllers/elements/datatables/datatables_controller.js b/assets/controllers/elements/datatables/datatables_controller.js
index 9ac23483..5a50623d 100644
--- a/assets/controllers/elements/datatables/datatables_controller.js
+++ b/assets/controllers/elements/datatables/datatables_controller.js
@@ -108,19 +108,11 @@ export default class extends Controller {
             const raw_order = saved_state.order;
 
             settings.initial_order = raw_order.map((order) => {
-                //Skip if direction is empty, as this is the default, otherwise datatables server is confused when the order is sent in the request, but the initial order is set to an empty direction
-                if (order[1] === '') {
-                    return null;
-                }
-
                 return {
                     column: order[0],
                     dir: order[1]
                 }
             });
-
-            //Remove null values from the initial_order array
-            settings.initial_order = settings.initial_order.filter(order => order !== null);
         }
 
         let options = {
diff --git a/src/Form/Part/PartLotType.php b/src/Form/Part/PartLotType.php
index fc330bb1..ae86fb61 100644
--- a/src/Form/Part/PartLotType.php
+++ b/src/Form/Part/PartLotType.php
@@ -117,6 +117,7 @@ class PartLotType extends AbstractType
             'widget' => 'single_text',
             'disabled' => !$this->security->isGranted('@parts_stock.stocktake'),
             'required' => false,
+            'empty_data' => null,
         ]);
     }
 
diff --git a/templates/parts/info/_part_lots.html.twig b/templates/parts/info/_part_lots.html.twig
index 70e5dc4e..cfb7190b 100644
--- a/templates/parts/info/_part_lots.html.twig
+++ b/templates/parts/info/_part_lots.html.twig
@@ -41,37 +41,35 @@
                         {{ lot.amount | format_amount(part.partUnit, {'decimals': 5}) }}
                     {% endif %}
                 </td>
-                <td >
-                    <div class="d-flex flex-column align-items-start">
-                        {% if lot.owner  %}
-                            <span class="badge text-bg-light mb-1" title="{% trans %}part_lot.owner{% endtrans %}">
+                <td class="d-flex flex-column align-items-start">
+                    {% if lot.owner  %}
+                        <span class="badge text-bg-light mb-1" title="{% trans %}part_lot.owner{% endtrans %}">
                                 {{ helper.user_icon_link(lot.owner) }}
                             </span>
-                        {% endif %}
-                        {% if lot.expirationDate %}
-                            <span class="badge text-bg-info mb-1" title="{% trans %}part_lots.expiration_date{% endtrans %}">
+                    {% endif %}
+                    {% if lot.expirationDate %}
+                        <span class="badge text-bg-info mb-1" title="{% trans %}part_lots.expiration_date{% endtrans %}">
                             <i class="fas fa-calendar-alt fa-fw"></i> {{ lot.expirationDate | format_date() }}<br>
                         </span>
-                        {% endif %}
-                        {% if lot.expired %}
-                            <span class="badge text-bg-warning mb-1">
+                    {% endif %}
+                    {% if lot.expired %}
+                        <span class="badge text-bg-warning mb-1">
                             <i class="fas fa-exclamation-circle fa-fw"></i>
                             {% trans %}part_lots.is_expired{% endtrans %}
                         </span>
-                        {% endif %}
-                        {% if lot.needsRefill %}
-                            <span class="badge text-bg-warning mb-1">
+                    {% endif %}
+                    {% if lot.needsRefill %}
+                        <span class="badge text-bg-warning mb-1">
                                 <i class="fas fa-dolly fa-fw"></i>
                                 {% trans %}part_lots.need_refill{% endtrans %}
                             </span>
-                        {% endif %}
-                        {% if lot.lastStocktakeAt %}
-                            <span class="badge text-bg-secondary" title="{% trans %}part_lot.edit.last_stocktake_at{% endtrans %}">
+                    {% endif %}
+                    {% if lot.lastStocktakeAt %}
+                        <span class="badge text-bg-secondary" title="{% trans %}part_lot.edit.last_stocktake_at{% endtrans %}">
                                 <i class="fas fa-clipboard-check fa-fw"></i>
                                 {{ lot.lastStocktakeAt | format_datetime("short") }}
                             </span>
-                        {% endif %}
-                    </div>
+                    {% endif %}
                 </td>
                 <td>
                     <div class="btn-group" role="group">
diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf
index a9674614..c20e8152 100644
--- a/translations/messages.de.xlf
+++ b/translations/messages.de.xlf
@@ -11832,7 +11832,7 @@ Buerklin-API-Authentication-Server:
     <unit id="WV10ozS" name="update_manager.latest_release">
       <segment state="translated">
         <source>update_manager.latest_release</source>
-        <target>Neueste Version</target>
+        <target>update_manager.latest_release</target>
       </segment>
     </unit>
     <unit id="pMdT6Ln" name="update_manager.tag">
@@ -12078,25 +12078,25 @@ Buerklin-API-Authentication-Server:
     <unit id="458.UTU" name="update_manager.run_command_to_update">
       <segment state="translated">
         <source>update_manager.run_command_to_update</source>
-        <target>Führen Sie den folgenden Befehl in Ihrem Terminal aus, um auf diese Version zu aktualisieren:</target>
+        <target>update_manager.run_command_to_update</target>
       </segment>
     </unit>
     <unit id="1iYIZ6C" name="update_manager.log_viewer">
       <segment state="translated">
         <source>update_manager.log_viewer</source>
-        <target>Protokollanzeige</target>
+        <target>update_manager.log_viewer</target>
       </segment>
     </unit>
     <unit id="AXavng5" name="update_manager.update_log">
       <segment state="translated">
         <source>update_manager.update_log</source>
-        <target>Update-Protokoll</target>
+        <target>update_manager.update_log</target>
       </segment>
     </unit>
     <unit id=".QzwEpo" name="update_manager.bytes">
       <segment state="translated">
         <source>update_manager.bytes</source>
-        <target>Bytes</target>
+        <target>update_manager.bytes</target>
       </segment>
     </unit>
     <unit id="Gt.91s_" name="perm.system.manage_updates">
@@ -12108,43 +12108,43 @@ Buerklin-API-Authentication-Server:
     <unit id="Mw2sya4" name="update_manager.create_backup">
       <segment state="translated">
         <source>update_manager.create_backup</source>
-        <target>Erstelle vor dem Update ein Backup (empfohlen)</target>
+        <target>update_manager.create_backup</target>
       </segment>
     </unit>
     <unit id="fWGZSZ1" name="update_manager.confirm_update">
       <segment state="translated">
         <source>update_manager.confirm_update</source>
-        <target>Sind Sie sicher, dass Sie Part-DB aktualisieren möchten? Vor dem Update wird ein Backup erstellt.</target>
+        <target>update_manager.confirm_update</target>
       </segment>
     </unit>
     <unit id="Fashdp." name="update_manager.already_up_to_date">
       <segment state="translated">
         <source>update_manager.already_up_to_date</source>
-        <target>Sie verwenden bereits die neueste Version von Part-DB.</target>
+        <target>update_manager.already_up_to_date</target>
       </segment>
     </unit>
     <unit id="JPZ9w0l" name="update_manager.progress.title">
       <segment state="translated">
         <source>update_manager.progress.title</source>
-        <target>Update-Fortschritt</target>
+        <target>update_manager.progress.title</target>
       </segment>
     </unit>
     <unit id="7oAKwee" name="update_manager.progress.updating">
       <segment state="translated">
         <source>update_manager.progress.updating</source>
-        <target>Part-DB wird aktualisiert...</target>
+        <target>update_manager.progress.updating</target>
       </segment>
     </unit>
     <unit id="ffxDMB4" name="update_manager.progress.completed">
       <segment state="translated">
         <source>update_manager.progress.completed</source>
-        <target>Update abgeschlossen!</target>
+        <target>update_manager.progress.completed</target>
       </segment>
     </unit>
     <unit id="ZKFaIiJ" name="update_manager.progress.failed">
       <segment state="translated">
         <source>update_manager.progress.failed</source>
-        <target>Update fehlgeschlagen</target>
+        <target>update_manager.progress.failed</target>
       </segment>
     </unit>
     <unit id="bSdCWOK" name="update_manager.progress.initializing">