diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index b5e3304..45e1a78 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -63,6 +63,7 @@
                                           <PersistentState>
                                             <option name="values">
                                               <map>
+                                                <entry key="scalingPercent" value="90" />
                                                 <entry key="trimmed" value="true" />
                                               </map>
                                             </option>
@@ -74,8 +75,8 @@
                                   <option name="values">
                                     <map>
                                       <entry key="backgroundAssetType" value="COLOR" />
-                                      <entry key="backgroundColor" value="ffffff" />
-                                      <entry key="foregroundImage" value="C:\Users\adima\AndroidStudioProjects\PingPoints\app\src\main\res\drawable\icon.xml" />
+                                      <entry key="backgroundColor" value="3c3a41" />
+                                      <entry key="foregroundImage" value="C:\Users\adima\AndroidStudioProjects\PingPoints\app\src\main\res\drawable\ic_ping_pong_table.xml" />
                                     </map>
                                   </option>
                                 </PersistentState>
@@ -132,8 +133,8 @@
                             <entry key="assetSourceType" value="FILE" />
                             <entry key="autoMirrored" value="true" />
                             <entry key="color" value="ffffff" />
-                            <entry key="outputName" value="ic_right_service" />
-                            <entry key="sourceFile" value="C:\Users\adima\Downloads\table-tennis (1).svg" />
+                            <entry key="outputName" value="ic_ping_pong_table" />
+                            <entry key="sourceFile" value="C:\Users\adima\Downloads\ping-pong (3).svg" />
                           </map>
                         </option>
                       </PersistentState>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 930fc9c..9797dbf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,11 +8,11 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/PingPoints">
+        android:theme="@style/Theme.AppCompat.NoActionBar">
         <activity
             android:name=".MainActivity"
             android:screenOrientation="sensorLandscape"
-            android:theme="@style/PingPoints">
+            android:theme="@style/Theme.AppCompat.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -20,7 +20,7 @@
         </activity>
         <activity
             android:name=".CreditsActivity"
-            android:theme="@style/PingPoints">
+            android:theme="@style/Theme.AppCompat.NoActionBar">
         </activity>
     </application>
 
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index 638e0d3..f334783 100644
Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt b/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt
index 96b2261..e3bb4df 100644
--- a/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt
@@ -62,12 +62,12 @@ class EndOfMatchDialog: DialogFragment() {
                         startActivity(sendIntent)
                     }
             )
-            setNegativeButton(
+            /*setNegativeButton(
                     R.string.quit_button,
                     DialogInterface.OnClickListener { dialog, id ->
                         activity?.finish()
                     }
-            )
+            )*/
         }.create()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/adrienmalin/pingpoints/StarterNameDialog.kt b/app/src/main/java/adrienmalin/pingpoints/StarterNameDialog.kt
index 205e49e..ed6b802 100644
--- a/app/src/main/java/adrienmalin/pingpoints/StarterNameDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/StarterNameDialog.kt
@@ -47,7 +47,7 @@ class StarterNameDialog : DialogFragment() {
             setView(namesView)
             setPositiveButton(R.string.go_button) { dialog, id ->
                 mainActivity?.setStarterName(
-                        when ((namesView.findViewById(R.id.radioGroup) as RadioGroup)?.checkedRadioButtonId) {
+                        when ((namesView.findViewById(R.id.radioGroup) as RadioGroup).checkedRadioButtonId) {
                             R.id.radioLeftPlayer -> Side.LEFT
                             else -> Side.RIGHT
                         },
@@ -55,7 +55,7 @@ class StarterNameDialog : DialogFragment() {
                 )
                 dismiss()
             }
-            setNegativeButton(R.string.quit_button) { dialog, id -> activity?.finish() }
+            //setNegativeButton(R.string.quit_button) { dialog, id -> activity?.finish() }
         }.create()
     }
 }
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 86e83ec..6d1def1 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,26 +1,15 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="108dp"
         android:height="108dp"
