diff --git a/10 - Adding tracks/data/tracks.txt b/10 - Adding tracks/data/tracks.txt
new file mode 100644
index 0000000..40bd1ab
Binary files /dev/null and b/10 - Adding tracks/data/tracks.txt differ
diff --git a/10 - Adding tracks/src/controller/tracks/AddController.java b/10 - Adding tracks/src/controller/tracks/AddController.java
index 5648083..f3ca914 100644
--- a/10 - Adding tracks/src/controller/tracks/AddController.java	
+++ b/10 - Adding tracks/src/controller/tracks/AddController.java	
@@ -9,6 +9,7 @@
 import model.AppendingObjectOutputStream;
 import model.Track;
 
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -39,25 +40,38 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
 
     save.setOnAction(e -> {
       try {
-        saveTrack();
+        addTrack();
+      } catch (IOException ex) {
+        ex.printStackTrace();
+      }
+    });
+
+    cancel.setOnAction(e -> closeDialog());
+
+    /*
+    save.setOnAction(e -> {
+      try {
+        // saveTrack();
       } catch (IOException ex) {
         ex.printStackTrace();
       }
     });
 
     cancel.setOnAction(e -> handleCancel());
+    */
   }
 
-  private void saveTrack () throws IOException {
-    // TODO: Validate data
+  @FXML
+  private void addTrack() throws IOException {
     Track track = new Track(title.getText(), artist.getText());
+    String dataURL = rootURL + "/data/tracks.txt";
 
-    if (fileExists(rootURL + "/data/tracks.txt")) {
-      AppendingObjectOutputStream aos = new AppendingObjectOutputStream(new FileOutputStream("data/tracks.txt", true));
-      aos.writeObject(track);
-      aos.close();
+    if (fileExists(dataURL)) {
+      AppendingObjectOutputStream as = new AppendingObjectOutputStream(new FileOutputStream(dataURL, true));
+      as.writeObject(track);
+      as.close();
     } else {
-      ObjectOutputStream os = new ObjectOutputStream(new FileOutputStream("data/tracks.txt"));
+      ObjectOutputStream os = new ObjectOutputStream(new FileOutputStream(dataURL));
       os.writeObject(track);
       os.close();
     }
@@ -70,8 +84,8 @@ private void saveTrack () throws IOException {
    * Called when clear button is clicked.
    */
   @FXML
-  private void handleCancel() {
-    dialog.close();
+  private void closeDialog() {
+    this.dialog.close();
   }
 
   public void setDialogStage(Stage dialog) {
diff --git a/10 - Adding tracks/src/controller/tracks/TracksController.java b/10 - Adding tracks/src/controller/tracks/TracksController.java
index ef475d5..e30c1d6 100644
--- a/10 - Adding tracks/src/controller/tracks/TracksController.java	
+++ b/10 - Adding tracks/src/controller/tracks/TracksController.java	
@@ -13,12 +13,10 @@
 import javafx.scene.layout.GridPane;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
+import model.ErrorDialog;
 import model.Track;
 
-import java.io.EOFException;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -54,6 +52,11 @@ public class TracksController extends BaseController
 
   private ObservableList<Track> tracksList;
   private Track track;
+  ErrorDialog errorDialog;
+
+  public TracksController() {
+    errorDialog = new ErrorDialog();
+  }
 
   @Override
   public void initialize(URL url, ResourceBundle resourceBundle) {
@@ -71,7 +74,13 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
     tracksList.add(new Track("Aj tak sme frajeri", "Peter Nagy, Indigo"));
      */
 
-    syncTracks();
+    try {
+      syncTracks();
+    } catch (IOException e) {
+      e.printStackTrace();
+    } catch (ClassNotFoundException e) {
+      e.printStackTrace();
+    }
 
     if (tracksList != null) {
       tracksTable.setItems(tracksList);
@@ -101,46 +110,72 @@ private void showDetails(Track track) {
   }
 
   private void registerListeners () {
-    addTrack.defaultButtonProperty().bind(addTrack.focusedProperty());
-    addTrack.setOnAction((e) -> showAdd());
-
     dashboard.defaultButtonProperty().bind(dashboard.focusedProperty());
     dashboard.setOnAction((e) -> switchScene("dashboard"));
 
     logout.defaultButtonProperty().bind(logout.focusedProperty());
     logout.setOnAction((e) -> logout());
 
+    addTrack.defaultButtonProperty().bind(addTrack.focusedProperty());
+    addTrack.setOnAction(e -> {
+      try {
+        showAddDialog();
+      } catch (IOException ex) {
+        errorDialog.display("Chyba s oknami", "Nepodarilo sa otvorit nove okno");
+      }
+    });
+
     refreshBtn.defaultButtonProperty().bind(refreshBtn.focusedProperty());
-    refreshBtn.setOnAction((e) -> syncTracks());
+    refreshBtn.setOnAction(e -> {
+      try {
+        syncTracks();
+      } catch (IOException ex) {
+        ex.printStackTrace();
+      } catch (ClassNotFoundException ex) {
+        ex.printStackTrace();
+      }
+    });
   }
 
-  /**
-   * Shows add dialog using fxml file
-   */
-  public void showAdd() {
+  private void showAddDialog() throws IOException {
+    // System.out.println("Zobrazi sa Add Track Dialog okno");
     FXMLLoader loader = new FXMLLoader();
 
-    try {
-      loader.setLocation(getLocation("tracks/add"));
+    loader.setLocation(getLocation("tracks/add"));
+    GridPane pane = loader.load();
+    Stage addDialog = new Stage();
+    Scene scene = new Scene(pane);
 
-      GridPane pane = loader.load();
-      Scene scene = new Scene(pane);
-      Stage addDialog = new Stage();
+    AddController controller = loader.getController();
+    controller.setDialogStage(addDialog);
 
-      addDialog.setTitle("Pridať skladbu");
-      // addDialog.initOwner((Stage) trackTitle.getScene().getWindow());
+    addDialog.setTitle("Pridať skladbu");
+    addDialog.setScene(scene);
+    addDialog.showAndWait();
+  }
 
-      AddController controller = loader.getController();
-      controller.setDialogStage(addDialog);
+  private void syncTracks () throws IOException, ClassNotFoundException {
+    String dataURL = rootURL + "/data/tracks.txt";
 
-      addDialog.setScene(scene);
-      addDialog.showAndWait();
-    } catch (IOException e) {
-      e.printStackTrace();
+    if (fileExists(dataURL)) {
+      ObjectInputStream is = new ObjectInputStream(new FileInputStream(dataURL));
+
+      tracksTable.getItems().removeAll(tracksList);
+
+      try {
+        while (true) {
+          Track track = (Track) is.readObject();
+          System.out.println(track.getTitle() + ", " + track.getArtist());
+          tracksList.add(track);
+        }
+      } catch (EOFException e) {
+        System.out.println("Koniec suboru");
+      }
+
+      tracksTable.setItems(tracksList);
     }
-  }
 
-  private void syncTracks () {
+    /*
     String fileURL = rootURL + "/data/tracks.txt";
 
     if (fileExists(fileURL)) {
@@ -163,5 +198,6 @@ private void syncTracks () {
 
       tracksTable.setItems(tracksList);
     }
+     */
   }
 }
diff --git a/10 - Adding tracks/src/view/tracks/add.fxml b/10 - Adding tracks/src/view/tracks/add.fxml
index 5f06ee0..c367e8b 100644
--- a/10 - Adding tracks/src/view/tracks/add.fxml	
+++ b/10 - Adding tracks/src/view/tracks/add.fxml	
@@ -14,13 +14,13 @@
 
     <Label id="banner" alignment="CENTER" GridPane.columnIndex="0" GridPane.rowIndex="0" GridPane.columnSpan="3"/>
 
-    <Label text="Názov" alignment="CENTER" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
+    <Label text="Názov" alignment="CENTER" GridPane.columnIndex="1" GridPane.rowIndex="1" />
     <TextField fx:id="title" GridPane.rowIndex="1" GridPane.columnIndex="2" GridPane.columnSpan="2"/>
 
-    <Label text="Interprét" alignment="CENTER" GridPane.rowIndex="5" GridPane.columnIndex="1"/>
+    <Label text="Interprét" alignment="CENTER" GridPane.columnIndex="5" GridPane.rowIndex="1" />
     <TextField fx:id="artist" GridPane.rowIndex="5" GridPane.columnIndex="2" GridPane.columnSpan="2"/>
 
-    <Button fx:id="save" prefWidth="130" text="Uložiť" GridPane.rowIndex="8" GridPane.columnIndex="2"/>
-    <Button fx:id="cancel" prefWidth="130" text="Zrušiť" GridPane.rowIndex="8" GridPane.columnIndex="3"/>
+    <Button fx:id="save" prefWidth="130" text="Uložiž" GridPane.rowIndex="8" GridPane.columnIndex="2" />
+    <Button fx:id="cancel" prefWidth="130" text="Zrušiť" GridPane.rowIndex="8" GridPane.columnIndex="3" />
 
 </GridPane>
diff --git a/10 - Adding tracks/src/view/tracks/all.fxml b/10 - Adding tracks/src/view/tracks/all.fxml
index 05b58d9..6b8674d 100644
--- a/10 - Adding tracks/src/view/tracks/all.fxml	
+++ b/10 - Adding tracks/src/view/tracks/all.fxml	
@@ -31,8 +31,8 @@
 
     <HBox spacing="10" alignment="bottom_left" GridPane.columnIndex="0"
           GridPane.rowIndex="2" GridPane.columnSpan="2" minHeight="50">
-        <Button fx:id="addTrack" prefWidth="120" text="+"/>
-        <Button fx:id="refreshBtn" prefWidth="120" text="Načítať"/>
+        <Button fx:id="addTrack" prefWidth="120" text="Pridať skladbu" />
+        <Button fx:id="refreshBtn" prefWidth="120" text="Načítať" />
         <Button fx:id="dashboard" prefWidth="120" text="Domov"/>
         <Button fx:id="logout" prefWidth="120" text="Odhlásiť sa"/>
     </HBox>
diff --git a/7 - TableView/src/controller/TracksController.java b/7 - TableView/src/controller/TracksController.java
index 6303892..f798a4d 100644
--- a/7 - TableView/src/controller/TracksController.java	
+++ b/7 - TableView/src/controller/TracksController.java	
@@ -6,17 +6,15 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.layout.GridPane;
 import model.Track;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.ResourceBundle;
 
 public class TracksController extends BaseController
 {
   @FXML
-  private TableView<Track> tracksTable;
+  private TableView tracksTable;
 
   @FXML
   private TableColumn<Track, String> title;
@@ -30,29 +28,24 @@ public class TracksController extends BaseController
   @FXML
   private Button logout;
 
-  private ObservableList<Track> tracksList;
+  ObservableList<Track> tracksList;
+
+  @Override
+  public void initialize(URL url, ResourceBundle resourceBundle) {
+    super.initialize(url, resourceBundle);
 
-  public TracksController () {
     tracksList = FXCollections.observableArrayList();
     tracksList.add(new Track("Tame Me Home, Country Roads", "John Denver"));
     tracksList.add(new Track("Iridescent", "Linkin Park"));
     tracksList.add(new Track("Three Little Birds", "Bob Marley & The Wailers"));
     tracksList.add(new Track("Aj tak sme frajeri", "Peter Nagy, Indigo"));
-  }
+    tracksList.add(new Track("Barbie girl", "Aqua"));
 
-  @Override
-  public void initialize(URL url, ResourceBundle resourceBundle) {
-    super.initialize(url, resourceBundle);
+    tracksTable.setItems(tracksList);
 
     title.setCellValueFactory(cellData -> cellData.getValue().getTitleProperty());
     artist.setCellValueFactory(cellData -> cellData.getValue().getArtistProperty());
 
-    if (tracksList != null) {
-      tracksTable.setItems(tracksList);
-    } else {
-      tracksTable.managedProperty().bind(tracksTable.visibleProperty());
-    }
-
     registerListeners();
   }
 
diff --git a/7 - TableView/src/model/Track.java b/7 - TableView/src/model/Track.java
index 4707710..9ac55d0 100644
--- a/7 - TableView/src/model/Track.java	
+++ b/7 - TableView/src/model/Track.java	
@@ -3,14 +3,14 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-/***
- * Definujeme si najprv model Track
- */
 public class Track {
-  // Attribúty nech sú typu String
   private String title;
   private String artist;
 
+  public Track () {
+
+  }
+
   public Track(String title, String artist) {
     this.title = title;
     this.artist = artist;
@@ -20,9 +20,7 @@ public String getTitle() {
     return title;
   }
 
-  // Do tabuľky vstupuje StringProperty
   public StringProperty getTitleProperty() {
-    // StringProperty je abstraktná trieda, preto ju inicializujeme pomocou SimpleStringProperty - konkrétna trieda
     return new SimpleStringProperty(title);
   }
 
@@ -34,14 +32,11 @@ public String getArtist() {
     return artist;
   }
 
-  // Do tabuľky vstupuje StringProperty
   public StringProperty getArtistProperty() {
-    // StringProperty je abstraktná trieda, preto ju inicializujeme pomocou SimpleStringProperty - konkrétna trieda
     return new SimpleStringProperty(artist);
   }
 
   public void setArtist(String artist) {
     this.artist = artist;
   }
-
 }
diff --git a/7 - TableView/src/view/Tracks/All.fxml b/7 - TableView/src/view/Tracks/All.fxml
index 3ced813..9894178 100644
--- a/7 - TableView/src/view/Tracks/All.fxml	
+++ b/7 - TableView/src/view/Tracks/All.fxml	
@@ -15,29 +15,11 @@
 
     <TableView fx:id="tracksTable" GridPane.rowIndex="1" GridPane.columnIndex="1">
         <columns>
-            <TableColumn fx:id="title" prefWidth="300" text="Názov"/>
-            <TableColumn fx:id="artist" prefWidth="300" text="Interprét"/>
+            <TableColumn fx:id="title" prefWidth="200" text="Názov skladby" />
+            <TableColumn fx:id="artist" prefWidth="200" text="Interprét" />
         </columns>
     </TableView>
 
-    <!--
-    <AnchorPane GridPane.rowIndex="1" GridPane.columnIndex="2">
-        <GridPane vgap="10.0" hgap="10.0">
-            <Label text="Odosielateľ - prijímateľ:" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-            <Label fx:id="lblReciever" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
-
-            <Label text="Suma:" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-            <Label fx:id="lblSum" GridPane.columnIndex="2" GridPane.rowIndex="2"/>
-
-            <Label text="Dátum:" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
-            <Label fx:id="lblDate" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
-
-            <Label text="Poznámka:" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
-            <Label fx:id="lblNote" GridPane.columnIndex="2" GridPane.rowIndex="4"/>
-        </GridPane>
-    </AnchorPane>
-    -->
-
     <HBox spacing="10" alignment="bottom_left" GridPane.columnIndex="0"
           GridPane.rowIndex="2" GridPane.columnSpan="2" minHeight="50">
         <Button fx:id="dashboard" prefWidth="120" text="Domov"/>
diff --git a/8 - Handling packages and URLs/src/controller/BaseController.java b/8 - Handling packages and URLs/src/controller/BaseController.java
index 84b0e47..73f41de 100644
--- a/8 - Handling packages and URLs/src/controller/BaseController.java	
+++ b/8 - Handling packages and URLs/src/controller/BaseController.java	
@@ -23,7 +23,6 @@ public abstract class BaseController implements Initializable {
   @Override
   public void initialize(URL url, ResourceBundle resourceBundle) {
     identity = Identity.getInstance();
-
     // Na začiatku si načítame URL
     viewURL = System.getProperty("user.dir") + "/src/view/";
   }
@@ -42,14 +41,6 @@ protected void logout() {
    * @param view scene to be viewed
    * */
   public void switchScene(String view) {
-    /*
-    if (identity != null) {
-      System.out.println("Identity: " + identity.getUsername());
-    } else {
-      System.out.println("No identity");
-    }
-    */
-
     try {
       // Odstránime obsah view, ktorý je momentálne zobrazený
       app.getChildren().clear();
@@ -57,6 +48,7 @@ public void switchScene(String view) {
       // Absolútna URL k danému fxml súboru
       URL fxmlURL = Paths.get(viewURL + view + ".fxml").toUri().toURL();
 
+      System.out.println(fxmlURL.toString());
       // Vymeníme za nový obsah
       app.getChildren().add(FXMLLoader.load(fxmlURL));
     } catch (IOException e) {
diff --git a/9 - Track detail/src/controller/tracks/TracksController.java b/9 - Track detail/src/controller/tracks/TracksController.java
index f558a6e..f0af083 100644
--- a/9 - Track detail/src/controller/tracks/TracksController.java	
+++ b/9 - Track detail/src/controller/tracks/TracksController.java	
@@ -23,10 +23,10 @@
 public class TracksController extends BaseController
 {
   @FXML
-  private Label trackTitle;
+  private Label trackArtist;
 
   @FXML
-  private Label trackArtist;
+  private Label trackTitle;
 
   @FXML
   private TableView<Track> tracksTable;
@@ -44,7 +44,6 @@ public class TracksController extends BaseController
   private Button logout;
 
   private ObservableList<Track> tracksList;
-  private Track track;
 
   public TracksController() {
     tracksList = FXCollections.observableArrayList();
@@ -69,11 +68,24 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
 
     showDetails(null);
 
+    tracksTable.getSelectionModel().selectedItemProperty().addListener(
+      (observable, oldValue, newValue) -> {
+        if (oldValue != null) {
+          System.out.println(oldValue.getTitle() + ", " + oldValue.getArtist());
+        }
+        showDetails(newValue);
+      }
+    );
+
+    /*
+    showDetails(null);
+
     tracksTable.getSelectionModel().selectedItemProperty().addListener(
       (observable, oldValue, newValue) -> {
         showDetails(newValue);
         track = newValue;
     });
+    */
 
     registerListeners();
   }
diff --git a/9 - Track detail/src/view/login.fxml b/9 - Track detail/src/view/login.fxml
index dade149..594648e 100644
--- a/9 - Track detail/src/view/login.fxml	
+++ b/9 - Track detail/src/view/login.fxml	
@@ -12,10 +12,10 @@
        GridPane.columnSpan="2"/>
 
 <Label text="Meno" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-<TextField fx:id="username" GridPane.columnIndex="2" GridPane.rowIndex="1"/>
+<TextField fx:id="username" GridPane.columnIndex="2" GridPane.rowIndex="1" text="admin" />
 
 <Label text="Heslo" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-<PasswordField fx:id="password" GridPane.columnIndex="2" GridPane.rowIndex="2"/>
+<PasswordField fx:id="password" GridPane.columnIndex="2" GridPane.rowIndex="2" text="admin" />
 
 <Button fx:id="authenticate" text="Prihlásiť sa" GridPane.rowIndex="3" GridPane.columnIndex="2"/>
 <Label fx:id="messageBox" GridPane.rowIndex="4" GridPane.columnIndex="1"/>
diff --git a/9 - Track detail/src/view/tracks/all.fxml b/9 - Track detail/src/view/tracks/all.fxml
index 2b187de..3968642 100644
--- a/9 - Track detail/src/view/tracks/all.fxml	
+++ b/9 - Track detail/src/view/tracks/all.fxml	
@@ -20,6 +20,16 @@
         </columns>
     </TableView>
 
+    <AnchorPane GridPane.rowIndex="1" GridPane.columnIndex="2">
+        <GridPane vgap="10" hgap="10">
+            <Label text="Názov:" GridPane.rowIndex="1" GridPane.columnIndex="1" />
+            <Label fx:id="trackTitle" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+            <Label text="Interprét:" GridPane.rowIndex="3" GridPane.columnIndex="1" />
+            <Label fx:id="trackArtist" GridPane.rowIndex="4" GridPane.columnIndex="1" />
+        </GridPane>
+    </AnchorPane>
+
+    <!--
     <AnchorPane GridPane.rowIndex="1" GridPane.columnIndex="2">
         <GridPane vgap="10.0" hgap="10.0">
             <Label text="Názov:" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
@@ -28,6 +38,7 @@
             <Label fx:id="trackArtist" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
         </GridPane>
     </AnchorPane>
+    -->
 
     <HBox spacing="10" alignment="bottom_left" GridPane.columnIndex="0"
           GridPane.rowIndex="2" GridPane.columnSpan="2" minHeight="50">