diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17f0088..faa25f0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat">
         <activity android:name=".MainActivity"
-            android:screenOrientation="landscape">
+            android:screenOrientation="sensorLandscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
diff --git a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
index 162032a..1414484 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
@@ -1,5 +1,6 @@
 package adrienmalin.pingpoints
 
+import android.content.pm.ActivityInfo
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.text.Html
@@ -9,6 +10,7 @@ import android.os.Build
 import android.text.Spanned
 import android.text.TextUtils.join
 import kotlin.math.abs
+import android.support.design.widget.Snackbar
 
 
 @SuppressWarnings("deprecation")
@@ -42,6 +44,10 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+
         val names: Array<String> = resources.getStringArray(R.array.players_names)
         for ((player, name) in players.zip(names)) {
             player.name = name
@@ -55,6 +61,9 @@ class MainActivity : AppCompatActivity() {
         )
 
         update_ui()
+
+        Snackbar.make(findViewById(R.layout.activity_main), R.string.info, Snackbar.LENGTH_LONG)
+                .show()
     }
 
     fun update_ui() {
@@ -87,16 +96,15 @@ class MainActivity : AppCompatActivity() {
     fun updateScore(scoringPlayerId: Int) {
         players[scoringPlayerId].score++
 
-        if (players.sumBy { it.score } % 2 == 0) {
-            server = notServer.also { notServer = server }
-        }
-
-        update_ui()
-
         if (
-                (players.map { it -> it.score } .max() ?: 0 >= 11) and
-                (abs(players[0].score - players[1].score) >= 2)
+                (players.map { it -> it.score } .max() ?: 0 < 11) or
+                (abs(players[0].score - players[1].score) < 2)
         ) {
+            if (players.sumBy { it.score } % 2 == 0) {
+                server = notServer.also { notServer = server }
+            }
+            update_ui()
+        } else {
             endOfMatch()
         }
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cc10edb..f595357 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -83,7 +83,6 @@
                 android:layout_weight="1"
                 android:bufferType="spannable"
                 android:onClick="onClickPlayer1"
-                android:text="Button"
                 android:textAllCaps="false"
                 android:textAppearance="@style/TextAppearance.AppCompat.Button"
                 android:textSize="24sp"
@@ -108,7 +107,6 @@
                 android:layout_weight="1"
                 android:bufferType="spannable"
                 android:onClick="onClickPlayer2"
-                android:text="Button"
                 android:textAllCaps="false"
                 android:textAppearance="@style/TextAppearance.AppCompat.Button"
                 android:textSize="24sp"