-        android:viewportWidth="837.8182"
-        android:viewportHeight="837.8182">
-    <group android:translateX="162.90909"
-            android:translateY="162.90909">
-        <path android:fillColor="#4BC999" android:pathData="M512,256c0,12.037 -0.836,23.886 -2.445,35.485c-0.366,2.644 -0.763,5.266 -1.212,7.889c-1.285,7.544 -2.905,14.984 -4.848,22.298c-1.066,4.033 -2.226,8.014 -3.48,11.964c-1.264,3.992 -2.633,7.952 -4.096,11.86c-1.661,4.462 -3.448,8.871 -5.35,13.218c-3.783,8.62 -8.025,16.99 -12.706,25.078c-2.456,4.253 -5.026,8.432 -7.722,12.539c-1.578,2.414 -3.197,4.786 -4.859,7.137c-1.285,1.818 -2.591,3.615 -3.918,5.402c-43.593,58.483 -111.595,97.708 -188.907,102.609C267.013,511.822 261.527,512 256,512c-5.527,0 -11.013,-0.178 -16.457,-0.522c-79.684,-5.047 -149.462,-46.561 -192.836,-108.032c-1.661,-2.351 -3.281,-4.723 -4.859,-7.126C31.472,380.52 22.8,363.51 16.102,345.537c-2.936,-7.837 -5.486,-15.851 -7.638,-24.022c-1.923,-7.272 -3.532,-14.66 -4.807,-22.162c-0.449,-2.623 -0.857,-5.245 -1.212,-7.889C0.825,279.876 0,268.037 0,256c0,-1.317 0.01,-2.633 0.031,-3.939c0.021,-1.087 0.042,-2.173 0.073,-3.25c0.042,-1.714 0.104,-3.427 0.188,-5.12c0.125,-2.55 0.282,-5.089 0.481,-7.617c0.533,-7.032 1.358,-13.981 2.456,-20.846c0.993,-6.217 2.215,-12.372 3.657,-18.432c1.275,-5.423 2.738,-10.773 4.357,-16.05C43.384,76.079 140.81,0 256,0s212.616,76.079 244.757,180.746c3.438,11.191 6.134,22.706 8.014,34.482c1.097,6.865 1.923,13.814 2.456,20.846c0.199,2.529 0.355,5.068 0.481,7.617c0.136,2.779 0.219,5.569 0.261,8.38C511.99,253.377 512,254.683 512,256z"/>
-        <path android:fillColor="#5BD3A2" android:pathData="M500.015,333.636c-1.264,3.992 -2.633,7.952 -4.096,11.86c-1.661,4.462 -3.448,8.871 -5.35,13.218H464.52c-6.917,0 -12.539,5.611 -12.539,12.539c0,6.928 5.622,12.539 12.539,12.539h13.343c-2.456,4.253 -5.026,8.432 -7.722,12.539c-1.578,2.414 -3.197,4.786 -4.859,7.137c-1.285,1.818 -2.591,3.615 -3.918,5.402h-56.048c-3.459,0 -6.593,-1.4 -8.861,-3.668c-2.278,-2.278 -3.678,-5.413 -3.678,-8.871c0,-6.928 -5.611,-12.539 -12.539,-12.539h-59.904c-3.459,0 -6.593,-1.4 -8.871,-3.668c-2.267,-2.278 -3.668,-5.413 -3.668,-8.871c0,-6.928 5.611,-12.539 12.539,-12.539h40.406c3.459,0 6.593,-1.4 8.861,-3.668c2.278,-2.278 3.678,-5.413 3.678,-8.871c0,-6.917 5.611,-12.539 12.539,-12.539H500.015z"/>
-        <path android:fillColor="#5BD3A2" android:pathData="M150.246,259.49c0,6.928 -5.611,12.539 -12.539,12.539H18.599c-3.469,0 -6.604,-1.4 -8.871,-3.668c-2.267,-2.278 -3.668,-5.413 -3.668,-8.871c0,-4.514 -2.382,-8.464 -5.956,-10.679c0.042,-1.714 0.104,-3.427 0.188,-5.12c0.125,-2.55 0.282,-5.089 0.481,-7.617c0.533,-7.032 1.358,-13.981 2.456,-20.846c0.993,-6.217 2.215,-12.372 3.657,-18.432h111.313c3.469,0 6.604,1.4 8.871,3.668c2.267,2.278 3.668,5.413 3.668,8.871c0,6.928 -5.611,12.539 -12.539,12.539H77.803c-6.928,0 -12.539,5.611 -12.539,12.539c0,6.928 5.611,12.539 12.539,12.539h59.904c3.459,0 6.593,1.4 8.871,3.668C148.846,252.897 150.246,256.031 150.246,259.49z"/>
-        <path android:fillColor="#FCF8F2" android:pathData="M272.457,157.236v354.241C267.013,511.822 261.527,512 256,512c-5.527,0 -11.013,-0.178 -16.457,-0.522V157.236H272.457z"/>
-        <path android:fillColor="#F9EED7" android:pathData="M503.495,286.208v-39.267c2.623,2.038 5.475,3.762 8.474,5.13c-0.042,-2.811 -0.125,-5.601 -0.261,-8.38c-3.385,-2.006 -6.468,-4.566 -9.101,-7.638l-2.79,-3.176l-2.748,3.208c-6.949,8.088 -17.042,12.727 -27.7,12.727c-10.668,0 -20.762,-4.639 -27.753,-12.79l-2.8,-3.114l-2.727,3.176c-6.938,8.088 -17.032,12.727 -27.7,12.727c-10.658,0 -20.752,-4.639 -27.721,-12.758l-2.779,-3.187l-2.759,3.208c-6.949,8.098 -17.042,12.737 -27.7,12.737c-10.668,0 -20.762,-4.639 -27.753,-12.79l-2.581,-2.894l-2.738,2.738l-0.188,0.209c-6.949,8.088 -17.042,12.737 -27.711,12.737c-10.658,0 -20.752,-4.639 -27.7,-12.737l-2.769,-3.041l-2.706,2.957l-0.084,0.084c-6.949,8.098 -17.042,12.737 -27.7,12.737c-10.668,0 -20.762,-4.639 -27.7,-12.737l-2.884,-3.124l-2.685,3.124c-6.938,8.098 -17.032,12.737 -27.7,12.737c-10.658,0 -20.752,-4.639 -27.7,-12.737l-2.654,-2.915l-2.717,2.717l-0.188,0.199c-6.949,8.098 -17.042,12.737 -27.7,12.737c-10.668,0 -20.762,-4.639 -27.7,-12.737l-2.685,-2.894l-2.685,2.685l-0.188,0.209c-6.949,8.088 -17.042,12.737 -27.711,12.737c-10.658,0 -20.752,-4.65 -27.7,-12.737l-2.978,-2.999l-2.57,2.999c-2.623,3.051 -5.684,5.611 -9.059,7.617c-0.136,2.769 -0.219,5.559 -0.261,8.37c2.988,-1.369 5.82,-3.093 8.432,-5.12v39.278c-1.818,1.975 -3.845,3.73 -6.019,5.245c0.355,2.644 0.763,5.266 1.212,7.889c1.672,-0.972 3.271,-2.048 4.807,-3.239v25.401c2.152,8.171 4.702,16.185 7.638,24.022c7.555,5.747 16.833,8.934 26.499,8.934c9.812,0 19.205,-3.281 26.833,-9.195v39.288C62.527,392.056 52.83,396.33 42.6,396.33c-0.251,0 -0.502,0 -0.752,-0.01c1.578,2.403 3.197,4.775 4.859,7.126c4.274,-0.397 8.432,-1.421 12.361,-3.009c5.172,-2.1 9.937,-5.183 14.012,-9.132c8.14,7.889 19.038,12.34 30.49,12.34c11.463,0 22.392,-4.472 30.48,-12.33c8.14,7.879 19.038,12.33 30.48,12.33c11.421,0 22.309,-4.43 30.48,-12.34c8.14,7.889 19.038,12.34 30.49,12.34c5.716,0 11.295,-1.108 16.468,-3.208c5.172,-2.1 9.937,-5.183 14.012,-9.132c8.14,7.889 19.038,12.34 30.48,12.34c11.431,0 22.319,-4.441 30.48,-12.34c8.14,7.889 19.038,12.34 30.49,12.34c11.442,0 22.34,-4.451 30.48,-12.34c8.14,7.889 19.038,12.351 30.48,12.351c11.431,0 22.319,-4.441 30.49,-12.351c7.158,6.949 16.468,11.233 26.405,12.163c1.661,-2.351 3.281,-4.723 4.859,-7.137c-0.261,0.01 -0.512,0.01 -0.773,0.01c-10.23,0 -19.937,-4.284 -26.843,-11.786v-39.267c7.617,5.904 17.021,9.195 26.843,9.195c9.686,0 18.986,-3.208 26.551,-8.986c2.905,-7.774 5.434,-15.715 7.576,-23.824v-25.558c1.546,1.191 3.166,2.288 4.848,3.26c0.449,-2.623 0.846,-5.245 1.212,-7.889C507.371,289.97 505.334,288.204 503.495,286.208zM69.433,335.391c-6.907,7.481 -16.603,11.766 -26.833,11.766c-10.219,0 -19.916,-4.274 -26.823,-11.766v-39.278c7.617,5.904 17.021,9.185 26.823,9.185c9.812,0 19.216,-3.281 26.833,-9.185V335.391zM69.433,286.208C62.527,293.7 52.83,297.984 42.6,297.984c-10.219,0 -19.916,-4.274 -26.823,-11.766v-39.278c7.617,5.904 17.021,9.185 26.823,9.185c9.812,0 19.216,-3.281 26.833,-9.185V286.208zM130.393,384.564c-6.896,7.492 -16.593,11.766 -26.823,11.766c-10.219,0 -19.916,-4.263 -26.823,-11.755v-39.278c7.617,5.893 17.011,9.174 26.823,9.174c9.822,0 19.237,-3.291 26.823,-9.174V384.564zM130.393,335.391c-6.896,7.492 -16.593,11.766 -26.823,11.766c-10.219,0 -19.916,-4.274 -26.823,-11.755v-39.278c7.607,5.893 17.011,9.174 26.823,9.174s19.216,-3.281 26.823,-9.185V335.391zM130.393,286.208c-6.896,7.492 -16.593,11.776 -26.823,11.776s-19.916,-4.274 -26.823,-11.755v-39.278c7.607,5.893 17.011,9.174 26.823,9.174s19.216,-3.281 26.823,-9.185V286.208zM191.363,384.564c-6.907,7.492 -16.603,11.766 -26.833,11.766c-10.23,0 -19.937,-4.284 -26.823,-11.755v-39.278c7.617,5.893 17.021,9.174 26.823,9.174s19.195,-3.271 26.833,-9.195L191.363,384.564L191.363,384.564zM191.363,335.391c-6.907,7.492 -16.603,11.766 -26.833,11.766c-10.23,0 -19.937,-4.284 -26.823,-11.755v-39.278c7.617,5.893 17.021,9.174 26.823,9.174c9.822,0 19.237,-3.291 26.833,-9.174L191.363,335.391L191.363,335.391zM191.363,286.208c-6.907,7.492 -16.603,11.776 -26.833,11.776c-10.219,0 -19.916,-4.274 -26.823,-11.755v-39.278c7.617,5.893 17.021,9.174 26.823,9.174c9.822,0 19.237,-3.291 26.833,-9.174L191.363,286.208L191.363,286.208zM252.322,384.575c-6.907,7.481 -16.603,11.755 -26.823,11.755c-10.23,0 -19.916,-4.274 -26.823,-11.755v-39.278c7.607,5.893 17.011,9.174 26.823,9.174c9.801,0 19.195,-3.271 26.823,-9.174V384.575zM252.322,335.402c-6.907,7.481 -16.603,11.755 -26.823,11.755c-10.23,0 -19.926,-4.274 -26.823,-11.755v-39.278c7.607,5.893 17.011,9.174 26.823,9.174c9.801,0 19.205,-3.281 26.823,-9.174V335.402zM252.322,286.229c-6.907,7.481 -16.603,11.755 -26.823,11.755c-10.23,0 -19.916,-4.274 -26.823,-11.755v-39.278c7.607,5.893 17.011,9.174 26.823,9.174c9.801,0 19.205,-3.281 26.823,-9.174V286.229zM313.292,384.564c-6.907,7.492 -16.603,11.766 -26.833,11.766c-10.24,0 -19.947,-4.284 -26.823,-11.766v-39.278c7.607,5.904 17.011,9.185 26.823,9.185c9.801,0 19.205,-3.281 26.833,-9.185V384.564zM313.292,335.391c-6.907,7.492 -16.603,11.766 -26.833,11.766c-10.24,0 -19.947,-4.284 -26.823,-11.766v-39.278c7.607,5.904 17.011,9.185 26.823,9.185s19.216,-3.281 26.833,-9.185V335.391zM313.292,286.218c-6.907,7.481 -16.603,11.766 -26.833,11.766c-10.23,0 -19.926,-4.284 -26.823,-11.776v-39.267c7.607,5.904 17.011,9.185 26.823,9.185s19.216,-3.281 26.833,-9.185V286.218zM374.262,384.554c-6.907,7.502 -16.603,11.776 -26.833,11.776c-10.209,0 -19.884,-4.253 -26.823,-11.755v-39.278c7.607,5.893 17.011,9.174 26.823,9.174s19.216,-3.281 26.833,-9.185V384.554zM374.262,335.381c-6.907,7.492 -16.603,11.776 -26.833,11.776s-19.926,-4.274 -26.823,-11.755v-39.278c7.607,5.893 17.011,9.174 26.823,9.174s19.226,-3.291 26.833,-9.185V335.381zM374.262,286.208c-6.907,7.492 -16.603,11.776 -26.833,11.776c-10.209,0 -19.884,-4.263 -26.823,-11.766v-39.278c7.607,5.904 17.011,9.185 26.823,9.185s19.226,-3.291 26.833,-9.185V286.208zM435.21,384.585c-6.907,7.481 -16.593,11.755 -26.823,11.755c-10.23,0 -19.937,-4.284 -26.812,-11.755v-39.288c7.607,5.904 17.011,9.185 26.812,9.185s19.195,-3.281 26.823,-9.185V384.585zM435.21,335.402c-6.907,7.492 -16.593,11.766 -26.823,11.766c-10.23,0 -19.937,-4.284 -26.812,-11.766v-39.278c7.607,5.904 17.011,9.174 26.812,9.174c9.812,0 19.216,-3.271 26.823,-9.174V335.402zM435.21,286.229c-6.907,7.481 -16.593,11.755 -26.823,11.755c-10.209,0 -19.895,-4.263 -26.812,-11.755v-39.278c7.607,5.893 17.011,9.174 26.812,9.174c9.812,0 19.216,-3.281 26.823,-9.174V286.229zM496.18,335.402c-6.896,7.492 -16.593,11.766 -26.812,11.766c-10.23,0 -19.937,-4.284 -26.843,-11.786v-39.267c7.617,5.904 17.021,9.195 26.843,9.195c9.812,0 19.216,-3.291 26.812,-9.174V335.402zM496.18,286.229c-6.896,7.481 -16.593,11.766 -26.812,11.766c-10.209,0 -19.895,-4.274 -26.843,-11.786v-39.267c7.617,5.904 17.021,9.185 26.843,9.185c9.812,0 19.216,-3.281 26.812,-9.164V286.229z"/>
-        <path android:fillColor="#5C5E70" android:pathData="M500.757,180.746H11.243C38.4,92.317 112.149,24.294 203.839,5.319C220.682,1.829 238.132,0 256,0c38.902,0 75.786,8.683 108.805,24.21C429.558,54.659 479.472,111.428 500.757,180.746z"/>
-        <path android:fillColor="#5C5E70" android:pathData="M511.227,236.074H0.773c0.533,-7.032 1.358,-13.981 2.456,-20.846h505.543C509.868,222.093 510.694,229.042 511.227,236.074z"/>
-        <path android:fillColor="#797B89" android:pathData="M380.615,52.423c0,5.193 -4.211,9.404 -9.404,9.404h-0.92c-2.591,0 -4.953,1.055 -6.646,2.759c-1.703,1.693 -2.759,4.054 -2.759,6.646c0,5.193 -4.211,9.404 -9.404,9.404H216.054c-2.602,0 -4.942,-1.055 -6.646,-2.759c-1.703,-1.693 -2.759,-4.054 -2.759,-6.646c0,-5.193 4.211,-9.404 9.404,-9.404h28.588c2.602,0 4.942,-1.055 6.646,-2.759c1.703,-1.693 2.759,-4.054 2.759,-6.646c0,-5.193 -4.211,-9.404 -9.404,-9.404h-7.983c-2.602,0 -4.942,-1.055 -6.646,-2.759c-1.703,-1.693 -2.759,-4.054 -2.759,-6.646c0,-5.193 4.211,-9.404 9.404,-9.404h26.415c2.602,0 4.942,-1.055 6.646,-2.759c1.703,-1.693 2.759,-4.054 2.759,-6.646c0,-5.193 -4.211,-9.404 -9.404,-9.404h-57.992c-0.418,0 -0.836,-0.031 -1.243,-0.084C220.682,1.829 238.132,0 256,0c38.902,0 75.786,8.683 108.805,24.21H353.97c-2.591,0 -4.953,1.055 -6.646,2.759c-1.703,1.693 -2.759,4.054 -2.759,6.646c0,5.193 4.211,9.404 9.404,9.404h17.241c2.591,0 4.953,1.055 6.646,2.759C379.559,47.47 380.615,49.831 380.615,52.423z"/>
-        <path android:fillColor="#FF525D" android:pathData="M301.599,407.388c-19.439,19.439 -42.721,32.347 -66.748,38.539c-27.035,6.967 -55.008,5.445 -79.523,-4.81c-13.018,-5.452 -28.04,-2.387 -38.014,7.588L78.25,487.769c-3.975,3.975 -9.191,5.97 -14.408,5.97c-5.216,0 -10.432,-1.995 -14.408,-5.97c-7.958,-7.958 -7.958,-20.858 0,-28.815l39.063,-39.064c9.975,-9.975 13.04,-24.995 7.595,-38.007c-10.263,-24.523 -11.784,-52.496 -4.81,-79.523c6.192,-24.027 19.1,-47.309 38.539,-66.748c52.946,-52.946 134.309,-57.409 181.743,-9.975S354.545,354.442 301.599,407.388z"/>
-        <path android:fillColor="#EF4152" android:pathData="M48.823,487.111c-7.337,-7.987 -7.13,-20.414 0.613,-28.158L88.5,419.889c9.975,-9.975 13.04,-24.995 7.595,-38.006c-10.263,-24.523 -11.784,-52.496 -4.81,-79.523c6.192,-24.027 19.1,-47.309 38.539,-66.748c52.532,-52.532 133.038,-57.336 180.627,-11.076c-41.125,-39.573 -116.251,-29.481 -168.718,22.986c-19.439,19.439 -33.071,41.997 -40.497,64.79c-8.363,25.639 -8.889,51.565 -1.034,73.679c4.16,11.726 0.266,25.919 -9.708,35.893l-39.064,39.064C43.725,468.653 42.645,480.165 48.823,487.111z"/>
-        <path android:fillColor="#FFD15C" android:pathData="M234.851,445.927c-27.035,6.967 -55.008,5.445 -79.523,-4.81c-13.018,-5.452 -28.04,-2.387 -38.014,7.588L78.25,487.769c-3.975,3.975 -9.191,5.97 -14.408,5.97c-5.216,0 -10.432,-1.995 -14.408,-5.97c-7.958,-7.958 -7.958,-20.858 0,-28.815l39.064,-39.064c9.975,-9.975 13.04,-24.995 7.595,-38.007c-10.263,-24.523 -11.784,-52.496 -4.81,-79.523L234.851,445.927z"/>
-        <path android:fillColor="#34ABE0" android:pathData="M392.735,62.178c11.592,11.592 19.29,25.476 22.983,39.804c4.155,16.122 3.248,32.804 -2.868,47.423c-3.252,7.764 -1.423,16.722 4.525,22.669l23.295,23.295c2.371,2.371 3.56,5.482 3.56,8.592c0,3.111 -1.19,6.221 -3.56,8.592c-4.745,4.745 -12.438,4.745 -17.183,0l-23.295,-23.295c-5.949,-5.949 -14.905,-7.777 -22.665,-4.53c-14.623,6.12 -31.305,7.028 -47.423,2.868c-14.329,-3.693 -28.212,-11.389 -39.804,-22.983c-31.574,-31.574 -34.235,-80.095 -5.949,-108.381S361.161,30.603 392.735,62.178z"/>
-        <path android:fillColor="#279FC9" android:pathData="M440.277,212.919c-4.763,4.375 -12.174,4.252 -16.792,-0.366l-23.295,-23.295c-5.949,-5.949 -14.905,-7.777 -22.665,-4.53c-14.623,6.12 -31.305,7.028 -47.423,2.868c-14.329,-3.693 -28.212,-11.389 -39.804,-22.983c-31.327,-31.327 -34.191,-79.336 -6.605,-107.716c-23.599,24.525 -17.58,69.326 13.707,100.613c11.592,11.592 25.044,19.721 38.637,24.15c15.289,4.987 30.75,5.301 43.938,0.616c6.992,-2.481 15.456,-0.159 21.405,5.79l23.295,23.295C429.27,215.959 436.135,216.602 440.277,212.919z"/>
-        <path android:fillColor="#FFD15C" android:pathData="M415.718,101.982c4.155,16.122 3.248,32.804 -2.868,47.423c-3.252,7.764 -1.423,16.722 4.525,22.669l23.295,23.295c2.371,2.371 3.56,5.482 3.56,8.592c0,3.111 -1.19,6.221 -3.56,8.592c-4.745,4.745 -12.438,4.745 -17.183,0l-23.295,-23.295c-5.949,-5.949 -14.905,-7.777 -22.665,-4.53c-14.623,6.12 -31.305,7.028 -47.423,2.868L415.718,101.982z"/>
-        <path android:fillColor="#E8DBC4" android:pathData="M193.432,110.874v0.136c0,19.477 -15.788,35.265 -35.265,35.265s-35.265,-15.788 -35.265,-35.265s15.788,-35.265 35.265,-35.265c0.836,0 1.661,0.031 2.476,0.084C178.918,77.093 193.358,92.285 193.432,110.874z"/>
-        <path android:fillColor="#F9EED7" android:pathData="M193.432,110.874c-2.978,12.769 -14.42,22.277 -28.087,22.277c-15.935,0 -28.86,-12.925 -28.86,-28.86c0,-14.336 10.459,-26.227 24.158,-28.463C178.918,77.093 193.358,92.285 193.432,110.874z"/>
-        <path android:fillColor="#FCF8F2" android:pathData="M167.967,95.629m-9.665,0a9.665,9.665 0,1 1,19.33 0a9.665,9.665 0,1 1,-19.33 0"/>
+        android:viewportWidth="930.9091"
+        android:viewportHeight="930.9091"
+        android:autoMirrored="true">
+    <group android:translateX="209.45454"
+            android:translateY="205.14478">
+        <path android:fillColor="#A1D8F6" android:pathData="M8.348,89.733h495.304v331.386h-495.304z"/>
+        <path android:fillColor="#0088FF" android:pathData="M43.542,117.136h424.504v276.58h-424.504z"/>
+        <path android:fillColor="#016DF5" android:pathData="M255.8,117.136h212.257v276.58h-212.257z"/>
+        <path android:fillColor="#FFFFFF" android:pathData="M235.976,69.398h41.06v373.203h-41.06z"/>
+        <path android:fillColor="#3C3A41" android:pathData="M503.652,81.386H285.38V69.399c0,-4.611 -3.736,-8.348 -8.348,-8.348h-41.06c-4.61,0 -8.348,3.736 -8.348,8.348v11.989H99.981c-4.61,0 -8.348,3.736 -8.348,8.348s3.738,8.348 8.348,8.348h127.644v10.704h-77.956H43.542c-4.61,0 -8.348,3.736 -8.348,8.348v138.864v137.719c0,4.611 3.738,8.348 8.348,8.348h106.126h77.956v10.704H16.696V98.082h26.852c4.61,0 8.348,-3.736 8.348,-8.348s-3.738,-8.348 -8.348,-8.348h-35.2C3.738,81.386 0,85.123 0,89.734v331.385c0,4.611 3.738,8.348 8.348,8.348h219.276v13.134c0,4.611 3.738,8.348 8.348,8.348h41.06c4.611,0 8.348,-3.736 8.348,-8.348v-13.134h130.937c4.611,0 8.348,-3.736 8.348,-8.348c0,-4.611 -3.736,-8.348 -8.348,-8.348H285.38v-10.704h76.542h106.126c4.611,0 8.348,-3.736 8.348,-8.348v-137.72V117.134c0,-4.611 -3.736,-8.348 -8.348,-8.348H361.922H285.38V98.082h209.924v314.69h-27.248c-4.611,0 -8.348,3.736 -8.348,8.348c0,4.611 3.736,8.348 8.348,8.348h35.596c4.611,0 8.348,-3.736 8.348,-8.348V89.734C512,85.124 508.263,81.386 503.652,81.386zM51.89,125.482h89.431v122.17H51.89V125.482zM51.89,385.371V264.347h89.431v121.023H51.89zM158.015,385.371V255.999V125.482h69.609v259.889H158.015zM268.684,434.252H244.32v-13.134v-27.4V117.134v-27.4V77.747h24.365v11.989v27.4V393.72v27.4V434.252zM370.269,385.371V264.347H459.7v121.023H370.269zM459.7,125.482v122.17h-89.431v-122.17H459.7zM353.574,125.482v130.518v129.371H285.38V125.482H353.574z"/>
     </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_left_service.xml b/app/src/main/res/drawable/ic_left_service.xml
