diff --git a/src/main/resources/fall.fxml b/src/main/resources/fall.fxml
index 599fd5d..2292b9f 100644
--- a/src/main/resources/fall.fxml
+++ b/src/main/resources/fall.fxml
@@ -7,119 +7,126 @@
 <?import javafx.scene.layout.*?>
 
 <VBox prefHeight="318.0" prefWidth="606.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-                                                                    <children>
-                                                                        <GridPane vgap="5.0">
-                                                                            <children>
-                                                                                <Label text="Patient:" />
-                                                                                <Label fx:id="fallPatID" text="John Doe (PatID = XXX)" GridPane.columnIndex="1" />
-                                                                                <Label text="Aufnahmedatum:" GridPane.rowIndex="1" />
-                                                                                <HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
-                                                                                    <children>
-                                                                                        <DatePicker fx:id="fallAufnDate" />
-                                                                                        <TextField fx:id="fallAufnTime" prefColumnCount="5" promptText="HH:MM" />
-                                                                                        <Button fx:id="btnFallAufnNow" mnemonicParsing="false" onAction="#clickedFallAufnNow" text="Jetzt" />
-                                                                                    </children>
-                                                               <GridPane.margin>
-                                                                  <Insets />
-                                                               </GridPane.margin>
-                                                                                </HBox>
-                                                                                <Label text="Entlassungsdatum:" GridPane.rowIndex="2" />
-                                                                                <HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
-                                                                                    <children>
-                                                                                        <DatePicker fx:id="fallEntlDate" />
-                                                                                        <TextField fx:id="fallEntlTime" prefColumnCount="5" promptText="HH:MM" />
-                                                                                        <Button fx:id="btnFallEntlNow" mnemonicParsing="false" onAction="#clickedFallEntlNow" text="Jetzt" />
-                                                                                    </children>
-                                                                                </HBox>
-                                                                                <Label text="Versichertennummer:" GridPane.rowIndex="3" />
-                                                                                <Label text="Einweisender Arzt:" GridPane.rowIndex="4" />
-                                                                                <HBox alignment="CENTER_LEFT" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="4">
-                                                                                    <children>
-                                                                                        <TextField fx:id="fallEinweisenderArzt" GridPane.columnIndex="1" GridPane.rowIndex="4" HBox.hgrow="ALWAYS" />
-                                                                                        <CheckBox fx:id="fallSelbsteinweisung" mnemonicParsing="false" text="Selbsteinweisung" />
-                                                                                    </children>
-                                                                                </HBox>
-                                                                                <Label text="Kasse:" GridPane.rowIndex="6" />
-                                                                                <ComboBox fx:id="fallKasse" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-                                                                                <TextField fx:id="fallVersichertennummer" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                                                                                <Label text="Fallart:" GridPane.rowIndex="5" />
-                                                                                <ComboBox fx:id="fallFallart" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-                                                                            </children>
-                                                                            <columnConstraints>
-                                                                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                                            </columnConstraints>
-                                                                            <rowConstraints>
-                                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                            </rowConstraints>
-                                                         <VBox.margin>
-                                                            <Insets bottom="10.0" left="10.0" right="10.0" top="5.0" />
-                                                         </VBox.margin>
-                                                                        </GridPane>
-                                                                        <HBox alignment="TOP_RIGHT" VBox.vgrow="ALWAYS">
-                                                                            <children>
-                                                                                <Button fx:id="btnFallEnableEdit" mnemonicParsing="false" onAction="#clickedFallEnableEdit" text="Bearbeitung aktivieren">
-                                                                                    <HBox.margin>
-                                                                                        <Insets right="5.0" />
-                                                                                    </HBox.margin>
-                                                                                </Button>
-                                                                                <Button fx:id="btnFallCancel" mnemonicParsing="false" onAction="#clickedFallCancel" text="Storno" />
-                                                                                <Button fx:id="btnFallAbort" cancelButton="true" mnemonicParsing="false" onAction="#clickedFallAbort" text="Abbrechen">
-                                                                                    <HBox.margin>
-                                                                                        <Insets left="5.0" right="5.0" />
-                                                                                    </HBox.margin>
-                                                                                </Button>
-                                                                                <Button fx:id="btnFallSave" mnemonicParsing="false" onAction="#clickedFallSave" text="Speichern">
-                                                                                    <HBox.margin>
-                                                                                        <Insets right="10.0" />
-                                                                                    </HBox.margin>
-                                                                                </Button>
-                                                                            </children>
-                                                                        </HBox>
-                                                      <HBox>
-                                                         <children>
-                                                                              <GridPane HBox.hgrow="ALWAYS">
-                                                                                  <children>
-                                                                                      <Label styleClass="ersteller-label" text="Ersteller: " />
-                                                                                      <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1" />
-                                                                                      <Label fx:id="fallCreator" text="Doc Holiday" GridPane.columnIndex="1" />
-                                                                                      <Label fx:id="fallCreateTime" text="12.01.2011 12:50" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                                                                  </children>
-                                                                                  <columnConstraints>
-                                                                                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-                                                                                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-                                                                                  </columnConstraints>
-                                                                                  <rowConstraints>
-                                                                                      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                                                                                      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                                                                                  </rowConstraints>
-                                                                              </GridPane>
-                                                            <GridPane HBox.hgrow="ALWAYS">
-                                                              <columnConstraints>
-                                                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                              </columnConstraints>
-                                                              <rowConstraints>
-                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                              </rowConstraints>
-                                                               <children>
-                                                                                      <Label styleClass="ersteller-label" text="Letzter Bearbeiter" />
-                                                                                      <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="1" />
-                                                                  <Label fx:id="fallEditor" text="Dr. House" GridPane.columnIndex="1" />
-                                                                  <Label fx:id="fallEditTime" text="11.11.2011 11:11" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                                               </children>
-                                                            </GridPane>
-                                                         </children>
-                                                         <VBox.margin>
-                                                            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                                                         </VBox.margin>
-                                                      </HBox>
-                                                                    </children>
-                                                                </VBox>
+    <children>
+        <GridPane vgap="5.0">
+            <children>
+                <Label text="Patient:"/>
+                <Label fx:id="fallPatID" text="John Doe (PatID = XXX)" GridPane.columnIndex="1"/>
+                <Label text="Aufnahmedatum:" GridPane.rowIndex="1"/>
+                <HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                    <children>
+                        <DatePicker fx:id="fallAufnDate"/>
+                        <TextField fx:id="fallAufnTime" prefColumnCount="5" promptText="HH:MM"/>
+                        <Button fx:id="btnFallAufnNow" mnemonicParsing="false" onAction="#clickedFallAufnNow"
+                                text="Jetzt"/>
+                    </children>
+                    <GridPane.margin>
+                        <Insets/>
+                    </GridPane.margin>
+                </HBox>
+                <Label text="Entlassungsdatum:" GridPane.rowIndex="2"/>
+                <HBox prefHeight="100.0" prefWidth="200.0" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
+                    <children>
+                        <DatePicker fx:id="fallEntlDate"/>
+                        <TextField fx:id="fallEntlTime" prefColumnCount="5" promptText="HH:MM"/>
+                        <Button fx:id="btnFallEntlNow" mnemonicParsing="false" onAction="#clickedFallEntlNow"
+                                text="Jetzt"/>
+                    </children>
+                </HBox>
+                <Label text="Versichertennummer:" GridPane.rowIndex="3"/>
+                <Label text="Einweisender Arzt:" GridPane.rowIndex="4"/>
+                <HBox alignment="CENTER_LEFT" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="4">
+                    <children>
+                        <TextField fx:id="fallEinweisenderArzt" GridPane.columnIndex="1" GridPane.rowIndex="4"
+                                   HBox.hgrow="ALWAYS"/>
+                        <CheckBox fx:id="fallSelbsteinweisung" mnemonicParsing="false" text="Selbsteinweisung"/>
+                    </children>
+                </HBox>
+                <Label text="Kasse:" GridPane.rowIndex="6"/>
+                <ComboBox fx:id="fallKasse" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+                <TextField fx:id="fallVersichertennummer" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+                <Label text="Fallart:" GridPane.rowIndex="5"/>
+                <ComboBox fx:id="fallFallart" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="5"/>
+            </children>
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+            </rowConstraints>
+            <VBox.margin>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="5.0"/>
+            </VBox.margin>
+        </GridPane>
+        <HBox alignment="TOP_RIGHT" VBox.vgrow="ALWAYS">
+            <children>
+                <Button fx:id="btnFallEnableEdit" mnemonicParsing="false" onAction="#clickedFallEnableEdit"
+                        text="Bearbeitung aktivieren">
+                    <HBox.margin>
+                        <Insets right="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="btnFallCancel" mnemonicParsing="false" onAction="#clickedFallCancel" text="Storno"/>
+                <Button fx:id="btnFallAbort" cancelButton="true" mnemonicParsing="false" onAction="#clickedFallAbort"
+                        text="Abbrechen">
+                    <HBox.margin>
+                        <Insets left="5.0" right="5.0"/>
+                    </HBox.margin>
+                </Button>
+                <Button fx:id="btnFallSave" mnemonicParsing="false" onAction="#clickedFallSave" text="Speichern">
+                    <HBox.margin>
+                        <Insets right="10.0"/>
+                    </HBox.margin>
+                </Button>
+            </children>
+        </HBox>
+        <HBox>
+            <children>
+                <GridPane HBox.hgrow="ALWAYS">
+                    <children>
+                        <Label styleClass="ersteller-label" text="Ersteller: "/>
+                        <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1"/>
+                        <Label fx:id="fallCreator" text="Doc Holiday" GridPane.columnIndex="1"/>
+                        <Label fx:id="fallCreateTime" text="12.01.2011 12:50" GridPane.columnIndex="1"
+                               GridPane.rowIndex="1"/>
+                    </children>
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                </GridPane>
+                <GridPane HBox.hgrow="ALWAYS">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                    <children>
+                        <Label styleClass="ersteller-label" text="Letzter Bearbeiter"/>
+                        <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="1"/>
+                        <Label fx:id="fallEditor" text="Dr. House" GridPane.columnIndex="1"/>
+                        <Label fx:id="fallEditTime" text="11.11.2011 11:11" GridPane.columnIndex="1"
+                               GridPane.rowIndex="1"/>
+                    </children>
+                </GridPane>
+            </children>
+            <VBox.margin>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+            </VBox.margin>
+        </HBox>
+    </children>
+</VBox>
diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml
index 3336d01..fa9c4a6 100644
--- a/src/main/resources/main.fxml
+++ b/src/main/resources/main.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="784.0" prefWidth="1242.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="784.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <TabPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" side="LEFT" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
             <tabs>
