diff --git a/graphical-app/pom.xml b/graphical-app/pom.xml
index c994893..46d3508 100644
--- a/graphical-app/pom.xml
+++ b/graphical-app/pom.xml
@@ -74,7 +74,7 @@
             <!-- Default configuration for running with: mvn clean javafx:run -->
             <id>default-cli</id>
             <configuration>
-              <mainClass>fr.emiko.graphicalapp/fr.emiko.graphicalapp.HelloApplication</mainClass>
+              <mainClass>fr.emiko.graphicalapp/fr.emiko.graphicalapp.DrawApplication</mainClass>
               <launcher>app</launcher>
               <jlinkZipName>app</jlinkZipName>
               <jlinkImageName>app</jlinkImageName>
diff --git a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java
similarity index 75%
rename from graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java
rename to graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java
index a94a336..4b3b9b8 100644
--- a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloApplication.java
+++ b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java
@@ -7,10 +7,10 @@ import javafx.stage.Stage;
 
 import java.io.IOException;
 
-public class HelloApplication extends Application {
+public class DrawApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml"));
+        FXMLLoader fxmlLoader = new FXMLLoader(DrawApplication.class.getResource("draw-view.fxml"));
         Scene scene = new Scene(fxmlLoader.load(), 1280, 720);
         stage.setTitle("PixelWriter");
         stage.setScene(scene);
diff --git a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java
similarity index 96%
rename from graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java
rename to graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java
index 5d9e2df..1425719 100644
--- a/graphical-app/src/main/java/fr/emiko/graphicalapp/HelloController.java
+++ b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawController.java
@@ -6,14 +6,12 @@ import fr.emiko.net.DrawClient;
 import fr.emiko.net.DrawServer;
 import fr.emiko.net.Event;
 import fr.emiko.net.User;
-import javafx.beans.binding.Bindings;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
-import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.control.*;
@@ -25,13 +23,11 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.Priority;
 import javafx.scene.paint.Color;
 import fr.emiko.graphicsElement.Stroke;
-import javafx.scene.robot.Robot;
 import javafx.scene.transform.Scale;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import org.json.JSONObject;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -40,7 +36,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class HelloController implements Initializable {
+public class DrawController implements Initializable {
     private final Pattern hostPortPattern = Pattern.compile("^([-.a-zA-Z0-9]+)(?::([0-9]{1,5}))?$");
     public Canvas drawingCanvas;
     public MenuItem saveButton;
@@ -309,15 +305,10 @@ public class HelloController implements Initializable {
             if (controller.isOk()) {
                 //drawingCanvas = new Canvas(controller.getCanvasWidth(), controller.getCanvasHeight());
                 //setupCanvas();
-                System.out.println(controller.getCanvasHeight());
-                System.out.println(controller.getCanvasWidth());
+                layerObservableList.clear();
                 drawingCanvas.setWidth(controller.getCanvasWidth());
                 drawingCanvas.setHeight(controller.getCanvasHeight());
-                drawingCanvas.getGraphicsContext2D().setFill(Color.WHITE);
-                drawingCanvas.getGraphicsContext2D().fillRect(0, 0, drawingCanvas.getWidth(), drawingCanvas.getHeight());
-                drawingCanvas.getGraphicsContext2D().fill();
-                pane.setScaleX(1);
-                pane.setScaleY(1);
+                clearDrawingCanvas();
                 client.sendEvent(new Event(Event.ADDCANVAS, new JSONObject().put("width", drawingCanvas.getWidth()).put("height", drawingCanvas.getHeight())));
                 System.out.println("New canvas created");
             }
@@ -431,15 +422,22 @@ public class HelloController implements Initializable {
     }
 
     private void doAddCanvas(JSONObject content) {
+        layerObservableList.clear();
         drawingCanvas.setWidth(content.getDouble("width"));
         drawingCanvas.setHeight(content.getDouble("height"));
+        clearDrawingCanvas();
+
+        setupCanvas(drawingCanvas);
+    }
+
+    private void clearDrawingCanvas() {
         drawingCanvas.getGraphicsContext2D().setFill(Color.WHITE);
         drawingCanvas.getGraphicsContext2D().fillRect(0, 0, drawingCanvas.getWidth(), drawingCanvas.getHeight());
         drawingCanvas.getGraphicsContext2D().fill();
         pane.setScaleX(1);
         pane.setScaleY(1);
-
-        setupCanvas(drawingCanvas);
+        layerObservableList.add(drawingCanvas);
+        layerListView.refresh();
     }
 
     private void doDeleteLine(JSONObject content) {
diff --git a/graphical-app/src/main/java/fr/emiko/net/DrawClient.java b/graphical-app/src/main/java/fr/emiko/net/DrawClient.java
index 997f701..6604397 100644
--- a/graphical-app/src/main/java/fr/emiko/net/DrawClient.java
+++ b/graphical-app/src/main/java/fr/emiko/net/DrawClient.java
@@ -1,15 +1,15 @@
 package fr.emiko.net;
 
-import fr.emiko.graphicalapp.HelloController;
+import fr.emiko.graphicalapp.DrawController;
 import javafx.application.Platform;
 import org.json.JSONObject;
 
 import java.io.IOException;
 
 public class DrawClient extends ClientTCP{
-    private final HelloController listener;
+    private final DrawController listener;
 
-    public DrawClient(String host, int port, HelloController listener) throws IOException {
+    public DrawClient(String host, int port, DrawController listener) throws IOException {
         super(host, port);
         this.listener = listener;
     }
diff --git a/graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml b/graphical-app/src/main/resources/fr/emiko/graphicalapp/draw-view.fxml
similarity index 99%
rename from graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml
rename to graphical-app/src/main/resources/fr/emiko/graphicalapp/draw-view.fxml
index bbb4cef..d28da7c 100644
--- a/graphical-app/src/main/resources/fr/emiko/graphicalapp/hello-view.fxml
+++ b/graphical-app/src/main/resources/fr/emiko/graphicalapp/draw-view.fxml
@@ -20,7 +20,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
-<VBox alignment="CENTER" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.emiko.graphicalapp.HelloController">
+<VBox alignment="CENTER" xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.emiko.graphicalapp.DrawController">
    <children>
       <MenuBar VBox.vgrow="NEVER">
          <menus>