index 017da1e..86b4eb0 100644
--- a/app/src/main/res/drawable/ic_left_service.xml
+++ b/app/src/main/res/drawable/ic_left_service.xml
@@ -1,5 +1,7 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="285.876" android:viewportWidth="285.876"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="48dp" android:width="48dp"
+    android:viewportHeight="285.876" android:viewportWidth="285.876">
     <path android:fillColor="#FFFFFF" android:pathData="M261.207,76.226c-8.573,9.43 -20.236,13.134 -27.668,9.293c0.605,6.751 -3.436,13.287 -10.141,15.544c-18.231,6.139 -37.408,9.21 -56.583,9.21c-10.257,0 -20.512,-0.885 -30.624,-2.643c15.289,20.576 39.358,32.753 65.156,32.753c8.284,0 15,6.716 15,15s-6.716,15 -15,15c-32.82,0 -63.598,-14.394 -84.591,-39.029l-26.497,44.097c30.164,25.599 53.935,55.258 70.763,88.411c3.749,7.387 0.801,16.415 -6.587,20.165c-2.176,1.104 -4.494,1.627 -6.777,1.627c-5.47,0 -10.742,-3.002 -13.388,-8.214c-14.607,-28.78 -35.188,-54.695 -61.282,-77.281c-3.667,27.708 -13.553,54.145 -29.537,78.86c-2.871,4.438 -7.69,6.855 -12.609,6.855c-2.792,0 -5.614,-0.778 -8.132,-2.406c-6.957,-4.499 -8.935,-13.785 -4.436,-20.741c17.485,-27.035 26.365,-56.402 26.365,-87.284v-3.058c0,-4.645 0.568,-9.303 3.111,-13.535L92.94,83.63c6.162,-13.495 19.867,-12.797 26.78,-11.028l0.941,0.311c30.074,9.922 63.158,9.825 93.164,-0.28c4.559,-1.533 9.328,-0.743 13.052,1.715c-0.392,-6.599 2.662,-14.617 8.781,-21.348c9.621,-10.583 23.14,-13.963 30.195,-7.549C272.908,51.864 270.828,65.643 261.207,76.226zM244.508,138.119c-4.768,0 -8.632,3.865 -8.632,8.632s3.865,8.632 8.632,8.632c4.768,0 8.632,-3.865 8.632,-8.632S249.276,138.119 244.508,138.119zM121.3,62.781c17.337,0 31.391,-14.054 31.391,-31.391S138.636,0 121.3,0c-17.337,0 -31.391,14.054 -31.391,31.391S103.963,62.781 121.3,62.781z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_new_match.xml b/app/src/main/res/drawable/ic_new_match.xml