@@ -16,81 +16,7 @@
                             <children>
                                 <SplitPane dividerPositions="0.5" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" orientation="VERTICAL" VBox.vgrow="ALWAYS">
                                     <items>
-                                        <TabPane>
-                                            <tabs>
-                                                <Tab closable="false" text="Patientenübersicht">
-                                                    <content>
-                                                        <VBox prefHeight="200.0" prefWidth="100.0">
-                                                            <children>
-                                                                <ToolBar prefHeight="40.0" prefWidth="200.0">
-                                                                    <items>
-                                                                        <Button fx:id="btnPatCreate" text="Neuen _Patient erstellen" />
-                                                                        <Button fx:id="btnPatEdit" text="Patient _bearbeiten" />
-                                                                    </items>
-                                                                </ToolBar>
-                                                                <TableView editable="true" tableMenuButtonVisible="true">
-                                                                    <columns>
-                                                                        <TableColumn editable="false" prefWidth="75.0" sortable="false" text="PatID" />
-                                                                        <TableColumn prefWidth="75.0" text="Name">
-                                                                            <columns>
-                                                                                <TableColumn prefWidth="75.0" text="Geburtsname" />
-                                                                                <TableColumn prefWidth="75.0" text="Nachname" />
-                                                                                <TableColumn prefWidth="75.0" text="Vorname" />
-                                                                            </columns>
-                                                                        </TableColumn>
-                                                                        <TableColumn prefWidth="75.0" text="GebDatum" />
-                                                                        <TableColumn prefWidth="75.0" text="Adresse">
-                                                                            <columns>
-                                                                                <TableColumn prefWidth="75.0" text="Straße" />
-                                                                                <TableColumn prefWidth="75.0" text="PLZ" />
-                                                                                <TableColumn prefWidth="75.0" text="Ort" />
-                                                                                <TableColumn prefWidth="75.0" text="Land" />
-                                                                            </columns>
-                                                                        </TableColumn>
-                                                                        <TableColumn prefWidth="75.0" text="CAVE" />
-                                                                    </columns>
-                                                   <columnResizePolicy>
-                                                      <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                                                   </columnResizePolicy>
-                                                                </TableView>
-                                                            </children>
-                                                        </VBox>
-                                                    </content>
-                                                </Tab>
-                                                <Tab closable="false" text="Stationsübersicht">
-                                                    <content>
-                                                        <VBox prefHeight="200.0" prefWidth="100.0">
-                                                            <children>
-                                                                <ToolBar prefHeight="40.0" prefWidth="200.0">
-                                                                    <items>
-                                                                        <Label text="Station:" />
-                                                                        <ComboBox fx:id="cmbStationenFilter" prefWidth="150.0" promptText="Stationen" />
-                                                                        <ToggleButton fx:id="btnEntlassenePatientenZeigen" mnemonicParsing="false" text="Entlassene Patienten zeigen" />
-                                                                    </items>
-                                                                </ToolBar>
-                                                                <SplitPane prefHeight="160.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                                                                    <items>
-                                                                        <TableView prefHeight="200.0" prefWidth="200.0" tableMenuButtonVisible="true">
-                                                                            <columns>
-                                                                                <TableColumn prefWidth="75.0" text="PatID" />
-                                                                                <TableColumn prefWidth="135.0" text="Nachname, Vorname" />
-                                                                                <TableColumn prefWidth="121.0" text="Geburtsdatum" />
-                                                                                <TableColumn prefWidth="50.0" text="Alter" />
-                                                                                <TableColumn prefWidth="129.0" text="Aufnahmedatum" />
-                                                                                <TableColumn prefWidth="152.0" text="Entlassungsdatum" />
-                                                                            </columns>
-                                                         <columnResizePolicy>
-                                                            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                                                         </columnResizePolicy>
-                                                                        </TableView>
-                                                                    </items>
-                                                                </SplitPane>
-                                                            </children>
-                                                        </VBox>
-                                                    </content>
-                                                </Tab>
-                                            </tabs>
-                                        </TabPane>
+                                        <fx:include source="patient_tables.fxml" />
                                         <SplitPane dividerPositions="0.2981007431874484" prefHeight="160.0" prefWidth="200.0">
                                             <items>
                                                 <VBox prefHeight="200.0" prefWidth="100.0">
