diff --git a/src/main/java/de/uniluebeck/mi/projmi6/Main.java b/src/main/java/de/uniluebeck/mi/projmi6/Main.java
index 87acf74..9111cf1 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/Main.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/Main.java
@@ -53,7 +53,7 @@ public class Main extends Application {
             ));
 
             mainController.setKassen(FXCollections.observableArrayList(
-                new Kasse(2, "TK", "Strasse 2", false)
+                //DBHandler.getAll
             ));
 
             mainController.setMitarbeiter(FXCollections.observableArrayList(
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
index d7282c4..b442ac1 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
@@ -39,7 +39,7 @@ public class DiagnoseController {
 
 
     @FXML
-    private ListView diagnoseList;
+    private ListView<Diagnose> diagnoseList;
 
     @FXML
     public void initialize(){
@@ -48,6 +48,11 @@ public class DiagnoseController {
         diagDiagnoseArzt.itemsProperty().bind(mainController.mitarbeiterProperty());
         diagnoseList.itemsProperty().bind(diagnosen);
 
+        diagnoseList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
+        diagnoseList.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
+            this.setDiagnose(newValue);
+        });
+
     }
 
 
@@ -111,27 +116,26 @@ public class DiagnoseController {
         if(diagnose==null){
             clearFields();
         }else {
-            copyDiagnoseDataIntoFields();
+            copyDiagnoseDataIntoFields(diagnose);
         }
 
     }
 
-    private void copyDiagnoseDataIntoFields(){
+    private void copyDiagnoseDataIntoFields(Diagnose diagnose){
         diagDiagnoseArzt.setValue(diagnose.getArzt());
 
-        //diagFreitext.setText(diagnose.getFreitext());
+        diagFreitext.setText(diagnose.getFreiText());
         diagDiagnoseArt.setValue(diagnose.getDiagArt());
-        //diagDiagnose.setValue(diagnose.getCode());
+        diagDiagnose.setValue(diagnose.getIcd10code());
 
         diagCreator.setText(Integer.toString(diagnose.getErsteller()));
         diagCreateTime.setText(diagnose.getErstellDatumZeit().toString());
         diagChanger.setText(Integer.toString(diagnose.getBearbeiter()));
         diagChangeTime.setText(diagnose.getBearbeitetDatumZeit().toString());
-
     }
 
     private void copyFieldDataIntoDiagnose(Diagnose diagnose){
-
+        diagnose.setIcd10code(diagDiagnose.getValue());
         diagnose.setArzt(diagDiagnoseArzt.getValue());
         diagnose.setFreiText(diagFreitext.getText());
         diagnose.setDiagArt(diagDiagnoseArt.getValue());
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
index e7befd9..1a3caa6 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/FallController.java
@@ -115,7 +115,6 @@ public class FallController {
                 state.isEqualTo(State.VIEW).and(fallProperty.isNotNull())
         );
 
-
         fallFields.disableProperty().bind(state.isEqualTo(State.VIEW));
 
         fallProperty.addListener(((observable, oldValue, newValue) -> {
@@ -147,11 +146,14 @@ public class FallController {
     void clickedFallAbort(ActionEvent event) {
         this.state.set(State.VIEW);
         copyFallDataIntoField(fallProperty.get());
+        mainController.fallCreationComplete();
     }
 
     @FXML
     void clickedFallSave(ActionEvent event) {
-
+        mainController.fallCreationComplete();
+        this.state.set(State.VIEW);
+        //TODO Update/create in db
     }
 
     public void createNewFall() {
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java
index 627df98..8d5212d 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java
@@ -262,15 +262,17 @@ public class MainController {
         tabFallUntersuchungen.setDisable(true);
         tabFallStationsHistorie.setDisable(true);
         tabPaneFall.getSelectionModel().select(tabFallOverview);
+        patientTablesController.getPatientOverviewTabPane().setDisable(true);
+
 
         fallController.createNewFall();
     }
 
-    @FXML
-    private void creationComplete(){
+    public void fallCreationComplete(){
         tabFallDiagnose.setDisable(false);
         tabFallUntersuchungen.setDisable(false);
         tabFallStationsHistorie.setDisable(false);
+        patientTablesController.getPatientOverviewTabPane().setDisable(false);
     }
 
 }
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java
index 0cfbd58..aaf7284 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/PatientTablesController.java
@@ -109,7 +109,14 @@ public class PatientTablesController{
     private TableColumn<StationsUebersichtsItem, String> colStatEntlassungsdatum;
 
     @FXML
-    private Tab stationOverviewTab, patientOverviewTab;
+    private Tab stationOverviewTab;
+
+    public TabPane getPatientOverviewTabPane() {
+        return patientOverviewTabPane;
+    }
+
+    @FXML
+    private Tab patientOverviewTab;
 
     @FXML
     private  TabPane patientOverviewTabPane;
@@ -120,6 +127,9 @@ public class PatientTablesController{
     }
 
 
+
+
+
     @FXML
     public void initialize() {
         btnPatEdit.disableProperty().bind(tblPatientOverview.getSelectionModel().selectedItemProperty().isNull());
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java b/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java
index c554036..425a880 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java
@@ -34,6 +34,11 @@ public class Diagnose extends Version {
         return freiText.get();
     }
 
+    @Override
+    public String toString() {
+        return icd10code+"";
+    }
+
     public SimpleStringProperty freiTextProperty() {
         return freiText;
     }