diff --git a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
index 95e23c9..592e739 100644
--- a/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
+++ b/src/main/resources/de/hitec/nhplus/nurse/AllNurseView.fxml
@@ -3,42 +3,86 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.Font?>
-<BorderPane prefHeight="500.0" prefWidth="855.0" xmlns="http://javafx.com/javafx/10.0.2-internal"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hitec.nhplus.nurse.AllNurseController">
-    <children>
+<BorderPane
+        xmlns="http://javafx.com/javafx/11.0.1"
+        xmlns:fx="http://javafx.com/fxml/1"
+        fx:controller="de.hitec.nhplus.nurse.AllNurseController"
+>
+    <padding>
+        <Insets top="8" left="8" right="8" bottom="8"/>
+    </padding>
+    <center>
         <TableView fx:id="tableView" editable="true" layoutX="31.0" layoutY="40.0">
             <columns>
-                <TableColumn fx:id="columnId" maxWidth="1200.0" minWidth="5.0" prefWidth="5.0" text="ID"/>
-                <TableColumn fx:id="columnSurname" maxWidth="7500.0" minWidth="20.0" prefWidth="100.0" text="Nachname"/>
-                <TableColumn fx:id="columnFirstName" maxWidth="7500.0" prefWidth="75.0" text="Vorname"/>
-                <TableColumn fx:id="columnPhoneNumber" maxWidth="7500.0" prefWidth="75.0" text="Telefonnummer"/>
+                <TableColumn
+                        fx:id="columnId"
+                        minWidth="40.0"
+                        text="ID"
+                />
+                <TableColumn
+                        fx:id="columnSurname"
+                        minWidth="140.0"
+                        text="Nachname"
+                />
+                <TableColumn
+                        fx:id="columnFirstName"
+                        minWidth="140.0"
+                        text="Vorname"
+                />
+                <TableColumn
+                        fx:id="columnPhoneNumber"
+                        minWidth="140.0"
+                        text="Telefonnummer"
+                />
             </columns>
             <columnResizePolicy>
                 <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
             </columnResizePolicy>
         </TableView>
-        <HBox layoutX="420.0" layoutY="450.0" spacing="10.0">
-            <children>
-                <TextField fx:id="txfSurname" prefHeight="26.0" prefWidth="220.0" promptText="Nachname"/>
-                <TextField fx:id="txfFirstname" prefHeight="26.0" prefWidth="220.0" promptText="Vorname"/>
-                <TextField fx:id="txfPhoneNumber" prefWidth="160.0" promptText="Telefonnummer"/>
-                <Button fx:id="btnAdd" mnemonicParsing="false" prefWidth="90.0" text="Hinzufügen"/>
-                <Button fx:id="btnDelete" mnemonicParsing="false" prefWidth="90.0" text="Löschen"/>
-            </children>
-        </HBox>
-        <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="10.0" prefWidth="200.0" spacing="25.0">
-            <children>
-                <Label alignment="CENTER" contentDisplay="CENTER" minWidth="400.0" text="Pfleger/innen"
-                       textAlignment="CENTER">
-                    <font>
-                        <Font size="36.0"/>
-                    </font>
-                </Label>
-            </children>
-        </HBox>
-    </children>
-    <padding>
-        <Insets top="10.0"/>
-    </padding>
+    </center>
+    <bottom>
+        <BorderPane>
+            <BorderPane.margin>
+                <Insets top="8.0"/>
+            </BorderPane.margin>
+            <center>
+                <HBox spacing="8.0">
+                    <padding>
+                        <Insets right="8.0"/>
+                    </padding>
+                    <TextField
+                            fx:id="textFieldSurname"
+                            prefWidth="200.0"
+                            promptText="Nachname"
+                    />
+                    <TextField
+                            fx:id="textFieldFirstname"
+                            prefWidth="200.0"
+                            promptText="Vorname"
+                    />
+                    <TextField
+                            fx:id="textFieldPhoneNumber"
+                            prefWidth="200.0"
+                            promptText="Telefonnummer"
+                    />
+                </HBox>
+            </center>
+            <right>
+                <HBox spacing="8.0">
+                    <Button
+                            fx:id="buttonAdd"
+                            mnemonicParsing="false"
+                            prefWidth="90.0"
+                            text="Hinzufügen"
+                    />
+                    <Button
+                            fx:id="buttonDelete"
+                            mnemonicParsing="false"
+                            prefWidth="90.0"
+                            text="Löschen"
+                    />
+                </HBox>
+            </right>
+        </BorderPane>
+    </bottom>
 </BorderPane>
diff --git a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
index e921ec2..9d63e7c 100644
--- a/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
+++ b/src/main/resources/de/hitec/nhplus/patient/AllPatientView.fxml
@@ -78,42 +78,42 @@
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                     </rowConstraints>
+                    <!-- Row 0-->
                     <TextField
-                            fx:id="textFieldFirstName"
-                            minWidth="200.0"
-                            prefHeight="26.0"
+                            GridPane.rowIndex="0"
+                            GridPane.columnIndex="0"
                             prefWidth="200.0"
+                            fx:id="textFieldFirstName"
                             promptText="Vorname"
                     />
                     <TextField
+                            GridPane.rowIndex="0"
+                            GridPane.columnIndex="1"
+                            prefWidth="200.0"
                             fx:id="textFieldSurname"
-                            minWidth="200.0"
-                            prefHeight="26.0"
-                            prefWidth="200.0"
                             promptText="Nachname"
-                            GridPane.columnIndex="1"
                     />
                     <TextField
-                            fx:id="textFieldDateOfBirth"
-                            minWidth="160.0"
-                            prefWidth="160.0"
-                            promptText="Geburtstag"
+                            GridPane.rowIndex="0"
                             GridPane.columnIndex="2"
+                            prefWidth="200.0"
+                            fx:id="textFieldDateOfBirth"
+                            promptText="Geburtstag"
                     />
+                    <!-- Row 1-->
                     <TextField
+                            GridPane.rowIndex="1"
+                            GridPane.columnIndex="0"
+                            prefWidth="200.0"
                             fx:id="textFieldCareLevel"
-                            prefHeight="26.0"
-                            prefWidth="200.0"
                             promptText="Pflegegrad"
-                            GridPane.rowIndex="1"
                     />
                     <TextField
-                            fx:id="textFieldRoomNumber"
-                            prefHeight="26.0"
-                            prefWidth="200.0"
-                            promptText="Raum"
-                            GridPane.columnIndex="1"
                             GridPane.rowIndex="1"
+                            GridPane.columnIndex="1"
+                            prefWidth="200.0"
+                            fx:id="textFieldRoomNumber"
+                            promptText="Raum"
                     />
                 </GridPane>
             </center>
diff --git a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
index cf11aba..cc23c2f 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
@@ -65,9 +65,8 @@
                 <HBox spacing="8.0">
                     <ComboBox
                             fx:id="comboBoxPatientSelection"
-                            minWidth="160.0"
-                            onAction="#handleComboBox"
                             prefWidth="200.0"
+                            onAction="#handleComboBox"
                     />
                     <Button
                             mnemonicParsing="false"