new file mode 100644
index 0000000..376219d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_match.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="430.556" android:viewportWidth="430.556"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M139.689,93.625c0.552,-4.94 5.006,-8.496 9.944,-7.945c4.94,0.552 8.497,5.004 7.945,9.943c-0.398,3.566 3.715,14.81 21.66,34.326c16.172,17.59 39.202,37.165 64.845,55.121c17.287,12.104 35.165,23.035 51.702,31.609c4.413,2.288 6.135,7.721 3.847,12.133c-1.602,3.089 -4.743,4.859 -7.997,4.859c-1.396,0 -2.811,-0.325 -4.135,-1.012c-17.231,-8.935 -35.814,-20.293 -53.741,-32.846C184.855,165.572 136.803,119.458 139.689,93.625zM52.83,91.751c-4.802,-1.301 -9.739,1.543 -11.036,6.341c-5.789,21.428 -4.187,44.349 4.51,64.541c2.622,6.087 5.887,11.938 9.705,17.391l25.55,36.492c11.818,16.878 28.379,29.397 47.893,36.205c0.981,0.342 1.981,0.505 2.964,0.505c3.721,0 7.203,-2.326 8.498,-6.038c1.637,-4.693 -0.84,-9.825 -5.533,-11.463c-15.926,-5.556 -29.438,-15.768 -39.076,-29.533l-25.551,-36.493c-3.116,-4.45 -5.78,-9.223 -7.917,-14.186c-7.098,-16.478 -8.399,-35.203 -3.666,-52.727C60.468,97.988 57.629,93.047 52.83,91.751zM306.703,198.433c3.112,0 6.139,-1.616 7.805,-4.507c2.483,-4.306 1.005,-9.81 -3.301,-12.292c-11.505,-6.634 -23.224,-14.118 -34.83,-22.244c-21.658,-15.165 -41.119,-31.282 -56.278,-46.611c-3.495,-3.532 -9.192,-3.565 -12.728,-0.07c-3.534,3.495 -3.566,9.193 -0.07,12.728c15.907,16.085 36.223,32.925 58.752,48.698c12.036,8.428 24.203,16.197 36.163,23.094C303.632,198.044 305.177,198.433 306.703,198.433zM179.468,105.23c4.071,2.851 9.683,1.86 12.535,-2.21l27.736,-39.611c16.175,-23.102 40.497,-38.542 68.484,-43.477c27.986,-4.938 56.124,1.255 79.227,17.431c42.257,29.588 57.098,86.902 34.521,133.317c-2.174,4.47 -0.313,9.855 4.157,12.03c1.268,0.616 2.609,0.908 3.93,0.908c3.336,0 6.542,-1.863 8.1,-5.065c12.747,-26.206 15.785,-56.35 8.555,-84.876c-7.311,-28.845 -24.69,-54.08 -48.939,-71.059C350.733,3.685 317.821,-3.568 285.097,2.205c-32.722,5.77 -61.17,23.839 -80.103,50.879l-27.736,39.611C174.406,96.767 175.396,102.379 179.468,105.23zM349.668,380.735c2.235,3.19 3.094,7.069 2.416,10.92c-0.679,3.851 -2.812,7.203 -6.006,9.439l-37.92,26.552c-2.546,1.781 -5.469,2.636 -8.363,2.637c-4.613,0 -9.154,-2.171 -11.994,-6.224l-23.765,-33.94c-0.015,-0.021 -0.03,-0.042 -0.045,-0.063c-0.015,-0.021 -0.029,-0.042 -0.044,-0.063l-26.687,-38.114c-0.039,-0.053 -0.077,-0.105 -0.114,-0.159c-0.037,-0.054 -0.074,-0.107 -0.11,-0.161l-10.572,-15.099c-2.851,-4.071 -1.861,-9.684 2.21,-12.534c4.072,-2.853 9.684,-1.862 12.535,2.21l5.521,7.886l39.754,-27.834c4.072,-2.852 9.684,-1.862 12.535,2.21l26.714,38.153c0.044,0.061 0.088,0.121 0.131,0.183s0.085,0.123 0.126,0.186L349.668,380.735zM273.574,372.358l32.381,-22.673l-16.519,-23.593l-32.381,22.673L273.574,372.358zM332.984,388.288l-16.705,-23.858l-32.381,22.673l16.706,23.859L332.984,388.288zM424.708,240.113c0,29.289 -23.828,53.117 -53.117,53.117c-15.028,0 -29.419,-6.41 -39.483,-17.587c-8.792,-9.765 -13.634,-22.383 -13.634,-35.53c0,-29.289 23.828,-53.117 53.117,-53.117S424.708,210.823 424.708,240.113zM406.708,240.113c0,-19.363 -15.753,-35.117 -35.117,-35.117s-35.117,15.754 -35.117,35.117c0,8.691 3.2,17.032 9.011,23.485c6.655,7.393 16.171,11.632 26.106,11.632C390.955,275.23 406.708,259.476 406.708,240.113zM118.872,288.815c3.721,0 7.203,-2.326 8.498,-6.038c1.637,-4.693 -0.841,-9.825 -5.534,-11.462c-21.089,-7.355 -38.982,-20.88 -51.746,-39.112L37.09,185.075c-16.176,-23.103 -22.366,-51.238 -17.431,-79.226c4.935,-27.988 20.377,-52.31 43.48,-68.486c36.03,-25.229 84.706,-25.36 121.124,-0.324c4.097,2.815 9.7,1.778 12.515,-2.318c2.816,-4.097 1.778,-9.699 -2.318,-12.516C151.887,-7.061 94.963,-6.895 52.815,22.619C25.774,41.552 7.703,70.001 1.933,102.724s1.479,65.635 20.413,92.676l32.998,47.126c14.943,21.346 35.886,37.178 60.564,45.785C116.889,288.653 117.888,288.815 118.872,288.815zM236.791,289.807l-16.505,23.571c-0.001,0.001 -0.001,0.002 -0.002,0.003c-0.001,0.002 -0.002,0.004 -0.003,0.005l-77.493,110.67c-2.839,4.056 -7.382,6.229 -11.995,6.229c-2.894,0 -5.815,-0.855 -8.361,-2.636l-37.924,-26.557c-3.194,-2.235 -5.327,-5.587 -6.006,-9.437c-0.679,-3.85 0.18,-7.729 2.417,-10.923l23.721,-33.877c0.028,-0.041 0.057,-0.083 0.085,-0.124c0.029,-0.042 0.059,-0.083 0.088,-0.123l26.655,-38.067c0.033,-0.049 0.066,-0.097 0.1,-0.146c0.034,-0.049 0.068,-0.097 0.103,-0.145l26.631,-38.032c0.036,-0.054 0.073,-0.107 0.111,-0.161c0.037,-0.054 0.076,-0.107 0.114,-0.16l16.389,-23.406c-17.779,-23.404 -26.645,-52.261 -25.064,-82.017c0.263,-4.964 4.5,-8.781 9.465,-8.51c4.963,0.264 8.773,4.501 8.51,9.465c-1.461,27.494 7.484,54.077 25.188,74.851c2.659,3.12 2.874,7.643 0.522,11l-15.216,21.73l32.381,22.674l15.216,-21.73c2.351,-3.357 6.672,-4.702 10.515,-3.271c20.884,7.781 44.326,8.711 66.005,2.615c4.785,-1.345 9.755,1.443 11.1,6.229s-1.443,9.754 -6.228,11.1C284.255,297.106 259.48,296.782 236.791,289.807zM146.689,387.102l-32.38,-22.673l-16.707,23.859l32.38,22.673L146.689,387.102zM173.533,348.767l-32.381,-22.674l-16.519,23.591l32.381,22.674L173.533,348.767zM200.377,310.429l-32.38,-22.673l-16.52,23.593l32.38,22.673L200.377,310.429z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_right_service.xml b/app/src/main/res/drawable/ic_right_service.xml
index 0c35211..f8170ee 100644
--- a/app/src/main/res/drawable/ic_right_service.xml
+++ b/app/src/main/res/drawable/ic_right_service.xml
@@ -1,5 +1,7 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="285.876" android:viewportWidth="285.876"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:autoMirrored="true"
+    android:height="48dp" android:width="48dp"
+    android:viewportHeight="285.876" android:viewportWidth="285.876">
     <path android:fillColor="#ffffff" android:pathData="m24.693,76.226c8.573,9.43 20.236,13.134 27.668,9.293 -0.605,6.751 3.436,13.287 10.141,15.544 18.231,6.139 37.408,9.21 56.583,9.21 10.257,0 20.512,-0.885 30.624,-2.643 -15.289,20.576 -39.358,32.753 -65.156,32.753 -8.284,0 -15,6.716 -15,15 -0,8.284 6.716,15 15,15 32.82,0 63.598,-14.394 84.591,-39.029l26.497,44.097c-30.164,25.599 -53.935,55.258 -70.763,88.411 -3.749,7.387 -0.801,16.415 6.587,20.165 2.176,1.104 4.494,1.627 6.777,1.627 5.47,0 10.742,-3.002 13.388,-8.214 14.607,-28.78 35.188,-54.695 61.282,-77.281 3.667,27.708 13.553,54.145 29.537,78.86 2.871,4.438 7.69,6.855 12.609,6.855 2.792,0 5.614,-0.778 8.132,-2.406 6.957,-4.499 8.935,-13.785 4.436,-20.741 -17.485,-27.035 -26.365,-56.402 -26.365,-87.284l-0,-3.058c-0,-4.645 -0.568,-9.303 -3.111,-13.535L192.96,83.63c-6.162,-13.495 -19.867,-12.797 -26.78,-11.028l-0.941,0.311c-30.074,9.922 -63.158,9.825 -93.164,-0.28 -4.559,-1.533 -9.328,-0.743 -13.052,1.715 0.392,-6.599 -2.662,-14.617 -8.781,-21.348 -9.621,-10.583 -23.14,-13.963 -30.195,-7.549 -7.055,6.413 -4.975,20.192 4.646,30.775zM41.392,138.119c4.768,0 8.632,3.865 8.632,8.632 -0,4.767 -3.865,8.632 -8.632,8.632 -4.768,0 -8.632,-3.865 -8.632,-8.632 -0,-4.767 3.864,-8.632 8.632,-8.632zM164.6,62.781c-17.337,0 -31.391,-14.054 -31.391,-31.391C133.209,14.053 147.264,0 164.6,0 181.937,0 195.991,14.054 195.991,31.391c-0,17.337 -14.054,31.39 -31.391,31.39z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 36e5527..33cf863 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,123 +7,141 @@
     tools:context=".MainActivity"
     tools:layout_editor_absoluteY="73dp">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:elevation="4dp"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
