diff --git a/src/main/resources/diagnose.fxml b/src/main/resources/diagnose.fxml
new file mode 100644
index 0000000..99c0be6
--- /dev/null
+++ b/src/main/resources/diagnose.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.*?>
+
+<SplitPane dividerPositions="0.5" prefHeight="409.0" prefWidth="662.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 fx:id="btnDiagCreate" mnemonicParsing="false" onAction="#clickedDiagCreate" text="Neue Diagnose erstellen" />
+	                </items>
+	            </ToolBar>
+	            <ListView prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
+	        </children>
+	    </VBox>
+	    <VBox>
+	        <children>
+	            <GridPane vgap="5.0">
+	                <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="Diagnose:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
+	                    <Label text="Diagnoseart:" GridPane.columnIndex="0" GridPane.rowIndex="1" />
+	                    <Label text="DiagnoseArzt:" GridPane.columnIndex="0" GridPane.rowIndex="2" />
+	                    <Label text="Freitext: (optional)" GridPane.columnIndex="0" GridPane.rowIndex="3" />
+	                    <ComboBox fx:id="diagDiagnose" maxWidth="1.7976931348623157E308" promptText="ICD-10" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+	                    <ComboBox fx:id="diagDiagnoseArt" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+	                    <ComboBox fx:id="diagDiagnoseArzt" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" promptText="CurrentUser is Default" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+	                    <TextArea fx:id="diagFreitext" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+	                </children>
+	            </GridPane>
+	            <HBox alignment="TOP_RIGHT" spacing="5.0" VBox.vgrow="ALWAYS">
+	                <children>
+	                    <Button fx:id="btnDiagCancel" mnemonicParsing="false" onAction="#clickedDiagCancel" text="Storno" />
+	                    <Button fx:id="btnDiagSave" mnemonicParsing="false" onAction="#clickedDiagSave" text="Speichern" />
+	                </children>
+					<VBox.margin>
+						<Insets />
+					</VBox.margin>
+					<padding>
+						<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+					</padding>
+	            </HBox>
+	            <GridPane>
+	                <children>
+	                    <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.rowIndex="2" />
+	                    <Label styleClass="ersteller-label" text="Ersteller: " />
+	                    <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.rowIndex="1" />
+	                    <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="3" />
+	                    <Label fx:id="diagCreator" text="lorem" GridPane.columnIndex="1" />
+	                    <Label fx:id="diagCreateTime" text="ipsum" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+	                    <Label fx:id="diagChanger" text="dolor" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+	                    <Label fx:id="diagChangeTime" text="amet" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+	                </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 minHeight="10.0" vgrow="SOMETIMES" />
+	                    <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+	                </rowConstraints>
+	            </GridPane>
+	        </children>
+	    </VBox>
+	</items>
+</SplitPane>
diff --git a/src/main/resources/fall.fxml b/src/main/resources/fall.fxml
new file mode 100644
index 0000000..599fd5d
--- /dev/null
+++ b/src/main/resources/fall.fxml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?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>
diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml
index 412384c..3336d01 100644
--- a/src/main/resources/main.fxml
+++ b/src/main/resources/main.fxml
@@ -24,8 +24,8 @@
                                                             <children>
                                                                 <ToolBar prefHeight="40.0" prefWidth="200.0">
                                                                     <items>
-                                                                        <Button text="Neuen _Patient erstellen" />
-                                                                        <Button text="Patient _bearbeiten" />
+                                                                        <Button fx:id="btnPatCreate" text="Neuen _Patient erstellen" />
+                                                                        <Button fx:id="btnPatEdit" text="Patient _bearbeiten" />
                                                                     </items>
                                                                 </ToolBar>
                                                                 <TableView editable="true" tableMenuButtonVisible="true">
@@ -57,15 +57,15 @@
                                                         </VBox>
                                                     </content>
                                                 </Tab>
-                                                <Tab text="Stationsübersicht">
+                                                <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 prefWidth="150.0" promptText="Stationen" />
-                                                                        <ToggleButton mnemonicParsing="false" text="Entlassene Patienten zeigen" />
+                                                                        <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">
@@ -97,7 +97,7 @@
                                                     <children>
                                                         <ToolBar prefHeight="40.0" prefWidth="200.0">
                                                             <items>
