diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml
index 783232e..412384c 100644
--- a/src/main/resources/main.fxml
+++ b/src/main/resources/main.fxml
@@ -6,18 +6,15 @@
 <?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="1242.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">
+        <TabPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" side="LEFT" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
             <tabs>
                 <Tab text="Patientenübersicht">
                     <content>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <SplitPane dividerPositions="0.5" maxHeight="1.7976931348623157E308"
-                                           maxWidth="1.7976931348623157E308" orientation="VERTICAL" VBox.vgrow="ALWAYS">
+                                <SplitPane dividerPositions="0.5" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" orientation="VERTICAL" VBox.vgrow="ALWAYS">
                                     <items>
                                         <TabPane>
                                             <tabs>
@@ -27,42 +24,34 @@
                                                             <children>
                                                                 <ToolBar prefHeight="40.0" prefWidth="200.0">
                                                                     <items>
-                                                                        <Button mnemonicParsing="false" text="Neu"/>
-                                                                        <Button mnemonicParsing="false"
-                                                                                text="Bearbeiten"/>
+                                                                        <Button text="Neuen _Patient erstellen" />
+                                                                        <Button text="Patient _bearbeiten" />
                                                                     </items>
                                                                 </ToolBar>
-                                                                <TableView editable="true" prefHeight="392.0"
-                                                                           prefWidth="469.0"
-                                                                           tableMenuButtonVisible="true">
+                                                                <TableView editable="true" tableMenuButtonVisible="true">
                                                                     <columns>
-                                                                        <TableColumn editable="false" prefWidth="75.0"
-                                                                                     sortable="false" text="PatID"/>
+                                                                        <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"/>
+                                                                                <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="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"/>
+                                                                                <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"/>
+                                                                        <TableColumn prefWidth="75.0" text="CAVE" />
                                                                     </columns>
+                                                   <columnResizePolicy>
+                                                      <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                                                   </columnResizePolicy>
                                                                 </TableView>
                                                             </children>
                                                         </VBox>
@@ -74,32 +63,25 @@
                                                             <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"/>
+                                                                        <Label text="Station:" />
+                                                                        <ComboBox prefWidth="150.0" promptText="Stationen" />
+                                                                        <ToggleButton mnemonicParsing="false" text="Entlassene Patienten zeigen" />
                                                                     </items>
                                                                 </ToolBar>
-                                                                <SplitPane prefHeight="160.0" prefWidth="200.0"
-                                                                           VBox.vgrow="ALWAYS">
+                                                                <SplitPane prefHeight="160.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
                                                                     <items>
-                                                                        <TableView prefHeight="200.0" prefWidth="200.0">
+                                                                        <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 minWidth="0.0"
-                                                                                             prefWidth="52.0"
-                                                                                             text="Alter"/>
-                                                                                <TableColumn prefWidth="129.0"
-                                                                                             text="Aufnahmedatum"/>
-                                                                                <TableColumn prefWidth="152.0"
-                                                                                             text="Entlassungsdatum"/>
+                                                                                <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>
@@ -109,566 +91,153 @@
                                                 </Tab>
                                             </tabs>
                                         </TabPane>
-                                        <SplitPane dividerPositions="0.2981007431874484" prefHeight="160.0"
-                                                   prefWidth="200.0">
+                                        <SplitPane dividerPositions="0.2981007431874484" prefHeight="160.0" prefWidth="200.0">
                                             <items>
                                                 <VBox prefHeight="200.0" prefWidth="100.0">
                                                     <children>
                                                         <ToolBar prefHeight="40.0" prefWidth="200.0">
                                                             <items>
-                                                                <Button mnemonicParsing="false" text="Neu"/>
-                                                                <Label text="Liste der Fälle"/>
+                                                                <Button text="Neuen _Fall erstellen" />
                                                             </items>
                                                         </ToolBar>
                                                     </children>
                                                 </VBox>
-                                                <TabPane prefHeight="200.0" prefWidth="200.0"
-                                                         tabClosingPolicy="UNAVAILABLE">
+                                                <TabPane prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE">
                                                     <tabs>
                                                         <Tab text="Fallübersicht">
                                                             <content>
                                                                 <VBox prefHeight="200.0" prefWidth="100.0">
                                                                     <children>
