diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 4ab04a2ae..0f9416bdc 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -146,14 +146,7 @@
                       </select>
                   </div>
 
-                    <div class="col-sm-12 col-md-2">
-                        <label class="form-label" for="filter_borderpoint">Übergabepunkt</label>
-                        <select name="filter[borderpoint]" id="filter_borderpoint" class="form-control">
-                            <option value="all" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "all") ? "selected='selected'" : ""?>>Alle</option>
-                            <option value="with" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "with") ? "selected='selected'" : ""?>>Mit</option>
-                            <option value="without" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "without") ? "selected='selected'" : ""?>>Ohne</option>
-                        </select>
-                    </div>
+
 
                   <div class="col-sm-12 col-md-2">
                       <label class="form-label" for="partner_id">Partner</label>
@@ -169,17 +162,6 @@
                           <?php endforeach; ?>
                       </select>
                   </div>
-
-                  <div class="col-sm-12 col-md-2">
-                      <label class="form-label" for="connection_type">Anschlusstyp</label>
-                      <select name="filter[connection_type][]" id="connection_type_id" class="form-control" multiple="multiple">
-                          <?php
-                          $connection_types = ["single-dwelling","multi-dwelling","apartment-building","apartment","business"];
-                          foreach($connection_types as $connection_type): ?>
-                              <option value="<?=$connection_type?>" <?=(isset($filter) && array_key_exists("connection_type", $filter) && in_array($connection_type, $filter["connection_type"])) ? "selected='selected'" : ""?>><?=__($connection_type, "preorder")?></option>
-                            <?php endforeach; ?>
-                      </select>
-                  </div>
                 
                 <div class="col-sm-12 col-md-2">
                   <label class="form-label" for="filter_status">Status</label>
@@ -189,6 +171,17 @@
                     <?php endforeach; ?>
                   </select>
                 </div>
+
+                  <div class="col-sm-12 col-md-2">
+                      <label class="form-label" for="connection_type">Anschlusstyp</label>
+                      <select name="filter[connection_type][]" id="connection_type_id" class="form-control" multiple="multiple">
+                          <?php
+                          $connection_types = ["single-dwelling","multi-dwelling","apartment-building","apartment","business"];
+                          foreach($connection_types as $connection_type): ?>
+                              <option value="<?=$connection_type?>" <?=(isset($filter) && array_key_exists("connection_type", $filter) && in_array($connection_type, $filter["connection_type"])) ? "selected='selected'" : ""?>><?=__($connection_type, "preorder")?></option>
+                          <?php endforeach; ?>
+                      </select>
+                  </div>
                 
                 <div class="col-sm-12 col-md-2">
                   <label class="form-label" for="filter_type">Bestelltyp</label>
@@ -218,6 +211,11 @@
                   <label class="form-label" for="filter_oaid">OAID</label>
                   <input type="text" class="form-control" name="filter[oaid]" id="filter_oaid" value="<?=$filter['oaid'] ?? ""?>" />
                 </div>
+
+                  <div class="col-sm-12 col-md-2">
+                      <label class="form-label" for="filter_workorder_name">Rimo Workorder Name</label>
+                      <input type="text" class="form-control" name="filter[rimo_workorder_name]" id="filter_workorder_name" value="<?=$filter['workorder_name'] ?? ""?>" />
+                  </div>
                 
                 <div class="col-sm-12 col-md-2">
                   <label class="form-label" for="filter_address">Anschlussadresse</label>
@@ -245,15 +243,33 @@
                     <option value="no" <?=(isset($filter) && array_key_exists("unit_missing", $filter) && $filter['unit_missing'] == "no") ? "selected='selected'" : ""?>>Wohneinheit vorhanden</option>
                   </select>
                 </div>
+
+                  <div class="col-sm-12 col-md-2">
+                      <label class="form-label" for="rimo_home_extref">Wohneinheit Rimo-Extref</label>
+                      <select name="filter[rimo_home_extref]" id="filter_rimo_home_extref" class="form-control">
+                          <option value=""></option>
+                          <option value="0" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && strlen($filter['rimo_home_extref']) && intval($filter['rimo_home_extref']) === 0) ? "selected='selected'" : ""?>>Fehlt</option>
+                          <option value="1" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && intval($filter['rimo_home_extref']) === 1) ? "selected='selected'" : ""?>>Vorhanden</option>
+                      </select>
+                  </div>
                 
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_connection_count">Anzahl Anschlüsse</label>
+                <div class="col-sm-12 col-md-1">
+                  <label class="form-label" for="filter_connection_count">Anz. Anschlüsse</label>
                   <select name="filter[connection_count]" id="filter_connection_count" class="form-control">
                     <option value=""></option>
                     <option value="1" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 1) ? "selected='selected'" : ""?>>1</option>
                     <option value="2" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 2) ? "selected='selected'" : ""?>> &gt; 1</option>
                   </select>
                 </div>
+
+                  <div class="col-sm-12 col-md-1">
+                      <label class="form-label" for="filter_borderpoint">Übergabepunkt</label>
+                      <select name="filter[borderpoint]" id="filter_borderpoint" class="form-control">
+                          <option value="all" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "all") ? "selected='selected'" : ""?>>Alle</option>
+                          <option value="with" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "with") ? "selected='selected'" : ""?>>Mit</option>
+                          <option value="without" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "without") ? "selected='selected'" : ""?>>Ohne</option>
+                      </select>
+                  </div>
                 
                 <div class="col-sm-12 col-md-1">
                   <label class="form-label" for="filter_rimo_workorder">Rimo Workorder</label>
@@ -277,11 +293,6 @@
                   </select>
                 </div>
                 
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_workorder_name">Rimo Workorder Name</label>
-                  <input type="text" class="form-control" name="filter[rimo_workorder_name]" id="filter_workorder_name" value="<?=$filter['workorder_name'] ?? ""?>" />
-                </div>
-                
                 <div class="col-sm-12 col-md-2">
                   <label class="form-label" for="filter_rimo_workorder_team_id">Rimo Workorder Assigned Team</label>
                     <select name="filter[rimo_workorder_team_id]" id="filter_rimo_workorder_team_id" class="form-control">
@@ -292,15 +303,6 @@
                     </select>
                 </div>
                 
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="rimo_home_extref">Wohneinheit Rimo-Extref</label>
-                  <select name="filter[rimo_home_extref]" id="filter_rimo_home_extref" class="form-control">
-                    <option value=""></option>
-                    <option value="0" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && strlen($filter['rimo_home_extref']) && intval($filter['rimo_home_extref']) === 0) ? "selected='selected'" : ""?>>Fehlt</option>
-                    <option value="1" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && intval($filter['rimo_home_extref']) === 1) ? "selected='selected'" : ""?>>Vorhanden</option>
-                  </select>
-                </div>
-                
               </div>
               
               <div class="row mt-2">