-                                                                <Button text="Neuen _Fall erstellen" />
+                                                                <Button fx:id="btnFallCreate" text="Neuen _Fall erstellen" />
                                                             </items>
                                                         </ToolBar>
                                                     </children>
@@ -106,123 +106,7 @@
                                                     <tabs>
                                                         <Tab text="Fallübersicht">
                                                             <content>
-                                                                <VBox prefHeight="200.0" prefWidth="100.0">
-                                                                    <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 />
-                                                                                        <TextField prefColumnCount="5" promptText="HH:MM" />
-                                                                                        <Button mnemonicParsing="false" 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 />
-                                                                                        <TextField prefColumnCount="5" promptText="HH:MM" />
-                                                                                        <Button mnemonicParsing="false" text="Jetzt" />
-                                                                                    </children>
-                                                                                </HBox>
-                                                                                <Label text="Versichertennummer:" GridPane.rowIndex="3" />
-                                                                                <Label text="Einweisender Arzt:" GridPane.rowIndex="4" />
-                                                                                <VBox GridPane.columnIndex="1" GridPane.rowIndex="4">
-                                                                                    <children>
-                                                                                        <TextField GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                                                                                        <CheckBox mnemonicParsing="false" text="Selbsteinweisung" />
-                                                                                    </children>
-                                                                                </VBox>
-                                                                                <Label text="Kasse:" GridPane.rowIndex="6" />
-                                                                                <ComboBox prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-                                                                                <TextField GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                                                                                <Label text="Fallart:" GridPane.rowIndex="5" />
-                                                                                <ComboBox 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 mnemonicParsing="false" text="Bearbeitung aktivieren">
-                                                                                    <HBox.margin>
-                                                                                        <Insets right="5.0" />
-                                                                                    </HBox.margin>
-                                                                                </Button>
-                                                                                <Button mnemonicParsing="false" text="Storno" />
-                                                                                <Button cancelButton="true" mnemonicParsing="false" text="Abbrechen">
-                                                                                    <HBox.margin>
-                                                                                        <Insets left="5.0" right="5.0" />
-                                                                                    </HBox.margin>
-                                                                                </Button>
-                                                                                <Button mnemonicParsing="false" 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 text="Doc Holiday" GridPane.columnIndex="1" />
-                                                                                      <Label 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 text="Dr. House" GridPane.columnIndex="1" />
-                                                                  <Label 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>
+                                                                <fx:include source="fall.fxml" />
                                                             </content>
                                                         </Tab>
                                                         <Tab text="Untersuchungen">
@@ -251,34 +135,52 @@
                     </content>
                 </Tab>
                 <Tab text="Einstellungen">
-                    <content>
-                        <VBox>
-                            <children>
-                                <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 GridPane.columnIndex="1" />
-                                        <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                                    </children>
-                                </GridPane>
-                                <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0">
-                                    <children>
-                                        <Button alignment="CENTER_RIGHT" mnemonicParsing="false" text="Speichern" />
-                                    </children>
-                                </HBox>
-                            </children>
-                        </VBox>
-                    </content>
+               <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>
+               </content>
                 </Tab>
             </tabs>
         </TabPane>
diff --git a/src/main/resources/patient_edit.fxml b/src/main/resources/patient_edit.fxml
index bd0e1f3..d47a7ee 100644
--- a/src/main/resources/patient_edit.fxml
+++ b/src/main/resources/patient_edit.fxml
@@ -6,102 +6,133 @@
 <?import java.lang.*?>
 <?import javafx.scene.layout.*?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="633.0"
-      prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="633.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <GridPane>
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                <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"/>
-                <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 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 />
+                <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 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>
             <children>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="3"/>