-                                                                        <GridPane>
+                                                                        <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"
-                                                                                      GridPane.columnIndex="1"
-                                                                                      GridPane.rowIndex="1">
+                                                                                <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/>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Jetzt"/>
+                                                                                        <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"
-                                                                                      GridPane.columnIndex="1"
-                                                                                      GridPane.rowIndex="2">
+                                                                                <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/>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Jetzt"/>
+                                                                                        <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">
+                                                                                <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"/>
+                                                                                        <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"/>
+                                                                                <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 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 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" prefHeight="100.0"
-                                                                              prefWidth="200.0">
+                                                                        <HBox alignment="TOP_RIGHT" VBox.vgrow="ALWAYS">
                                                                             <children>
-                                                                                <Button mnemonicParsing="false"
-                                                                                        text="Bearbeitung aktivieren">
+                                                                                <Button mnemonicParsing="false" text="Bearbeitung aktivieren">
                                                                                     <HBox.margin>
-                                                                                        <Insets right="5.0"/>
+                                                                                        <Insets right="5.0" />
                                                                                     </HBox.margin>
                                                                                 </Button>
-                                                                                <Button mnemonicParsing="false"
-                                                                                        text="Storno"/>
-                                                                                <Button cancelButton="true"
-                                                                                        mnemonicParsing="false"
-                                                                                        text="Abbrechen">
+                                                                                <Button mnemonicParsing="false" text="Storno" />
+                                                                                <Button cancelButton="true" mnemonicParsing="false" text="Abbrechen">
                                                                                     <HBox.margin>
-                                                                                        <Insets left="5.0" right="5.0"/>
+                                                                                        <Insets left="5.0" right="5.0" />
                                                                                     </HBox.margin>
                                                                                 </Button>
-                                                                                <Button defaultButton="true"
-                                                                                        mnemonicParsing="false"
-                                                                                        text="Speichern">
+                                                                                <Button mnemonicParsing="false" text="Speichern">
                                                                                     <HBox.margin>
-                                                                                        <Insets right="10.0"/>
+                                                                                        <Insets right="10.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>
+                                                      <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>
                                                             </content>
                                                         </Tab>
                                                         <Tab text="Untersuchungen">
-                                                            <content>
-                                                                <SplitPane dividerPositions="0.5">
-                                                                    <items>
-                                                                        <VBox>
-                                                                            <children>
-                                                                                <ToolBar prefHeight="40.0"
-                                                                                         prefWidth="200.0">
-                                                                                    <items>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Neu"/>
-                                                                                    </items>
-                                                                                </ToolBar>
-                                                                                <ListView prefHeight="200.0"
-                                                                                          prefWidth="200.0"
-                                                                                          VBox.vgrow="ALWAYS"/>
-                                                                            </children>
-                                                                        </VBox>
-                                                                        <VBox prefHeight="200.0" prefWidth="100.0">
-                                                                            <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 minHeight="10.0"
-                                                                                                        prefHeight="30.0"
-                                                                                                        vgrow="SOMETIMES"/>
-                                                                                    </rowConstraints>
-                                                                                    <children>
-                                                                                        <Label text="OPS-Code"/>
-                                                                                        <ComboBox prefWidth="150.0"
-                                                                                                  GridPane.columnIndex="1"/>
-                                                                                        <Label text="Durchführender Arzt"
-                                                                                               GridPane.rowIndex="1"/>
-                                                                                        <Label text="Untersuchungsdatum / -Zeit"
-                                                                                               GridPane.rowIndex="2"/>
-                                                                                        <ComboBox prefWidth="150.0"
-                                                                                                  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/>
-                                                                                                <TextField/>
-                                                                                            </children>
-                                                                                        </HBox>
-                                                                                    </children>
-                                                                                </GridPane>
-                                                                                <HBox alignment="TOP_RIGHT"
-                                                                                      prefHeight="100.0"
-                                                                                      prefWidth="200.0"
-                                                                                      VBox.vgrow="ALWAYS">
-                                                                                    <children>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Storno"/>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Speichern"/>
-                                                                                    </children>
-                                                                                </HBox>
-                                                                                <GridPane>
-                                                                                    <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>
-                                                                                    <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>
-                                                                                </GridPane>
-                                                                            </children>
-                                                                        </VBox>
-                                                                    </items>
-                                                                </SplitPane>
-                                                            </content>
+                                             <content>
+         <fx:include source="untersuchungen.fxml" />
+                                             </content>
                                                         </Tab>
                                                         <Tab text="Diagnose">
                                                             <content>