-
-    <LinearLayout
-            android:id="@+id/linearLayoutText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-                android:id="@+id/textService"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_weight="1"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                app:layout_constraintBottom_toTopOf="@+id/linearLayoutButtons"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="1.0"
-                app:layout_constraintStart_toEndOf="@+id/textScore"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/textScore"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_weight="1"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </LinearLayout>
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:id="@+id/linearLayoutButtons"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/linearLayoutText">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-            <Button
-                android:id="@+id/buttonLeftPlayer"
-                style="@style/Base.Widget.AppCompat.Button.Colored"
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="?attr/actionBarSize"
                 android:layout_marginBottom="8dp"
+                android:background="@color/colorPrimary"
+                android:elevation="4dp"
+                android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+                app:layout_constraintBottom_toTopOf="@+id/linearLayoutText"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
+            <LinearLayout
+                android:id="@+id/linearLayoutText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:layout_marginLeft="8dp"
                 android:layout_marginRight="8dp"
                 android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_weight="1"
-                android:bufferType="spannable"
-                android:drawableLeft="@drawable/ic_left_service"
-                android:onClick="onClickLeftPlayer"
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:textSize="24sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toTopOf="@+id/textScore"
-                app:layout_constraintEnd_toStartOf="@+id/buttonRightPlayer"
-                app:layout_constraintHorizontal_chainStyle="spread_inside"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textService" />
-
-            <Button
-                android:id="@+id/buttonRightPlayer"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:layout_weight="1"
-                android:bufferType="spannable"
-                android:drawableRight="@drawable/ic_relaunch"
-                android:onClick="onClickRightPlayer"
-                android:textAllCaps="false"
-                android:textAppearance="@style/TextAppearance.AppCompat.Button"
-                android:textSize="24sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toTopOf="@+id/textScore"
+                android:orientation="horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/buttonLeftPlayer"
-                app:layout_constraintTop_toBottomOf="@+id/textService" />
+                app:layout_constraintStart_toStartOf="parent"
+                tools:layout_editor_absoluteY="8dp">
+
+                <TextView
+                    android:id="@+id/textService"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                    app:layout_constraintBottom_toTopOf="@+id/linearLayoutButtons"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="1.0"
+                    app:layout_constraintStart_toEndOf="@+id/textScore"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@string/service" />
+
+                <TextView
+                    android:id="@+id/textScore"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_weight="1"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:text="@string/score" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/linearLayoutButtons"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/linearLayoutText">
+
+                <Button
+                    android:id="@+id/buttonLeftPlayer"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_weight="1"
+                    android:background="@color/colorAccent"
+                    android:bufferType="spannable"
+                    android:drawableLeft="@drawable/ic_left_service"
+                    android:onClick="onClickLeftPlayer"
+                    android:textAllCaps="false"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Button"
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toTopOf="@+id/textScore"
+                    app:layout_constraintEnd_toStartOf="@+id/buttonRightPlayer"
+                    app:layout_constraintHorizontal_chainStyle="spread_inside"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/textService"
+                    tools:text="@string/button_text" />
+
+                <Button
+                    android:id="@+id/buttonRightPlayer"
+                    style="@style/Widget.AppCompat.Button.Colored"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginLeft="8dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_weight="1"
+                    android:background="@color/colorAccent"
+                    android:bufferType="spannable"
+                    android:onClick="onClickRightPlayer"
+                    android:textAllCaps="false"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Button"
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toTopOf="@+id/textScore"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/buttonLeftPlayer"
+                    app:layout_constraintTop_toBottomOf="@+id/textService"
+                    tools:text="@string/button_text" />
+            </LinearLayout>
         </LinearLayout>
 
