diff --git a/Sources/dafl_project_flutter/assets/images/EmptyDiscovery-Hint.png b/Sources/dafl_project_flutter/assets/images/EmptyDiscovery-Hint.png
index 4cf47a2..8fd7351 100644
Binary files a/Sources/dafl_project_flutter/assets/images/EmptyDiscovery-Hint.png and b/Sources/dafl_project_flutter/assets/images/EmptyDiscovery-Hint.png differ
diff --git a/Sources/dafl_project_flutter/lib/model/user.dart b/Sources/dafl_project_flutter/lib/model/user.dart
index b39ed09..2951e1d 100644
--- a/Sources/dafl_project_flutter/lib/model/user.dart
+++ b/Sources/dafl_project_flutter/lib/model/user.dart
@@ -1,4 +1,5 @@
 import 'package:dafl_project_flutter/main.dart';
+import 'package:dafl_project_flutter/model/message.dart';
 
 import 'conversation.dart';
 import 'music.dart';
@@ -19,10 +20,13 @@ class User{
 
   User.fromDatabase(this.idDafl, this.usernameDafl);
 
-
   //lists
   Set<User> likedUsers={};
   List<Music> Discovery=[];
+  List<Conversation> waitingConv=[];
+  List<Conversation> confirmConv=[];
+
+  Music currentSong = Music('Couleurs','Khali','https://khaligidilit.com/assets/images/cover-LAI%CC%88LA-Khali.jpeg');
 
   List<Music> Spots=[
     Music('Couleurs','Khali','https://khaligidilit.com/assets/images/cover-LAI%CC%88LA-Khali.jpeg'),
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
index 81be0e6..30580f7 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
@@ -48,6 +48,7 @@ class _ConversationPageState extends State<ConversationPage> {
               height: height*0.92,
               width: double.infinity,
               child: ListView(
+                reverse: true,
                 scrollDirection: Axis.vertical,
                 children: [
                   Message('Adolescebat autem obstinatum propositum erga haec et similia multa scrutanda, stimulos admovente regina, quae abrupte mariti fortunas trudebat in exitium praeceps, cum eum potius lenitate feminea ad veritatis humanitatisque viam reducere utilia suadendo deberet, ut in Gordianorum actibus factitasse Maximini truculenti illius imperatoris rettulimus coniugem.', 0),
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart
index 0028281..4926b0f 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_discovery.dart
@@ -83,7 +83,7 @@ class _DiscoveryListState extends State<DiscoveryList> {
         itemBuilder: (context, index){
           int itemCount = MyApp().controller.currentUser.Discovery.length ?? 0;
           int reversedIndex = itemCount - 1 - index;
-          return Container(
+          return Dismissible(key: Key(MyApp().controller.currentUser.Discovery[reversedIndex].name), child: Container(
               margin: EdgeInsets.fromLTRB(0, 10, 0, 0),
               padding: EdgeInsets.fromLTRB(30, 0, 30, 0),
               child: Column(
@@ -123,7 +123,10 @@ class _DiscoveryListState extends State<DiscoveryList> {
                 ],
               )
 
-          );
+          ), onDismissed: (direction) {
+            MyApp().controller.currentUser.Discovery.removeAt(reversedIndex);
+          },
+          background: Container(color: Colors.red,),);
         }
     ), onRefresh: () async {
       refreshList();
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart
index 3c5db1a..6b9e4ea 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_messages.dart
@@ -134,7 +134,7 @@ class MessagesButtonWidget extends StatelessWidget{
 
             Container(
               color: Colors.transparent,
-              margin: EdgeInsets.fromLTRB(0, 5, 0, 0),
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
               child: Row(
                 children: [
                   Container(
diff --git a/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart b/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart
index d646b4d..d6413fa 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/sign_in/p_sign_in.dart
@@ -1,4 +1,5 @@
 import 'dart:ui';
+import 'package:dafl_project_flutter/views/pages/main/p_main.dart';
 import 'package:flutter/material.dart';
 import 'package:page_transition/page_transition.dart';
 import '../../../main.dart';
@@ -169,18 +170,7 @@ class _SignInPageState extends State<SignInPage> {
                     highlightColor: Colors.grey.shade100,
                     splashColor: Color(0xFF406DE1),
                     onTap: (){
-                      if(passwordTextField.text != "" && userNameTextField.text != ""){
-                        MyApp().controller.changeCurrentUser(MyApp().controller.createUser(userNameTextField.text, passwordTextField.text));
-                        Navigator.of(context).push(
-                          PageTransition(
-                              type: PageTransitionType.fade,
-                              childCurrent: widget,
-                              child: Splash()),
-                        );
-                      }
-                      else{
-                        print('probleme connexion');
-                      }
+                      checkInformations(userNameTextField.text, passwordTextField.text);
                     },
                     child:Ink(
                       child: Align(
@@ -237,4 +227,23 @@ class _SignInPageState extends State<SignInPage> {
       ),
     );
   }
+
+  void checkInformations(String username,String password){
+    if(username ==""){
+      errorNotify(2, context);
+    }
+    else if(password ==""){
+      errorNotify(4, context);
+    }
+    else{
+      MyApp().controller.changeCurrentUser(MyApp().controller.createUser(userNameTextField.text, passwordTextField.text));
+      Navigator.of(context).push(
+        PageTransition(
+            type: PageTransitionType.fade,
+            childCurrent: widget,
+            child: Splash()),
+      );
+
+      }
+  }
 }