@@ -110,9 +36,9 @@
                                                             </content>
                                                         </Tab>
                                                         <Tab text="Untersuchungen">
-                                             <content>
-         <fx:include source="untersuchungen.fxml" />
-                                             </content>
+                                                            <content>
+                                                                <fx:include source="untersuchungen.fxml" />
+                                                            </content>
                                                         </Tab>
                                                         <Tab text="Diagnose">
                                                             <content>
@@ -136,50 +62,7 @@
                 </Tab>
                 <Tab text="Einstellungen">
                <content>
-                  <TilePane prefHeight="200.0" prefWidth="200.0">
-                     <children>
-                              <VBox prefHeight="150.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;">
-                                  <children>
-                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="OPS-Server">
-                                 <font>
-                                    <Font size="18.0" />
-                                 </font>
-                                 <VBox.margin>
-                                    <Insets bottom="10.0" />
-                                 </VBox.margin>
-                              </Text>
-                                      <GridPane>
-                                          <columnConstraints>
-                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                          </columnConstraints>
-                                          <rowConstraints>
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                          </rowConstraints>
-                                          <children>
-                                              <Label text="OPS-Sever:" />
-                                              <Label text="Port:" GridPane.rowIndex="1" />
-                                              <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" GridPane.columnIndex="1" />
-                                              <TextField fx:id="opsServerIp" GridPane.columnIndex="1" />
-                                              <TextField fx:id="opsServerCode" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                          </children>
-                                      </GridPane>
-                                      <HBox alignment="BOTTOM_RIGHT" VBox.vgrow="ALWAYS">
-                                          <children>
-                                              <Button fx:id="opsServerSave" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Speichern" />
-                                          </children>
-                                      </HBox>
-                                  </children>
-                           <TilePane.margin>
-                              <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-                           </TilePane.margin>
-                           <padding>
-                              <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-                           </padding>
-                              </VBox>
-                     </children>
-                  </TilePane>
+                    <fx:include source="settings.fxml" />
                </content>
                 </Tab>
             </tabs>