+    </FrameLayout>
+
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 313970a..d363e76 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -1,10 +1,16 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_new_match"
+        android:icon="@drawable/ic_new_match"
+        android:title="@string/new_match"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_about"
         android:icon="@drawable/ic_about"
         android:title="@string/about"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 0910613..0ce45e6 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index f9576a1..686a887 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 8f0c303..177c82b 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 156d0e8..e6a0f5b 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index c886bfc..bd10275 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index e9d5c33..95b7329 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d1b1452..77d54b3 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index caebbea..2118012 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index f6b2787..1d4178b 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 749b6fd..643a939 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 169bac9..e64e2c8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#4caf50</color>
-    <color name="colorPrimaryDark">#009688</color>
-    <color name="colorAccent">#69f0ae</color>
+    <color name="colorPrimary">#016DF5</color>
+    <color name="colorPrimaryDark">#004aa7</color>
+    <color name="colorAccent">#0088FF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index c5d5899..2dd26fb 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#FFFFFF</color>
+    <color name="ic_launcher_background">#3C3A41</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1399da9..26695f9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="info">Click on the scoring player</string>
     <string name="service">Service: %s</string>
     <string name="score">Score: %d - %d</string>
-    <string name="button_text" translatable="false">%s <br /> <br /> <big> <big> %d </big> </big></string>
+    <string name="button_text" translatable="false">%s &lt;br /&gt; &lt;br /&gt; &lt;big&gt; &lt;big&gt; %d &lt;/big&gt; &lt;/big&gt;</string>
     <string name="end_match_dialog_title">Congratulations, %s!</string>
     <string-array name="default_players_names">
         <item>Player 1</item>