-                <Label text="Geburtsname" GridPane.rowIndex="3"/>
-                <Label text="Vorname" GridPane.rowIndex="2"/>
-                <Label text="Nachname" GridPane.rowIndex="4"/>
-                <Label text="Straße" GridPane.rowIndex="5"/>
-                <Label text="Hausnummer" GridPane.rowIndex="6"/>
-                <Label text="PLZ" GridPane.rowIndex="7"/>
-                <Label text="Ort" GridPane.rowIndex="8"/>
-                <Label text="Geburtsdatum" GridPane.rowIndex="9"/>
-                <Label text="Familienstand" GridPane.rowIndex="10"/>
-                <Label text="Geschlecht" GridPane.rowIndex="11"/>
-                <Label text="Versicherungsnummer" GridPane.rowIndex="12"/>
-                <Label text="Versicherung" GridPane.rowIndex="13"/>
-                <ComboBox prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="13"/>
-                <ComboBox prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="10"/>
-                <ComboBox prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="11"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="3"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="3"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="5"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="5"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="6"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="7"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="8"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="12"/>
-                <Label text="CAVE:" GridPane.rowIndex="14"/>
-                <TextArea prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="14"/>
-                <Label text="PatID:"/>
-                <Label text="xxxx" GridPane.columnIndex="1"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                <TextField GridPane.columnIndex="1" GridPane.rowIndex="4"/>
-                <DatePicker GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+                <Label text="PatID:" />
+                <Label fx:id="patId" text="xxxx" GridPane.columnIndex="1" />
+
+                <Label text="Vorname:" GridPane.rowIndex="1" />
+                <TextField fx:id="patVorname" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+
+                <Label text="Geburtsname:" GridPane.rowIndex="2" />
+                <TextField fx:id="patGeburtsname" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+
+                <Label text="Nachname:" GridPane.rowIndex="3" />
+                <TextField fx:id="patNachname" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+
+                <Label text="Straße:" GridPane.rowIndex="4" />
+                <TextField fx:id="patStrasse" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+
+                <Label text="Hausnummer:" GridPane.rowIndex="5" />
+                <TextField fx:id="patHausnummer" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+
+                <Label text="PLZ:" GridPane.rowIndex="6" />
+                <TextField fx:id="patPlz" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+
+                <Label text="Ort:" GridPane.rowIndex="7" />
+                <TextField fx:id="patOrt" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+
+                <Label text="Geburtsdatum:" GridPane.rowIndex="8" />
+                <DatePicker fx:id="patGeburtsdatum" GridPane.columnIndex="1" GridPane.rowIndex="8" />
+                
+                <Label text="Familienstand:" GridPane.rowIndex="9" />
+                <ComboBox fx:id="patFamilienstand" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="9" />
+
+                <Label text="Geschlecht:" GridPane.rowIndex="10" />
+                <ComboBox fx:id="patGeschlecht" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="10" />
+                
+                <Label text="Versicherungsnummer:" GridPane.rowIndex="11" />
+                <TextField fx:id="patVersicherungsnummer" GridPane.columnIndex="1" GridPane.rowIndex="11" />
+                
+                <Label text="Versicherung:" GridPane.rowIndex="12" />
+                <ComboBox fx:id="patVersicherung" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="12" />
+
+                <Label text="CAVE:" GridPane.rowIndex="13" />
+                <TextArea fx:id="patCave" prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="13" />
+                
             </children>
+         <VBox.margin>
+            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+         </VBox.margin>
         </GridPane>
-        <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+        <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
             <children>
-                <Button defaultButton="true" mnemonicParsing="false" text="Speichern">
+                <Button fx:id="btnPatSave" defaultButton="true" mnemonicParsing="false" onAction="#clickedSave" text="Speichern">
                     <HBox.margin>
-                        <Insets right="5.0"/>
+                        <Insets right="5.0" />
                     </HBox.margin>
                 </Button>
-                <Button cancelButton="true" mnemonicParsing="false" text="Abbrechen">
+                <Button fx:id="btnPatAbort" cancelButton="true" mnemonicParsing="false" onAction="#clickedAbort" text="Abbrechen">
                     <HBox.margin>
-                        <Insets right="5.0"/>
+                        <Insets right="5.0" />
                     </HBox.margin>
                 </Button>
             </children>
         </HBox>