@@ -187,9 +70,9 @@
         <ToolBar>
             <items>
                 <Label text="Mitarbeiter wählen:" />
-                <ChoiceBox prefWidth="150.0" />
+                <ChoiceBox fx:id="cmbUserChoose" prefWidth="150.0" />
                 <Pane HBox.hgrow="ALWAYS" />
-                <ProgressIndicator pickOnBounds="false" prefHeight="35.0" prefWidth="35.0" />
+                <ProgressIndicator fx:id="progressIndicator" pickOnBounds="false" prefHeight="35.0" prefWidth="35.0" />
             </items>
         </ToolBar>
     </children>
diff --git a/src/main/resources/patient_edit.fxml b/src/main/resources/patient_edit.fxml
index d47a7ee..b4d46fe 100644
--- a/src/main/resources/patient_edit.fxml
+++ b/src/main/resources/patient_edit.fxml
@@ -14,8 +14,8 @@
                 <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints />
-                <RowConstraints />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                 <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -104,7 +104,7 @@
                   <children>
                       <Label styleClass="ersteller-label" text="Ersteller: " GridPane.rowIndex="0" />
                       <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1" />
-                      <Label fx:id="patCreator" GridPane.columnIndex="1" />
+                      <Label fx:id="patCreator" GridPane.columnIndex="1" GridPane.rowIndex="0" />
                       <Label fx:id="patCreateTime" GridPane.columnIndex="1" GridPane.rowIndex="1" />
                   </children>
                   <columnConstraints>
