diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a3ee35e..c5a1658 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,6 +23,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".CardListActivity">
+            <intent-filter>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogue.java b/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogueGame.java
similarity index 66%
rename from app/src/main/java/com/iutlaval/myapplication/DeckPickDialogue.java
rename to app/src/main/java/com/iutlaval/myapplication/DeckPickDialogueGame.java
index f00b123..84df489 100644
--- a/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogue.java
+++ b/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogueGame.java
@@ -10,9 +10,9 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
-public class DeckPickDialogue extends DialogFragment {
+public class DeckPickDialogueGame extends DialogFragment {
     Context context;
-    public DeckPickDialogue(@NonNull Context context) {
+    public DeckPickDialogueGame(@NonNull Context context) {
         this.context=context;
     }
 
@@ -26,14 +26,19 @@ public class DeckPickDialogue extends DialogFragment {
                         // of the selected item
                         String[] mTestArray = getResources().getStringArray(R.array.decks);
 
-                        Intent gameActivity = new Intent(context, GameActivity.class);
-                        gameActivity.putExtra("DECK", mTestArray[which]);
-                        gameActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                        startActivity(mTestArray, which);
 
-                        startActivity(gameActivity);
                     }
                 });
         return builder.create();
     }
 
+    public void startActivity(String[] mTestArray, int which) {
+        Intent gameActivity = new Intent(context, GameActivity.class);
+        gameActivity.putExtra("DECK", mTestArray[which]);
+        gameActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+        startActivity(gameActivity);
+    }
+
 }
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
index df57ac9..1cd95db 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
@@ -17,9 +17,10 @@ public abstract class Card {
      * @param UID
      * @param c
      */
-    public Card(String UID,Context c)
-    {
-        drawableCard = new DrawableCard(this,0,0,UID,c);
+    public Card(String UID,Context c) {
+        if(!(UID == null || c == null)) {
+            drawableCard = new DrawableCard(this, 0, 0, UID, c);
+        }
     }
 
     /**
diff --git a/app/src/main/java/com/iutlaval/myapplication/MainActivity.java b/app/src/main/java/com/iutlaval/myapplication/MainActivity.java
index 4fb7d45..abef5f0 100644
--- a/app/src/main/java/com/iutlaval/myapplication/MainActivity.java
+++ b/app/src/main/java/com/iutlaval/myapplication/MainActivity.java
@@ -1,10 +1,6 @@
 package com.iutlaval.myapplication;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -26,15 +22,30 @@ public class MainActivity extends AppCompatActivity {
         playButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 //Toast.makeText(getApplicationContext(), "click sur button", Toast.LENGTH_LONG).show();
-                pickDeck();
+                pickDeckGame();
             }
         });
+
+        final Button cardButton = (Button) findViewById(R.id.cardButton);
+        cardButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                //Toast.makeText(getApplicationContext(), "click sur button", Toast.LENGTH_LONG).show();
+                pickDeckList();
+            }
+        });
+
     }
 
-    private String pickDeck() {
-        DialogFragment d = new DeckPickDialogue(this);
+    private String pickDeckGame() {
+        DialogFragment d = new DeckPickDialogueGame(this);
         d.show(getSupportFragmentManager(),"s");
 
+        return "demodeck";
+    }
+
+    private String pickDeckList() {
+        DialogFragment d = new DeckPickDialogueList(this);
+        d.show(getSupportFragmentManager(),"s");
 
         return "demodeck";
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 64c06d0..7e03454 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -27,16 +27,16 @@
         android:layout_width="400dp"
         android:layout_height="wrap_content"
         android:fontFamily="@font/alfa_slab_one"
-        android:text="Info Battlecard"
+        android:text="Le Choc des Histoires"
         android:textAlignment="center"
         android:textColor="#A6FF9800"
-        android:textSize="36sp"
+        android:textSize="30sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_bias="0.454"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.702" />
+        app:layout_constraintVertical_bias="0.672" />
 
     <Button
         android:id="@+id/playButton"
@@ -46,13 +46,13 @@
         android:textScaleX="1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_bias="0.501"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.43" />
+        app:layout_constraintVertical_bias="0.409" />
 
     <Button
-        android:id="@+id/button"
+        android:id="@+id/cardButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c07ae9..bfbeebd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
-    <string name="app_name">MON JE</string>
+    <string name="app_name">Le Choc des Histoires</string>
     <string name="title_item_list">Items</string>
     <string name="title_item_detail">Item Detail</string>
-    <string name="pickdeck">Choisisez votre deck</string>
+    <string name="pickdeck">Choisissez votre deck</string>
 </resources>
\ No newline at end of file