diff --git a/Implementation/chatapp/.idea/chatapp.iml b/Implementation/chatapp/.idea/chatapp.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/Implementation/chatapp/.idea/chatapp.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/Implementation/chatapp/.idea/libraries/mysql_connector_java_8_0_22.xml b/Implementation/chatapp/.idea/libraries/mysql_connector_java_8_0_22.xml
new file mode 100644
index 0000000..8a0367c
--- /dev/null
+++ b/Implementation/chatapp/.idea/libraries/mysql_connector_java_8_0_22.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="mysql-connector-java-8.0.22">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/Downloads/mysql-connector-java-8.0.22.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/Implementation/chatapp/.idea/modules/chatapp.iml b/Implementation/chatapp/.idea/modules/chatapp.iml
index 73cec4e..612440a 100644
--- a/Implementation/chatapp/.idea/modules/chatapp.iml
+++ b/Implementation/chatapp/.idea/modules/chatapp.iml
@@ -8,5 +8,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="mysql-connector-java-8.0.22" level="project" />
+    <orderEntry type="library" name="lib" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
index 6428c35..d62e2f3 100644
--- a/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
+++ b/Implementation/chatapp/build/tmp/compileJava/source-classes-mapping.txt
@@ -1,45 +1,39 @@
+chatapp/Protocol/RunnerEcouteTCP.java
+ chatapp.Protocol.RunnerEcouteTCP
+chatapp/View/DemarrerSession.java
+ chatapp.View.DemarrerSession
+chatapp/Controller/ChatApp.java
+ chatapp.Controller.ChatApp
+chatapp/Model/DataBase.java
+ chatapp.Model.DataBase
+chatapp/Model/Utilisateur.java
+ chatapp.Model.Utilisateur
+chatapp/Protocol/RunnerEcouteUDP.java
+ chatapp.Protocol.RunnerEcouteUDP
 chatapp/Launcher.java
  chatapp.Launcher
 chatapp/Model/ListUtilisateurs.java
  chatapp.Model.ListUtilisateurs
-chatapp/Model/Utilisateur.java
- chatapp.Model.Utilisateur
-chatapp/Model/Historique.java
- chatapp.Model.Historique
-chatapp/Model/MessageHorodate.java
- chatapp.Model.MessageHorodate
-chatapp/View/View_Menu.java
- chatapp.View.View_Menu
-chatapp/Protocol/RunnerEcouteTCP.java
- chatapp.Protocol.RunnerEcouteTCP
-chatapp/View/FenetreSession.java
- chatapp.View.FenetreSession
- chatapp.View.FenetreSession$1
-chatapp/View/DemarrerSession.java
- chatapp.View.DemarrerSession
-chatapp/View/ChangementPseudo.java
- chatapp.View.ChangementPseudo
-chatapp/Protocol/RunnerEcouteUDP.java
- chatapp.Protocol.RunnerEcouteUDP
-chatapp/Protocol/TCPEchange.java
- chatapp.Protocol.RunnerTCPEcoute
- chatapp.Protocol.RunnerTCPEnvoi
- chatapp.Protocol.TCPEchange
 chatapp/Protocol/UDPEchange.java
  chatapp.Protocol.RunnerUDP
  chatapp.Protocol.UDPEchange
+chatapp/Model/MessageHorodate.java
+ chatapp.Model.MessageHorodate
 chatapp/Main.java
  chatapp.Main
-chatapp/View/Clavardage.java
- chatapp.View.Clavardage
- chatapp.View.Clavardage$1
+chatapp/View/View_Menu.java
+ chatapp.View.View_Menu
 chatapp/Protocol/SessionClavardage.java
  chatapp.Protocol.SessionClavardage
 chatapp/View/ConnexionScreen.java
  chatapp.View.ConnexionScreen
 chatapp/View/View_Utilisateurs.java
  chatapp.View.View_Utilisateurs
-chatapp/Controller/ChatApp.java
- chatapp.Controller.ChatApp
-chatapp/Model/DataBase.java
- chatapp.Model.DataBase
+chatapp/View/ChangementPseudo.java
+ chatapp.View.ChangementPseudo
+chatapp/View/FenetreSession.java
+ chatapp.View.FenetreSession
+ chatapp.View.FenetreSession$1
+chatapp/View/Clavardage.java
+ chatapp.View.Clavardage
+ chatapp.View.Clavardage$1
diff --git a/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java b/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java
index d068243..28b182e 100644
--- a/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java
+++ b/Implementation/chatapp/src/main/java/chatapp/Model/DataBase.java
@@ -1,8 +1,6 @@
 package chatapp.Model;
-import java.io.IOException;
+
 import java.sql.*;
-import java.util.Date;
-import java.sql.DriverManager;
 
 public class DataBase {
     private String DBurl = "jdbc:mysql://srv-bdens.insa-toulouse.fr:3306" ;
diff --git a/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java b/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java
index 51ccf41..a2f8d27 100644
--- a/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java
+++ b/Implementation/chatapp/src/main/java/chatapp/View/ChangementPseudo.java
@@ -82,6 +82,6 @@ public class ChangementPseudo {
     void initialize() {
        chatApp = ChatApp.getInstance();
        pseudonyme1.setText(chatApp.getMe().getPseudo());
-
+       this.validationButton.setDefaultButton(true);
     }
 }
\ No newline at end of file
diff --git a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java
index c02623f..1992220 100644
--- a/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java
+++ b/Implementation/chatapp/src/main/java/chatapp/View/Clavardage.java
@@ -104,5 +104,7 @@ public class Clavardage implements Initializable, PropertyChangeListener {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        EnvoyerButton.setDefaultButton(true);
+        this.ChatText.setEditable(false);
     }
 }
\ No newline at end of file
diff --git a/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java b/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java
index a8043bb..708ec8a 100644
--- a/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java
+++ b/Implementation/chatapp/src/main/java/chatapp/View/ConnexionScreen.java
@@ -30,6 +30,7 @@ public class ConnexionScreen {
 
     @FXML // This method is called by the FXMLLoader when initialization is complete
     void initialize() {
+        connexionButton.setDefaultButton(true);
 
     }