-        <GridPane>
-            <children>
-                <Label text="Letzter Bearbeiter"/>
-                <Label text="Ersteller: " GridPane.rowIndex="1"/>
-                <Label text="Erstelldatum:" GridPane.rowIndex="2"/>
-                <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"/>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.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>
+      <GridPane>
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+         </rowConstraints>
+         <children>
+              <GridPane>
+                  <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="patCreateTime" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                  </children>
+                  <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="50.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                  </columnConstraints>
+                  <rowConstraints>
+                      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                  </rowConstraints>
+              </GridPane>
+            <GridPane GridPane.columnIndex="1">
+              <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:" GridPane.rowIndex="0" />
+                <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.rowIndex="1" />
+                <Label fx:id="patChanger" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                <Label fx:id="patChangeTime" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+              </children>
+            </GridPane>
+         </children>
+      </GridPane>
     </children>
 </VBox>
diff --git a/src/main/resources/stationshistorie.fxml b/src/main/resources/stationshistorie.fxml
new file mode 100644
index 0000000..6fc3b43
--- /dev/null
+++ b/src/main/resources/stationshistorie.fxml
@@ -0,0 +1,95 @@
+<?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.*?>
+
+<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>
diff --git a/src/main/resources/untersuchungen.fxml b/src/main/resources/untersuchungen.fxml
new file mode 100644
index 0000000..a7dc5ce
--- /dev/null
+++ b/src/main/resources/untersuchungen.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.*?>
+
+<SplitPane dividerPositions="0.45" prefHeight="421.0" prefWidth="652.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 fx:id="btnUntsCreate" mnemonicParsing="false" onAction="#clickedUntsCreate" text="Neue Untersuchung erstellen" />
+                    </items>
+                </ToolBar>
+                <ListView fx:id="untsList" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" />
+            </children>
+        </VBox>
+        <VBox prefHeight="200.0" prefWidth="100.0">
+            <children>
+                <GridPane vgap="5.0">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="40.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>
+                    <children>
+                        <Label text="OPS-Code" />
+                        <ComboBox fx:id="untsOpsCode" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" />
+                        <Label text="Durchführender Arzt" GridPane.rowIndex="1" />
+                        <Label text="Untersuchungsdatum / -Zeit" GridPane.rowIndex="2" />
+                        <ComboBox fx:id="untsArzt" maxWidth="1.7976931348623157E308" promptText="aktueller Arzt is default" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                        <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
+                            <children>
+                                <DatePicker fx:id="untsDatum" prefWidth="150.0" />
+                                <TextField fx:id="untsZeit" prefColumnCount="5" promptText="HH:MM" />
+        						<Button fx:id="btnUntsNow" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#clickedUntsNow" text="Jetzt" HBox.hgrow="ALWAYS" />
+                            </children>
+                        </HBox>
+                    </children>
+                </GridPane>
+                <HBox alignment="TOP_RIGHT" prefHeight="100.0" prefWidth="200.0" spacing="5.0" VBox.vgrow="ALWAYS">
+                    <children>
+                        <Button fx:id="btnUntsCancel" mnemonicParsing="false" onAction="#clickedUntsAbort" text="Storno" />
+                        <Button fx:id="btnUntsSave" mnemonicParsing="false" onAction="#clickedUntsSave" text="Speichern" />
+                    </children>
+					<padding>
+					  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+					</padding>
+                </HBox>
+                <GridPane>
+                    <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>
+                    <children>
+                        <Label styleClass="ersteller-label" text="Ersteller:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
+                        <Label styleClass="ersteller-label" text="Erstelldatum:" GridPane.columnIndex="0" GridPane.rowIndex="1" />
+                        <Label styleClass="ersteller-label" text="Letzter Bearbeiter:" GridPane.columnIndex="0" GridPane.rowIndex="2" />
+                        <Label styleClass="ersteller-label" text="Letzte Änderung:" GridPane.columnIndex="0" GridPane.rowIndex="3" />
+                        <Label fx:id="untsCreator" text="Dr. Haha" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+                        <Label fx:id="untsCreateTime" text="10.10.2013 09:00" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+  						<Label fx:id="untsChanger" text="Dr. Haha" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+                        <Label fx:id="untsChangeTime" text="10.10.2013 09:00" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+                    </children>
+                </GridPane>
+            </children>
+        </VBox>
+    </items>
+</SplitPane>