-                                                                <SplitPane dividerPositions="0.5" prefHeight="160.0"
-                                                                           prefWidth="200.0">
-                                                                    <items>
-                                                                        <VBox>
-                                                                            <children>
-                                                                                <ToolBar prefHeight="40.0"
-                                                                                         prefWidth="200.0">
-                                                                                    <items>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Neue Diagnose"/>
-                                                                                    </items>
-                                                                                </ToolBar>
-                                                                                <ListView prefHeight="200.0"
-                                                                                          prefWidth="200.0"
-                                                                                          VBox.vgrow="ALWAYS"/>
-                                                                            </children>
-                                                                        </VBox>
-                                                                        <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 minHeight="10.0"
-                                                                                                        prefHeight="30.0"
-                                                                                                        vgrow="SOMETIMES"/>
-                                                                                        <RowConstraints minHeight="10.0"
-                                                                                                        prefHeight="30.0"
-                                                                                                        vgrow="SOMETIMES"/>
-                                                                                    </rowConstraints>
-                                                                                    <children>
-                                                                                        <Label text="Diagnoseart"
-                                                                                               GridPane.rowIndex="1"/>
-                                                                                        <Label text="Diagnose"/>
-                                                                                        <Label text="DiagnoseArzt:"
-                                                                                               GridPane.rowIndex="2"/>
-                                                                                        <ComboBox prefWidth="150.0"
-                                                                                                  GridPane.columnIndex="1"
-                                                                                                  GridPane.rowIndex="1"/>
-                                                                                        <ComboBox prefWidth="150.0"
-                                                                                                  promptText="CurrentUser is Default"
-                                                                                                  GridPane.columnIndex="1"
-                                                                                                  GridPane.rowIndex="2"/>
-                                                                                        <ComboBox prefWidth="150.0"
-                                                                                                  promptText="ICD-10"
-                                                                                                  GridPane.columnIndex="1"/>
-                                                                                        <Label text="Freitext: (optional)"
-                                                                                               GridPane.rowIndex="3"/>
-                                                                                        <TextArea prefHeight="200.0"
-                                                                                                  prefWidth="200.0"
-                                                                                                  GridPane.columnIndex="1"
-                                                                                                  GridPane.rowIndex="3"/>
-                                                                                    </children>
-                                                                                </GridPane>
-                                                                                <HBox alignment="TOP_RIGHT"
-                                                                                      VBox.vgrow="ALWAYS">
-                                                                                    <children>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Storno"/>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Speichern"/>
-                                                                                    </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>
-                                                                            </children>
-                                                                        </VBox>
-                                                                    </items>
-                                                                </SplitPane>
+                                                                <fx:include source="diagnose.fxml" />
                                                             </content>
                                                         </Tab>
                                                         <Tab text="Stationshistorie">
                                                             <content>
-                                                                <SplitPane dividerPositions="0.5" prefHeight="160.0"
-                                                                           prefWidth="200.0">
-                                                                    <items>
-                                                                        <VBox>
-                                                                            <children>
-                                                                                <ToolBar prefHeight="40.0"
-                                                                                         prefWidth="200.0">
-                                                                                    <items>
-                                                                                        <Button mnemonicParsing="false"
-                                                                                                text="Neu"/>
-                                                                                    </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
-                                                                                                        promptText="HH:MM"/>
-                                                                                            </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"
-                                                                                                        promptText="HH:MM"/>
-                                                                                            </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 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>
-                                                                            </children>
-                                                                        </VBox>
-                                                                    </items>
-                                                                </SplitPane>
+                                                                <fx:include source="stationshistorie.fxml" />
                                                             </content>
                                                         </Tab>
                                                     </tabs>
@@ -687,25 +256,24 @@
                             <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 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="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"/>
+                                        <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"/>
+                                        <Button alignment="CENTER_RIGHT" mnemonicParsing="false" text="Speichern" />
                                     </children>
                                 </HBox>
                             </children>
@@ -716,10 +284,10 @@
         </TabPane>
         <ToolBar>
             <items>
-                <Label text="Mitarbeiterin wählen"/>
-                <ChoiceBox prefWidth="150.0"/>
-                <Pane HBox.hgrow="ALWAYS"/>
-                <ProgressIndicator pickOnBounds="false" prefHeight="35.0" prefWidth="35.0"/>
+                <Label text="Mitarbeiter wählen:" />
+                <ChoiceBox prefWidth="150.0" />
+                <Pane HBox.hgrow="ALWAYS" />
+                <ProgressIndicator pickOnBounds="false" prefHeight="35.0" prefWidth="35.0" />
             </items>
         </ToolBar>
     </children>