diff --git a/src/main/resources/patient_tables.fxml b/src/main/resources/patient_tables.fxml
new file mode 100644
index 0000000..c666fee
--- /dev/null
+++ b/src/main/resources/patient_tables.fxml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.text.*?>
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<TabPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+    <tabs>
+        <Tab closable="false" text="Patientenübersicht">
+            <content>
+                <VBox prefHeight="200.0" prefWidth="100.0">
+                    <children>
+                        <ToolBar prefHeight="40.0" prefWidth="200.0">
+                            <items>
+                                <Button fx:id="btnPatCreate" text="Neuen _Patient erstellen" />
+                                <Button fx:id="btnPatEdit" text="Patient _bearbeiten" />
+                            </items>
+                        </ToolBar>
+                        <TableView fx:id="tblPatientOverview" editable="true" tableMenuButtonVisible="true">
+                            <columns>
+                                <TableColumn fx:id="colPatPatId" editable="false" prefWidth="75.0" sortable="false" text="PatID" />
+                                <TableColumn prefWidth="75.0" text="Name">
+                                    <columns>
+                                        <TableColumn fx:id="colPatGeburtsname" prefWidth="75.0" text="Geburtsname" />
+                                        <TableColumn fx:id="colPatNachname" prefWidth="75.0" text="Nachname" />
+                                        <TableColumn fx:id="colPatVorname" prefWidth="75.0" text="Vorname" />
+                                    </columns>
+                                </TableColumn>
+                                <TableColumn fx:id="colPatGebDatum" prefWidth="75.0" text="GebDatum" />
+                                <TableColumn prefWidth="75.0" text="Adresse">
+                                    <columns>
+                                        <TableColumn fx:id="colPatStrasse" prefWidth="75.0" text="Straße" />
+                                        <TableColumn fx:id="colPatPlz" prefWidth="75.0" text="PLZ" />
+                                        <TableColumn fx:id="colPatOrt" prefWidth="75.0" text="Ort" />
+                                    </columns>
+                                </TableColumn>
+                                <TableColumn fx:id="colPatCave" prefWidth="75.0" text="CAVE" />
+                            </columns>
+                            <columnResizePolicy>
+                                <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                            </columnResizePolicy>
+                        </TableView>
+                    </children>
+                </VBox>
+            </content>
+        </Tab>
+        <Tab closable="false" text="Stationsübersicht">
+            <content>
+                <VBox prefHeight="200.0" prefWidth="100.0">
+                    <children>
+                        <ToolBar prefHeight="40.0" prefWidth="200.0">
+                            <items>
+                                <Label text="Station:" />
+                                <ComboBox fx:id="cmbStationenFilter" prefWidth="150.0" promptText="Stationen" />
+                                <ToggleButton fx:id="btnEntlassenePatientenZeigen" mnemonicParsing="false" text="Entlassene Patienten zeigen" />
+                            </items>
+                        </ToolBar>
+                        <SplitPane prefHeight="160.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                            <items>
+                                <TableView fx:id="tblStationOverview" prefHeight="200.0" prefWidth="200.0" tableMenuButtonVisible="true">
+                                    <columns>
+                                        <TableColumn fx:id="colStatPatId" prefWidth="75.0" text="PatID" />
+                                        <TableColumn fx:id="colStatFullName" prefWidth="135.0" text="Nachname, Vorname" />
+                                        <TableColumn fx:id="colStatGebDatum" prefWidth="121.0" text="Geburtsdatum" />
+                                        <TableColumn fx:id="colStatAlter" prefWidth="50.0" text="Alter" />
+                                        <TableColumn fx:id="colStatAufnahmedatum" prefWidth="129.0" text="Aufnahmedatum" />
+                                        <TableColumn fx:id="colStatEntlassungsdatum" prefWidth="152.0" text="Entlassungsdatum" />
+                                    </columns>
+                                    <columnResizePolicy>
+                                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                                    </columnResizePolicy>
+                                </TableView>
+                            </items>
+                        </SplitPane>
+                    </children>
+                </VBox>
+            </content>
+        </Tab>
+    </tabs>
+</TabPane>
diff --git a/src/main/resources/settings.fxml b/src/main/resources/settings.fxml
new file mode 100644
index 0000000..74c9d59
--- /dev/null
+++ b/src/main/resources/settings.fxml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.text.*?>
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+
+<TilePane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+    <children>
+        <VBox prefHeight="150.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;"
+              styleClass="settings-box">
+            <children>
+                <Text strokeType="OUTSIDE" strokeWidth="0.0" text="MySQL-Datenbank">
+                    <font>
+                        <Font size="18.0"/>
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="10.0"/>
+                    </VBox.margin>
+                </Text>
+                <GridPane>
+                    <children>
+                        <Label text="JDBC-Serveradresse:"/>
+                        <Label text="Benutzername:" GridPane.rowIndex="1"/>
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" GridPane.columnIndex="1"/>
+                        <TextField fx:id="opsServerIp1" GridPane.columnIndex="1"/>
+                        <TextField fx:id="opsServerCode1" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                        <Label text="Kennwort:" GridPane.rowIndex="2"/>
+                        <TextField GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+                    </children>
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                </GridPane>
+                <HBox alignment="BOTTOM_RIGHT" VBox.vgrow="ALWAYS">
+                    <children>
+                        <Button fx:id="opsServerSave1" alignment="CENTER_RIGHT" mnemonicParsing="false"
+                                text="Speichern"/>
+                    </children>
+                </HBox>
+            </children>
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+            </padding>
+            <TilePane.margin>
+                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+            </TilePane.margin>
+        </VBox>
+        <VBox prefHeight="200.0" prefWidth="300.0" style="-fx-background-color: white; -fx-background-radius: 10;"
+              styleClass="settings-box">
+            <children>
+                <Text strokeType="OUTSIDE" strokeWidth="0.0" text="OPS-Server">
+                    <font>
+                        <Font size="18.0"/>
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="10.0"/>
+                    </VBox.margin>
+                </Text>
+                <GridPane>
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                    <children>
+                        <Label text="OPS-Sever:"/>
+                        <Label text="Port:" GridPane.rowIndex="1"/>
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" GridPane.columnIndex="1"/>
+                        <TextField fx:id="opsServerIp" GridPane.columnIndex="1"/>
+                        <TextField fx:id="opsServerCode" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                    </children>
+                </GridPane>
+                <HBox alignment="BOTTOM_RIGHT" VBox.vgrow="ALWAYS">
+                    <children>
+                        <Button fx:id="opsServerSave" alignment="CENTER_RIGHT" mnemonicParsing="false"
+                                text="Speichern"/>
+                    </children>
+                </HBox>
+            </children>
+            <TilePane.margin>
+                <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+            </TilePane.margin>
+            <padding>
+                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0"/>
+            </padding>
+        </VBox>
+    </children>
+</TilePane>
diff --git a/src/main/resources/stationshistorie.fxml b/src/main/resources/stationshistorie.fxml
index 6fc3b43..54fbc41 100644
--- a/src/main/resources/stationshistorie.fxml
+++ b/src/main/resources/stationshistorie.fxml
@@ -6,90 +6,92 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<SplitPane dividerPositions="0.5" prefHeight="331.0" prefWidth="730.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
-                                                                    <items>
-                                                                        <VBox>
-                                                                            <children>
-                                                                                <ToolBar prefHeight="40.0" prefWidth="200.0">
-                                                                                    <items>
-                                                                                        <Button mnemonicParsing="false" text="Neuen Aufenthalt erstellen" />
-                                                                                    </items>
-                                                                                </ToolBar>
-                                                                                <TableView prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
-                                                                                    <columns>
-                                                                                        <TableColumn prefWidth="75.0" text="Abteilung" />
-                                                                                        <TableColumn prefWidth="75.0" text="Station" />
-                                                                                        <TableColumn prefWidth="75.0" text="Aufnahme" />
-                                                                                        <TableColumn prefWidth="75.0" text="Entlassung" />
-                                                                                    </columns>
-                                                                                </TableView>
-                                                                            </children>
-                                                                        </VBox>
-                                                                        <VBox>
-                                                                            <children>
-                                                                                <GridPane VBox.vgrow="ALWAYS">
-                                                                                    <columnConstraints>
-                                                                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                                                                                    </columnConstraints>
-                                                                                    <rowConstraints>
-                                                                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                                                                                    </rowConstraints>
-                                                                                    <children>
-                                                                                        <Label text="Abteilung" />
-                                                                                        <Label text="Station" GridPane.rowIndex="1" />
-                                                                                        <Label text="Aufnahmedatum / -Zeit" GridPane.rowIndex="2" />
-                                                                                        <HBox alignment="CENTER" GridPane.columnIndex="1" GridPane.rowIndex="2">
-                                                                                            <children>
-                                                                                                <DatePicker GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                                                                                                <TextField prefColumnCount="10" promptText="HH:MM" />
-                        <Button mnemonicParsing="false" text="Jetzt" />
-                                                                                            </children>
-                                                                                        </HBox>
-                                                                                        <Label text="Entlassungsdatum/ -Zeit" GridPane.rowIndex="3" />
-                                                                                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="3">
-                                                                                            <children>
-                                                                                                <DatePicker />
-                                                                                                <TextField alignment="CENTER" prefColumnCount="10" promptText="HH:MM" />
-                        <Button mnemonicParsing="false" text="Jetzt" />
-                                                                                            </children>
-                                                                                        </HBox>
-                                                                                        <ComboBox prefWidth="150.0" GridPane.columnIndex="1" />
-                                                                                        <ComboBox prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                                                                    </children>
-                                                                                </GridPane>
-                                                                                <HBox alignment="CENTER_RIGHT">
-                                                                                    <children>
-                                                                                        <Button mnemonicParsing="false" text="Speichern" />
-                                                                                        <Button disable="true" mnemonicParsing="false" text="Eintrag entfernen" />
-                                                                                    </children>
-                                                                                </HBox>
-                                                                                <GridPane>
-                                                                                    <children>
-                                                                                        <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" />
-                                                                                        <Label styleClass="ersteller-label" text="Ersteller: " GridPane.rowIndex="1" />
-                                                                                        <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="2" />
-                                                                                        <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="3" />
-                                                                                        <Label GridPane.columnIndex="1" />
-                                                                                        <Label GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                                                                        <Label GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                                                                                        <Label GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                                                                                    </children>
-                                                                                    <columnConstraints>
-                                                                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
-                                                                                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
-                                                                                    </columnConstraints>
-                                                                                    <rowConstraints>
-                                                                                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                                                                                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                                                                                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                                                                                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                                                                                    </rowConstraints>
-                                                                                </GridPane>
-                                                                            </children>
-                                                                        </VBox>
-                                                                    </items>
-                                                                </SplitPane>
+<SplitPane dividerPositions="0.5" prefHeight="331.0" prefWidth="730.0" xmlns="http://javafx.com/javafx/8"
+           xmlns:fx="http://javafx.com/fxml/1">
+    <items>
+        <VBox>
+            <children>
+                <ToolBar prefHeight="40.0" prefWidth="200.0">
+                    <items>
+                        <Button mnemonicParsing="false" text="Neuen Aufenthalt erstellen"/>
+                    </items>
+                </ToolBar>
+                <TableView prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+                    <columns>
+                        <TableColumn prefWidth="75.0" text="Abteilung"/>
+                        <TableColumn prefWidth="75.0" text="Station"/>
+                        <TableColumn prefWidth="75.0" text="Aufnahme"/>
+                        <TableColumn prefWidth="75.0" text="Entlassung"/>
+                    </columns>
+                </TableView>
+            </children>
+        </VBox>
+        <VBox>
+            <children>
+                <GridPane VBox.vgrow="ALWAYS">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                    <children>
+                        <Label text="Abteilung"/>
+                        <Label text="Station" GridPane.rowIndex="1"/>
+                        <Label text="Aufnahmedatum / -Zeit" GridPane.rowIndex="2"/>
+                        <HBox alignment="CENTER" GridPane.columnIndex="1" GridPane.rowIndex="2">
+                            <children>
+                                <DatePicker GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+                                <TextField prefColumnCount="10" promptText="HH:MM"/>
+                                <Button mnemonicParsing="false" text="Jetzt"/>
+                            </children>
+                        </HBox>
+                        <Label text="Entlassungsdatum/ -Zeit" GridPane.rowIndex="3"/>
+                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1"
+                              GridPane.rowIndex="3">
+                            <children>
+                                <DatePicker/>
+                                <TextField alignment="CENTER" prefColumnCount="10" promptText="HH:MM"/>
+                                <Button mnemonicParsing="false" text="Jetzt"/>
+                            </children>
+                        </HBox>
+                        <ComboBox prefWidth="150.0" GridPane.columnIndex="1"/>
+                        <ComboBox prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                    </children>
+                </GridPane>
+                <HBox alignment="CENTER_RIGHT">
+                    <children>
+                        <Button mnemonicParsing="false" text="Speichern"/>
+                        <Button disable="true" mnemonicParsing="false" text="Eintrag entfernen"/>
+                    </children>
+                </HBox>
+                <GridPane>
+                    <children>
+                        <Label styleClass="ersteller-label" text="Letzter Bearbeiter:"/>
+                        <Label styleClass="ersteller-label" text="Ersteller: " GridPane.rowIndex="1"/>
+                        <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="2"/>
+                        <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="3"/>
+                        <Label GridPane.columnIndex="1"/>
+                        <Label GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+                        <Label GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+                        <Label GridPane.columnIndex="1" GridPane.rowIndex="3"/>
+                    </children>
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                </GridPane>
+            </children>
+        </VBox>
+    </items>
+</SplitPane>