diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 550cee2..1a7d16c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
         <activity android:name=".Credit"></activity>
         <activity
             android:name=".MainActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -26,7 +25,9 @@
         </activity>
         <activity
             android:name=".GameActivity"
-            android:screenOrientation="landscape">
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:keepScreenOn="true">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/PopupRunable.java b/app/src/main/java/com/iutlaval/myapplication/Game/PopupRunable.java
index 1f72dd5..bde9a23 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/PopupRunable.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/PopupRunable.java
@@ -33,7 +33,7 @@ public class PopupRunable implements Runnable{
     public static void makePopup(Activity activity,int stringId)
     {
         String recivedMessage = activity.getResources().getString(stringId);
-        new PopupRunable(activity,recivedMessage).run();
+        activity.runOnUiThread(new PopupRunable(activity,recivedMessage));
     }
 
     /**
@@ -43,6 +43,6 @@ public class PopupRunable implements Runnable{
      */
     public static void makePopup(Activity activity,String message)
     {
-        new PopupRunable(activity,message).run();
+        activity.runOnUiThread(new PopupRunable(activity,message));
     }
 }
diff --git a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
index 7494de3..8408065 100644
--- a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
+++ b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
@@ -41,13 +41,12 @@ public class GameActivity extends Activity {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         }
 
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         String deck = getIntent().getStringExtra("DECK");
 
         renderer = new Renderer(getBaseContext(),deck,this);
 
-
-
         setContentView(renderer);
     }