diff --git a/db/nursingHome.db b/db/nursingHome.db
index 0cdc030..402e5b3 100644
Binary files a/db/nursingHome.db and b/db/nursingHome.db differ
diff --git a/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java b/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java
index 0f1d932..e722b3e 100644
--- a/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java
+++ b/src/main/java/de/hitec/nhplus/nurse/LockedNurseController.java
@@ -109,7 +109,6 @@ public class LockedNurseController {
         readAllAndShowInTableView();
 
     }
-
     @FXML
     public void handleMouseClick() {
         Nurse nurse = tableView.getSelectionModel().getSelectedItem();
@@ -137,5 +136,4 @@ public class LockedNurseController {
         }
         readAllAndShowInTableView();
     }
-
 }
diff --git a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
index 055c4be..4d97ff0 100644
--- a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
@@ -322,6 +322,13 @@ public class AllTreatmentController {
         }catch (SQLException exception){
             exception.printStackTrace();
         }
+        if (selectedItem.calculateDeleteDate().isBefore(LocalDate.now())){
+            try {
+                dao.delete(selectedItem.getId());
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }
         readAllAndShowInTableView();
     }
 
diff --git a/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml b/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml
index fdb8bef..6a81c28 100644
--- a/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml
+++ b/src/main/resources/de/hitec/nhplus/main/MainWindowView.fxml
@@ -7,6 +7,8 @@
         tabClosingPolicy="UNAVAILABLE"
         xmlns="http://javafx.com/javafx/17.0.2-ea"
         xmlns:fx="http://javafx.com/fxml/1"
+        minWidth="1200"
+        minHeight="700"
         fx:controller="de.hitec.nhplus.main.MainWindowController"
 >
     <Tab fx:id="patientTab" text="Patienten">
diff --git a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
index 10b589a..27c9cea 100644
--- a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
+++ b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
@@ -17,6 +17,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
diff --git a/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml b/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
index b7c1ed3..c3b8d96 100644
--- a/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
+++ b/src/main/resources/de/hitec/nhplus/nurse/LockedNurseView.fxml
@@ -21,6 +21,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
diff --git a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
index 50941c6..4ad6c9e 100644
--- a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
+++ b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
@@ -20,6 +20,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
diff --git a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
index 4ccbfec..31d1d9e 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
@@ -21,38 +21,45 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn
                         fx:id="columnPatientName"
                         minWidth="80.0"
+                        prefWidth="150"
                         text="Patient"
                 />
                 <TableColumn
                         fx:id="columnNurseName"
                         minWidth="80.0"
+                        prefWidth="150"
                         text="Pflegekraft"
                 />
                 <TableColumn
                         fx:id="columnDate"
-                        maxWidth="-1.0"
-                        minWidth="140.0"
-                        prefWidth="150.0"
+                        minWidth="60.0"
+                        maxWidth="100"
+                        prefWidth="90.0"
                         text="Datum"
                 />
                 <TableColumn
                         fx:id="columnBegin"
-                        minWidth="140.0"
+                        minWidth="60.0"
+                        maxWidth="100"
+                        prefWidth="60"
                         text="Beginn"
                 />
                 <TableColumn
                         fx:id="columnEnd"
-                        minWidth="140.0"
+                        minWidth="60.0"
+                        maxWidth="100"
+                        prefWidth="60"
                         text="Ende"
                 />
                 <TableColumn
                         fx:id="columnDescription"
-                        minWidth="200.0"
+                        minWidth="80.0"
                         text="Kurzbeschreibung"
                 />
             </columns>
diff --git a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
index 2680436..1e943d5 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/LockedTreatmentView.fxml
@@ -21,7 +21,7 @@
                 <TableColumn
                         fx:id="columnId"
                         minWidth="40.0"
-                        prefWidth="102.0"
+                        maxWidth="40.0"
                         text="ID"
                 />
                 <TableColumn