@@ -16,9 +16,9 @@
     <string name="name">Name</string>
     <string name="share_button">Share</string>
     <string name="share_subject">Ping Points Match: %s vs. %s</string>
-    <string name="share_message">%s vs. %s: %s won by %d to %d Get Ping Points on Google Play</string>
+    <string name="share_message">%s vs. %s:\n%s won by %d to %d\n\nGet Ping Points on Google Play</string>
     <string name="radioText" translatable="false"></string>
     <string name="PingPointsCredits">Ping Points by Adrien Malingrey</string>
-    <string name="iconCredits"><div>Icons made by <a href="http://www.freepik.com" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></div></string>
+    <string name="iconCredits">Icons made by &lt;a href=&quot;http://www.freepik.com&quot; title=&quot;Freepik&quot;&gt;Freepik&lt;/a&gt; from &lt;a href=&quot;https://www.flaticon.com/&quot; title=&quot;Flaticon&quot;&gt;www.flaticon.com&lt;/a&gt; is licensed by &lt;a href=&quot;http://creativecommons.org/licenses/by/3.0/&quot; title=&quot;Creative Commons BY 3.0&quot; target=&quot;_blank&quot;&gt;CC 3.0 BY&lt;/a&gt;</string>
     <string name="about">About</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
deleted file mode 100644
index 2465adb..0000000
--- a/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="PingPoints" parent="Theme.AppCompat.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
\ No newline at end of file