diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index f1dcef9c0a2be5bb2a070f2876c5670a88f61f2a..8f6733c100215b80d8945e949cc290959c9c62b7 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,8 +12,28 @@
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-06-07T10:29:49.278648229Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-06-08T10:00:05.954255704Z" />
     <multipleDevicesSelectedInDropDown value="true" />
+    <runningDeviceTargetsSelectedWithDialog>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_33_x86_64.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Copy_of_Pixel_3a_API_33_x86_64.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetsSelectedWithDialog>
     <targetsSelectedWithDialog>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/app/src/main/java/com/example/game/Knb.kt b/app/src/main/java/com/example/game/Knb.kt
index 2553ffbbcecba4389372e5c7958cbb4143cfe48a..f3d15989a70f5840ab3f18bf15893fe6c2de1fde 100644
--- a/app/src/main/java/com/example/game/Knb.kt
+++ b/app/src/main/java/com/example/game/Knb.kt
@@ -81,6 +81,10 @@ class Knb : ComponentActivity() {
             buttons[i].setOnClickListener {view -> onButtonClicked(view, i) }
         }
 
+        buttonCls.setOnClickListener {
+            exitToMenu();
+        }
+
         disableAllButtons()
         // TODO: загрузка сервера - фронтенд @a1sarpi
         GlobalScope.launch(Dispatchers.IO) {
@@ -109,9 +113,6 @@ class Knb : ComponentActivity() {
                     // Обновляем UI в основном потоке
                     launch(Dispatchers.Main) {
                         // TODO: конец ожидания сервера (фронтенд) @a1sarpi
-                        buttonCls.setOnClickListener {
-                            exitToMenu();
-                        }
                         currentPlayer = 1
                         tv = findViewById(R.id.currentPlayerTV)
                         tv.text = "Противник ${enemyEmail.removeSuffix("@whatever.ru")}"
@@ -352,9 +353,11 @@ class Knb : ComponentActivity() {
     private fun exitToMenu() {
         val intent = Intent(this, MenuActivity::class.java)
         startActivity(intent)
-        clientSocket.close()
-        writer.close()
-        reader.close()
+        if (clientSocket.isConnected) {
+            clientSocket.close()
+            writer.close()
+            reader.close()
+        }
         finish() // Закрываем меню после запуска игры
     }
 
diff --git a/app/src/main/java/com/example/game/Quiz.kt b/app/src/main/java/com/example/game/Quiz.kt
index d4e782f90b3385dfd3c41e5a42713d95a196271f..c9c39ab9d17a8e487d5c7cfdc9622dbf73b45fc6 100644
--- a/app/src/main/java/com/example/game/Quiz.kt
+++ b/app/src/main/java/com/example/game/Quiz.kt
@@ -6,6 +6,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
+import android.view.Window
 import android.widget.Button
 import android.widget.GridLayout
 import android.widget.TextView
@@ -62,6 +63,7 @@ class Quiz : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         Log.d("Debug", "Вошли в класс Quiz!")
         setContentView(R.layout.activity_quiz)
 
@@ -82,6 +84,10 @@ class Quiz : AppCompatActivity() {
             onButtonClick(Pair<Int, Int>(MAX_ROW, 1))
         }
 
+        buttonCls.setOnClickListener {
+            exitToMenu();
+        }
+
         // Настройка обработчиков нажатия для кнопок в сетке
         val gridLayout = findViewById<GridLayout>(R.id.gridLayout)
         for (row in 0 until gridLayout.rowCount) {
@@ -142,9 +148,6 @@ class Quiz : AppCompatActivity() {
                     // Обновляем UI в основном потоке
                     launch(Dispatchers.Main) {
                         // TODO: конец ожидания сервера (фронтенд) @a1sarpi
-                        buttonCls.setOnClickListener {
-                            exitToMenu();
-                        }
                         currentPlayer = 1
                         tv = findViewById(R.id.currentPlayerTV)
 
@@ -472,9 +475,11 @@ class Quiz : AppCompatActivity() {
     private fun exitToMenu() {
         val intent = Intent(this, MenuActivity::class.java)
         startActivity(intent)
-        clientSocket.close()
-        writer.close()
-        reader.close()
+        if (clientSocket.isConnected) {
+            clientSocket.close()
+            writer.close()
+            reader.close()
+        }
         finish() // Закрываем меню после запуска игры
     }
 
diff --git a/app/src/main/java/com/example/game/QuizQuestion.kt b/app/src/main/java/com/example/game/QuizQuestion.kt
index 018acf06ecb5cdb8c7b6c724e2cdf497e48b4a4b..2bd923165f1926564ddff43369fbb13e25bcb967 100644
--- a/app/src/main/java/com/example/game/QuizQuestion.kt
+++ b/app/src/main/java/com/example/game/QuizQuestion.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
+import android.view.Window
 import android.widget.Button
 import android.widget.TextView
 import androidx.activity.ComponentActivity
@@ -31,6 +32,7 @@ class QuizQuestion : ComponentActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_quiz_question)
 
         Log.d("Debug", "Запущен класс QuizQuestion")
diff --git a/app/src/main/java/com/example/game/TicTacToe.kt b/app/src/main/java/com/example/game/TicTacToe.kt
index 36c06f21905f680711de52f20b40fb3a412030b8..ce26f3ddc137b7724a79b805285611a6a418bc54 100644
--- a/app/src/main/java/com/example/game/TicTacToe.kt
+++ b/app/src/main/java/com/example/game/TicTacToe.kt
@@ -197,8 +197,8 @@ class TicTacToe : ComponentActivity() {
                     }
                     buttons[number.first*3 + number.second].background = w
                     //buttons[number.first*3 + number.second].setImageResource(R.drawable.cross_blue)
-                    val iv: ImageView = findViewById(R.id.imageView)
-                    iv.setImageResource(R.drawable.cross_blue)
+//                    val iv: ImageView = findViewById(R.id.imageView)
+//                    iv.setImageResource(R.drawable.cross_blue)
                     enableAllButtons()
                     // Смена текущего игрока
                     currentPlayer = if (currentPlayer == 1) 2 else 1
diff --git a/app/src/main/res/layout/activity_ttt.xml b/app/src/main/res/layout/activity_ttt.xml
index 5d305573ca884a7887f089c51b8561a7776a2a3d..5a3afccd672833250c5f8ad6af479142e850daba 100644
--- a/app/src/main/res/layout/activity_ttt.xml
+++ b/app/src/main/res/layout/activity_ttt.xml
@@ -99,11 +99,11 @@
         <include
             layout="@layout/buttons_ttt"
             android:id="@+id/buttonsLayout"
-            android:layout_width="350dp"
-            android:layout_height="350dp"
-            android:layout_marginBottom="60dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="30dp"
             android:layout_gravity="center"
-            android:layout_marginTop="60dp" />
+            android:layout_marginTop="30dp" />
 
         <LinearLayout
             android:id="@+id/plaer2andtimeLayout"
@@ -146,7 +146,7 @@
                 android:gravity="center"
                 android:layout_gravity="right"
                 android:fontFamily="@font/zerocool"
-                android:text="meme"
+                android:text="Timer"
                 android:textColor="@color/naples"
                 android:textSize="25sp" />
 
diff --git a/app/src/main/res/layout/buttons_ttt.xml b/app/src/main/res/layout/buttons_ttt.xml
index 6cdd75c22b28abd041eafd243c20b58263e22bb6..648ef8805b074f720ea2712a9dc2fc42f8758428 100644
--- a/app/src/main/res/layout/buttons_ttt.xml
+++ b/app/src/main/res/layout/buttons_ttt.xml
@@ -1,71 +1,72 @@
 <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:columnCount="3"
+    android:layout_gravity="center"
     android:rowCount="3">
 
 
     <ImageButton
         android:id="@+id/button1"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button2"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button3"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button4"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button5"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button6"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button7"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button8"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
     <ImageButton
         android:id="@+id/button9"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
         android:background="@drawable/button_background"
         android:layout_margin="8dp"/>
 
diff --git a/app/src/main/res/layout/quiz_button.xml b/app/src/main/res/layout/quiz_button.xml
index 14ce8f43ff090dfac2d0fa67528a169f4a1fe692..145313089cdfa3002f434366f2c4a862371076e0 100644
--- a/app/src/main/res/layout/quiz_button.xml
+++ b/app/src/main/res/layout/quiz_button.xml
@@ -9,8 +9,8 @@
     android:orientation="vertical">
 
     <ImageView
-        android:layout_width="85dp"
-        android:layout_height="66dp"
+        android:layout_width="75dp"
+        android:layout_height="55dp"
         android:cropToPadding="true"
         android:scaleX="1"
         android:scaleY="1"
@@ -42,7 +42,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0-0"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp" />
@@ -51,7 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0-1"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -61,7 +61,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0-2"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -71,7 +71,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="1-0"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -82,7 +82,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="1-1"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -92,7 +92,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="1-2"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -102,7 +102,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="2-0"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -112,7 +112,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="2-1"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -122,7 +122,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="2-2"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -132,7 +132,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="3-0"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -142,7 +142,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="3-1"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -152,7 +152,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="3-2"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:backgroundTint="#FFE45E"
             android:fontFamily="@font/zerocool"
             android:textSize="20sp"
@@ -160,8 +160,8 @@
     </GridLayout>
 
     <ImageView
-        android:layout_width="85dp"
-        android:layout_height="66dp"
+        android:layout_width="75dp"
+        android:layout_height="55dp"
         android:cropToPadding="true"
         android:scaleX="1"
         android:scaleY="1"
diff --git a/server/src/main/java/com/example/server/Server.kt b/server/src/main/java/com/example/server/Server.kt
index 8369814132dd1d08128e8ebd98bd4ca0f8f5fdeb..4f956444ec900c79d296b50cef5145ae3c04c5a6 100644
--- a/server/src/main/java/com/example/server/Server.kt
+++ b/server/src/main/java/com/example/server/Server.kt
@@ -23,20 +23,20 @@ class Server {
             val clientSocket = serverSocket.accept()
             println("Произведено новое подключение к серверу")
             val player = Player(clientSocket)
-            if (all_players[player.gm.id].isEmpty())
-                all_players[player.gm.id].add(player)
-            else if (all_players[player.gm.id].first().email != player.email)
-                all_players[player.gm.id].add(player)
-            else {
-                println("Один из игроков присоединился дважды")
-            }
-            for (pl in all_players[player.gm.id]) {
-                if (!pl.clientSocket.isConnected or pl.clientSocket.isClosed) {
-                    println("Один из игроков отсоединился")
-                    all_players[player.gm.id].remove(pl)
-                    println("Размер очереди стал равным ${all_players[player.gm.id].size}")
-                }
-            }
+//            if (all_players[player.gm.id].isEmpty())
+//                all_players[player.gm.id].add(player)
+//            else if (all_players[player.gm.id].first().email != player.email)
+//                all_players[player.gm.id].add(player)
+//            else {
+//                println("Один из игроков присоединился дважды")
+//            }
+//            for (pl in all_players[player.gm.id]) {
+//                if (!pl.clientSocket.isConnected or pl.clientSocket.isClosed) {
+//                    println("Один из игроков отсоединился")
+//                    all_players[player.gm.id].remove(pl)
+//                    println("Размер очереди стал равным ${all_players[player.gm.id].size}")
+//                }
+//            }
             check_queue(player.gm.id, true)
         }
     }
@@ -44,16 +44,16 @@ class Server {
     private fun check_queue(game_id: Int, flag: Boolean): Boolean {
         println("Запущена проверка очереди. Размер очереди (должен быть 2): ${all_players[game_id].size}")
         if (all_players[game_id].size == 2) {
-            for (pl in all_players[game_id]) {
-                if (!pl.clientSocket.isConnected or pl.clientSocket.isClosed) {
-                    println("Один из игроков отсоединился")
-                    all_players[game_id].remove(pl)
-                    println("Размер очереди стал равным ${all_players[game_id].size}")
-                    return false
-                }
-            }
-            if (all_players[game_id].first().email == all_players[game_id][2].email)
-                return false
+//            for (pl in all_players[game_id]) {
+//                if (!pl.clientSocket.isConnected or pl.clientSocket.isClosed) {
+//                    println("Один из игроков отсоединился")
+//                    all_players[game_id].remove(pl)
+//                    println("Размер очереди стал равным ${all_players[game_id].size}")
+//                    return false
+//                }
+//            }
+//            if (all_players[game_id].first().email == all_players[game_id][2].email)
+//                return false
             val (p1, p2) = Pair(all_players[game_id][0], all_players[game_id][1])
             all_players[game_id].clear()
             println("Игрок ${p1.id} с почтой ${p2.email} подключился")