diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
new file mode 100644
index 0000000..0efb61b
--- /dev/null
+++ b/.github/workflows/android_build.yml
@@ -0,0 +1,93 @@
+name: Android Build
+
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  test_job:
+    name: Test
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Run Debug Tests
+        run: ./gradlew testDebugUnitTest --continue
+
+      - name: Upload Test Reports
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: test-reports
+          path: '**/build/reports/tests/'
+
+  lint_job:
+    name: Lint
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Run Debug Lint
+        run: ./gradlew lintDebug
+
+      - name: Upload Lint Reports
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: lint-report
+          path: '**/build/reports/lint-results-*'
+
+  assemble_job:
+    name: Assemble
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Restore Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Assemble Debug
+        run: ./gradlew assembleDebug
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v2
+        with:
+          name: apk
+          path: app/build/outputs/apk/debug/**.apk
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..c00d563
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_API_28.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-11-09T18:08:46.343903Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 674414f..f4ef529 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="false" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a5f05cd
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..1ea0cd8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.2453125" />
+        <entry key="app/src/main/res/drawable/ic_more.xml" value="0.2453125" />
+        <entry key="app/src/main/res/drawable/square_background.xml" value="0.2453125" />
+        <entry key="app/src/main/res/layout-land-v21/activity_main.xml" value="0.16328125" />
+        <entry key="app/src/main/res/layout-land/activity_main.xml" value="0.16328125" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.45" />
+        <entry key="app/src/main/res/layout/activity_rules.xml" value="0.12108792846497765" />
+        <entry key="app/src/main/res/layout/layout_letters_pc.xml" value="0.25" />
+        <entry key="app/src/main/res/layout/layout_letters_person.xml" value="0.1583457526080477" />
+        <entry key="app/src/main/res/layout/layout_numbers_person.xml" value="0.1583457526080477" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..090d7c7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+# SeaBattle
+Sea Battle - a classic puzzle 2D-game created using Canvas, Custom Views, Coroutines and Kotlin.
+
+![push](https://github.com/AlinaStepanova/SeaBattle/workflows/Android%20Build/badge.svg?branch=dev&event=push)
+
+Play Market: https://play.google.com/store/apps/details?id=com.avs.sea.battle
+
+How to play: https://youtu.be/ZrbtILJjqpU
+
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/23102335/104816069-5d744c80-5821-11eb-9570-a43c10350dda.png" width="60%">
+  <img src="https://user-images.githubusercontent.com/23102335/104816078-6ebd5900-5821-11eb-84b1-bf9283e9a4f1.png" width="60%">
+  <img src="https://user-images.githubusercontent.com/23102335/104816081-72e97680-5821-11eb-9c49-1eac627b5015.png" width="60%">
+</p>
diff --git a/app/build.gradle b/app/build.gradle
index 3cc11ed..7b77835 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,16 +11,16 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    compileSdkVersion 31
+    buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "com.avs.sea.battle"
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion 19
+        targetSdkVersion 31
+        versionCode 8
+        versionName "8"
         vectorDrawables.useSupportLibrary = true
-        resConfigs "en"
+        resConfigs "en", "uk", "ru"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {
@@ -38,9 +38,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    aaptOptions {
-        cruncherEnabled = false
-    }
     dataBinding {
         enabled = true
     }
@@ -49,17 +46,22 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    testImplementation "org.mockito:mockito-core:2.25.0"
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0"
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    testImplementation "org.mockito:mockito-core:3.3.0"
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0"
 
     kapt "com.android.databinding:compiler:3.1.4"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0-alpha05'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    implementation 'com.google.android.play:core:1.10.2'
+    implementation 'com.google.android.play:core-ktx:1.8.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e78554b..4983ed6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.avs.sea.battle">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -12,19 +11,18 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity
-            android:name="com.avs.sea.battle.main.MainActivity"
-            android:screenOrientation="landscape"
-            tools:ignore="LockedOrientationActivity">
+        <activity android:name="com.avs.sea.battle.main.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.avs.sea.battle.privacy_policy.PrivacyPolicyActivity"
-            android:screenOrientation="fullSensor"
-            android:parentActivityName="com.avs.sea.battle.main.MainActivity"/>
+        <activity
+            android:name="com.avs.sea.battle.privacy_policy.PrivacyPolicyActivity"
+            android:parentActivityName="com.avs.sea.battle.main.MainActivity"
+            android:screenOrientation="fullSensor" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/avs/sea/battle/Constants.kt b/app/src/main/java/com/avs/sea/battle/Constants.kt
index 21b20e5..14374d1 100644
--- a/app/src/main/java/com/avs/sea/battle/Constants.kt
+++ b/app/src/main/java/com/avs/sea/battle/Constants.kt
@@ -1,6 +1,6 @@
 package com.avs.sea.battle
 
-const val NAMESPACE = "com.avs.sea_battle"
+const val NAMESPACE = "com.avs.sea.battle"
 const val SQUARES_COUNT = 10
 const val FOUR_DECK_SHIP_SIZE = 4
 const val THREE_DECK_SHIP_SIZE = 3
diff --git a/app/src/main/java/com/avs/sea/battle/Utils.kt b/app/src/main/java/com/avs/sea/battle/Utils.kt
index e70f4c6..16a0552 100644
--- a/app/src/main/java/com/avs/sea/battle/Utils.kt
+++ b/app/src/main/java/com/avs/sea/battle/Utils.kt
@@ -7,7 +7,7 @@ import android.content.pm.ResolveInfo
 import android.net.Uri
 import java.util.*
 
-fun openGmail(activity: Activity, email: Array<String>, subject: String?): Intent? {
+fun openGmail(activity: Activity, email: Array<String>, subject: String?): Intent {
     val emailIntent = Intent(Intent.ACTION_SEND)
     emailIntent.putExtra(Intent.EXTRA_EMAIL, email)
     emailIntent.putExtra(Intent.EXTRA_SUBJECT, subject)
@@ -17,7 +17,7 @@ fun openGmail(activity: Activity, email: Array<String>, subject: String?): Inten
     var best: ResolveInfo? = null
     for (info in matches) {
         if (info.activityInfo.packageName.endsWith(".gm")
-            || info.activityInfo.name.toLowerCase(Locale.getDefault()).contains("gmail")
+            || info.activityInfo.name.lowercase(Locale.getDefault()).contains("gmail")
         ) best = info
     }
     if (best != null) emailIntent.setClassName(
@@ -37,7 +37,7 @@ fun getShareIntent(context: Context): Intent {
     return sharingIntent
 }
 
-fun openMarket(showAppsList: Boolean): Intent? {
+fun openMarket(showAppsList: Boolean): Intent {
     val uri = if (showAppsList) {
         Uri.parse("market://search?q=pub:$DEV_NAME")
     } else {
diff --git a/app/src/main/java/com/avs/sea/battle/battle_field/BattleField.kt b/app/src/main/java/com/avs/sea/battle/battle_field/BattleField.kt
index efccb0c..4820814 100644
--- a/app/src/main/java/com/avs/sea/battle/battle_field/BattleField.kt
+++ b/app/src/main/java/com/avs/sea/battle/battle_field/BattleField.kt
@@ -5,29 +5,36 @@ import com.avs.sea.battle.ships.*
 
 class BattleField : BaseBattleField() {
 
-    private val ships: List<Ship> = listOf(
-        FourDeckShip(), ThreeDeckShip(), ThreeDeckShip(),
-        TwoDeckShip(), TwoDeckShip(), TwoDeckShip(),
-        OneDeckShip(), OneDeckShip(), OneDeckShip(), OneDeckShip()
-    )
+    private lateinit var ships: List<Ship>
 
     fun randomizeShips() {
+        ships = listOf(
+            FourDeckShip(), ThreeDeckShip(), ThreeDeckShip(),
+            TwoDeckShip(), TwoDeckShip(), TwoDeckShip(),
+            OneDeckShip(), OneDeckShip(), OneDeckShip(), OneDeckShip()
+        )
         var isAdded: Boolean
         for (ship in ships) {
             isAdded = false
             while (!isAdded) {
                 val coordinate = getRandomCoordinate(ship)
                 if (battleField[coordinate.x][coordinate.y]?.getCellState() == CellState.EMPTY) {
+                    val length = ship.getLength()
                     isAdded = if (ship.getShipOrientation() == Orientation.VERTICAL) {
-                        (isUpCellEmpty(coordinate) && isBottomCellEmpty(coordinate, ship.getLength())
-                                && isVerticalCellsEmpty(coordinate, ship.getLength())
-                                && isLeftSideEmpty(coordinate, ship.getLength())
-                                && isRightSideEmpty(coordinate, ship.getLength()))
+                        (isUpCellEmpty(coordinate)
+                                && isUpCornerCellEmpty(coordinate)
+                                && isBottomCornerCellEmpty(coordinate, length)
+                                && isBottomCellEmpty(coordinate, length)
+                                && isVerticalCellsEmpty(coordinate, length)
+                                && isLeftSideEmpty(coordinate, length)
+                                && isRightSideEmpty(coordinate, length))
                     } else {
-                        (isStartCellEmpty(coordinate) && isEndCellEmpty(coordinate, ship.getLength())
-                                && isHorizontalCellsEmpty(coordinate, ship.getLength())
-                                && isTopSideEmpty(coordinate, ship.getLength())
-                                && isBottomSideEmpty(coordinate, ship.getLength()))
+                        (isStartCellEmpty(coordinate) && isEndCellEmpty(coordinate, length)
+                                && isStartCornerCellEmpty(coordinate)
+                                && isEndCornerCellEmpty(coordinate, length)
+                                && isHorizontalCellsEmpty(coordinate, length)
+                                && isTopSideEmpty(coordinate, length)
+                                && isBottomSideEmpty(coordinate, length))
                     }
                     if (isAdded) {
                         ship.setCellsCoordinates(coordinate.x, coordinate.y)
@@ -87,6 +94,16 @@ class BattleField : BaseBattleField() {
         return shipsCoordinates
     }
 
+    fun getAllShipsCoordinates(): ArrayList<Coordinate> {
+        val shipsCoordinates = arrayListOf<Coordinate>()
+        ships.forEach { ship ->
+            ship.getShipCells().forEach { cell ->
+                shipsCoordinates.add(cell.getCoordinate())
+            }
+        }
+        return shipsCoordinates
+    }
+
     fun getDotsCoordinates(): ArrayList<Coordinate> {
         val dotsCoordinates = arrayListOf<Coordinate>()
         for (i in battleField.indices) {
@@ -124,6 +141,22 @@ class BattleField : BaseBattleField() {
                 battleField[coordinate.x][coordinate.y + length]?.getCellState() == CellState.EMPTY))
     }
 
+    private fun isEndCornerCellEmpty(coordinate: Coordinate, length: Int): Boolean {
+        return (coordinate.y + length == SQUARES_COUNT - 1)
+                || (((coordinate.x == 0) || (coordinate.y < SQUARES_COUNT - 1 && coordinate.x > 0 &&
+                battleField[coordinate.x - 1][coordinate.y + length]?.getCellState() == CellState.EMPTY))
+                && ((coordinate.x == SQUARES_COUNT - 1)
+                || (coordinate.y < SQUARES_COUNT - 1 && coordinate.x < SQUARES_COUNT - 1 &&
+                battleField[coordinate.x + 1][coordinate.y + length]?.getCellState() == CellState.EMPTY)))
+    }
+
+    private fun isStartCornerCellEmpty(coordinate: Coordinate): Boolean {
+        return (coordinate.y == 0) || (((coordinate.x == 0) || (coordinate.y > 0 && coordinate.x > 0 &&
+                battleField[coordinate.x - 1][coordinate.y - 1]?.getCellState() == CellState.EMPTY))
+                && ((coordinate.x == SQUARES_COUNT - 1) || (coordinate.y > 0 && coordinate.x < SQUARES_COUNT - 1 &&
+                battleField[coordinate.x + 1][coordinate.y - 1]?.getCellState() == CellState.EMPTY)))
+    }
+
     private fun isUpCellEmpty(coordinate: Coordinate): Boolean {
         return ((coordinate.x == 0) || (coordinate.x > 0 &&
                 battleField[coordinate.x - 1][coordinate.y]?.getCellState() == CellState.EMPTY))
@@ -137,6 +170,23 @@ class BattleField : BaseBattleField() {
                 battleField[coordinate.x + length][coordinate.y]?.getCellState() == CellState.EMPTY))
     }
 
+    private fun isUpCornerCellEmpty(coordinate: Coordinate): Boolean {
+        return ((coordinate.x == 0) ||
+                (((coordinate.y == 0) || (coordinate.x > 0 && coordinate.y > 0 &&
+                        battleField[coordinate.x - 1][coordinate.y - 1]?.getCellState() == CellState.EMPTY))
+                        && ((coordinate.y == SQUARES_COUNT - 1) || (coordinate.x > 0 && coordinate.y < SQUARES_COUNT - 1 &&
+                        battleField[coordinate.x - 1][coordinate.y + 1]?.getCellState() == CellState.EMPTY))))
+    }
+
+    private fun isBottomCornerCellEmpty(coordinate: Coordinate, length: Int): Boolean {
+        return (coordinate.x + length == SQUARES_COUNT) ||
+                (((coordinate.y == 0) || (coordinate.x + length < SQUARES_COUNT - 1 && coordinate.y > 0 &&
+                        battleField[coordinate.x + length][coordinate.y - 1]?.getCellState() == CellState.EMPTY))
+                        && ((coordinate.y == SQUARES_COUNT - 1) ||
+                        (coordinate.x + length < SQUARES_COUNT - 1 && coordinate.y < SQUARES_COUNT - 1 &&
+                                battleField[coordinate.x + length][coordinate.y + 1]?.getCellState() == CellState.EMPTY)))
+    }
+
     private fun isLeftSideEmpty(coordinate: Coordinate, length: Int): Boolean {
         var isEmpty = true
         if (coordinate.y > 0) {
diff --git a/app/src/main/java/com/avs/sea/battle/battle_field/Cell.kt b/app/src/main/java/com/avs/sea/battle/battle_field/Cell.kt
index ab6675f..9d951cd 100644
--- a/app/src/main/java/com/avs/sea/battle/battle_field/Cell.kt
+++ b/app/src/main/java/com/avs/sea/battle/battle_field/Cell.kt
@@ -21,7 +21,7 @@ class Cell() {
         this.cellState = cellState
     }
 
-    fun isState(cellState: CellState) : Boolean {
+    fun isState(cellState: CellState): Boolean {
         return this.getCellState() == cellState
     }
 
diff --git a/app/src/main/java/com/avs/sea/battle/battle_field/CellState.kt b/app/src/main/java/com/avs/sea/battle/battle_field/CellState.kt
index 223f4de..f3a2365 100644
--- a/app/src/main/java/com/avs/sea/battle/battle_field/CellState.kt
+++ b/app/src/main/java/com/avs/sea/battle/battle_field/CellState.kt
@@ -1,6 +1,6 @@
 package com.avs.sea.battle.battle_field
 
-enum class CellState(val state : String) {
+enum class CellState(val state: String) {
 
     EMPTY("0"), SHIP("1"), SHOT_SUCCESS("X"), SHOT_FAILURE(".");
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/avs/sea/battle/battle_field/Coordinates.kt b/app/src/main/java/com/avs/sea/battle/battle_field/Coordinates.kt
index 7a6b81e..af2c504 100644
--- a/app/src/main/java/com/avs/sea/battle/battle_field/Coordinates.kt
+++ b/app/src/main/java/com/avs/sea/battle/battle_field/Coordinates.kt
@@ -1,22 +1,26 @@
 package com.avs.sea.battle.battle_field
 
 data class Coordinate(private var _x: Int = -1, private var _y: Int = -1) {
-    var x: Int get() = _x
-    set(value) {
-        _x = value
-    }
-    var y: Int get() = _y
+    var x: Int
+        get() = _x
+        set(value) {
+            _x = value
+        }
+    var y: Int
+        get() = _y
         set(value) {
             _y = value
         }
 }
 
 data class CoordinateF(private var _x: Float = 0.0F, private var _y: Float = 0.0F) {
-    var x: Float get() = _x
+    var x: Float
+        get() = _x
         set(value) {
             _x = value
         }
-    var y: Float get() = _y
+    var y: Float
+        get() = _y
         set(value) {
             _y = value
         }
diff --git a/app/src/main/java/com/avs/sea/battle/main/MainActivity.kt b/app/src/main/java/com/avs/sea/battle/main/MainActivity.kt
index a055f63..e056efa 100644
--- a/app/src/main/java/com/avs/sea/battle/main/MainActivity.kt
+++ b/app/src/main/java/com/avs/sea/battle/main/MainActivity.kt
@@ -16,11 +16,11 @@ import androidx.appcompat.view.ContextThemeWrapper
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.avs.sea.battle.*
 import com.avs.sea.battle.databinding.ActivityMainBinding
 import com.avs.sea.battle.privacy_policy.PrivacyPolicyActivity
+import com.google.android.play.core.review.ReviewManagerFactory
 
 class MainActivity : AppCompatActivity(), PopupMenu.OnMenuItemClickListener {
 
@@ -32,60 +32,68 @@ class MainActivity : AppCompatActivity(), PopupMenu.OnMenuItemClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
-        viewModel = ViewModelProvider(this).get(MainViewModel::class.java)
+        viewModel = ViewModelProvider(this)[MainViewModel::class.java]
         binding.mainViewModel = viewModel
 
-        binding.viewPerson.provideViewModel(viewModel)
         binding.viewComputer.provideViewModel(viewModel)
 
-        viewModel.status.observe(this, Observer { newStatusId ->
+        viewModel.status.observe(this, { newStatusId ->
             binding.tvStatus.text = resources.getText(newStatusId)
         })
 
-        viewModel.selectedByPersonCoordinate.observe(this, Observer { point ->
+        viewModel.selectedByPersonCoordinate.observe(this, { point ->
             binding.viewComputer.getSelectedCoordinate(point)
             binding.viewFire.visibility = if (point == null) View.INVISIBLE else View.VISIBLE
         })
 
-        viewModel.selectedByComputerCoordinate.observe(this, Observer {
+        viewModel.selectedByComputerCoordinate.observe(this, {
             binding.progressBar.visibility = View.VISIBLE
         })
 
-        viewModel.personShips.observe(this, Observer { coordinates ->
+        viewModel.personShips.observe(this, { coordinates ->
             binding.viewPerson.getShipsCoordinates(coordinates)
             if (coordinates.isNotEmpty()) {
                 binding.viewStart.visibility = View.VISIBLE
             }
         })
 
-        viewModel.personSuccessfulShots.observe(this, Observer { coordinates ->
+        viewModel.computerShips.observe(this, { coordinates ->
+            binding.viewComputer.setShipsCoordinates(coordinates)
+        })
+
+        viewModel.personSuccessfulShots.observe(this, { coordinates ->
             binding.viewComputer.getCrossesCoordinates(coordinates)
-            binding.viewFire.visibility = View.INVISIBLE
         })
 
-        viewModel.personFailedShots.observe(this, Observer { coordinates ->
+        viewModel.personFailedShots.observe(this, { coordinates ->
             binding.viewComputer.getDotsCoordinates(coordinates)
-            binding.viewFire.visibility = View.INVISIBLE
         })
 
-        viewModel.computerSuccessfulShots.observe(this, Observer { coordinates ->
+        viewModel.computerSuccessfulShots.observe(this, { coordinates ->
             binding.viewPerson.getCrossesCoordinates(coordinates)
             binding.progressBar.visibility = View.INVISIBLE
         })
 
-        viewModel.computerFailedShots.observe(this, Observer { coordinates ->
+        viewModel.computerFailedShots.observe(this, { coordinates ->
             binding.viewPerson.getDotsCoordinates(coordinates)
             binding.progressBar.visibility = View.INVISIBLE
         })
 
-        viewModel.startGameEvent.observe(this, Observer { isStarted ->
-            if (isStarted) binding.viewStart.visibility = View.INVISIBLE
+        viewModel.startGameEvent.observe(this, { isStarted ->
+            if (isStarted) binding.viewStart.visibility = View.GONE
             if (!isStarted) binding.viewNewGame.visibility = View.INVISIBLE
             binding.viewGenerate.visibility = if (isStarted) View.INVISIBLE else View.VISIBLE
         })
 
-        viewModel.endGameEvent.observe(this, Observer { isEnded ->
-            binding.viewNewGame.visibility = if (isEnded) View.VISIBLE else View.INVISIBLE
+        viewModel.endGameEvent.observe(this, { eventPair ->
+            if (eventPair.first) {
+                binding.viewNewGame.visibility = View.VISIBLE
+                if (eventPair.second == Player.PERSON) {
+                    launchReviewFlow()
+                }
+            } else {
+                binding.viewNewGame.visibility = View.INVISIBLE
+            }
         })
         binding.ivMore.setOnClickListener { view -> showPopup(view) }
         binding.viewGenerate.setOnTouchListener(customOnTouchListener)
@@ -123,18 +131,7 @@ class MainActivity : AppCompatActivity(), PopupMenu.OnMenuItemClickListener {
             PopupMenu(wrapper, v).apply {
                 setOnMenuItemClickListener(this@MainActivity)
                 inflate(R.menu.menu)
-                try {
-                    val fieldMPopup = PopupMenu::class.java.getDeclaredField("mPopup")
-                    fieldMPopup.isAccessible = true
-                    val popup = fieldMPopup.get(this)
-                    popup.javaClass
-                        .getDeclaredMethod("setForceShowIcon", Boolean::class.java)
-                        .invoke(popup, true)
-                } catch (e: Exception) {
-                    if (BuildConfig.DEBUG) Log.d(this::class.java.simpleName, e.toString())
-                } finally {
-                    show()
-                }
+                show()
             }
         }
     }
@@ -177,4 +174,17 @@ class MainActivity : AppCompatActivity(), PopupMenu.OnMenuItemClickListener {
             Toast.makeText(this, resources.getString(messageId), Toast.LENGTH_LONG).show()
         }
     }
+
+    private fun launchReviewFlow() {
+        baseContext?.let { context ->
+            val manager = ReviewManagerFactory.create(context)
+            val request = manager.requestReviewFlow()
+            request.addOnCompleteListener {
+                val flow = manager.launchReviewFlow(this, it.result)
+                flow.addOnCompleteListener {
+                    Log.d("Review", "Review flow completed")
+                }
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/com/avs/sea/battle/main/MainViewModel.kt b/app/src/main/java/com/avs/sea/battle/main/MainViewModel.kt
index ee74b13..c486f0f 100644
--- a/app/src/main/java/com/avs/sea/battle/main/MainViewModel.kt
+++ b/app/src/main/java/com/avs/sea/battle/main/MainViewModel.kt
@@ -3,6 +3,7 @@ package com.avs.sea.battle.main
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.avs.sea.battle.R
 import com.avs.sea.battle.SECOND_IN_MILLIS
 import com.avs.sea.battle.battle_field.BattleField
@@ -24,6 +25,9 @@ class MainViewModel : ViewModel() {
     private var _personShips = MutableLiveData<ArrayList<Coordinate>>()
     val personShips: LiveData<ArrayList<Coordinate>>
         get() = _personShips
+    private var _computerShips = MutableLiveData<ArrayList<Coordinate>>()
+    val computerShips: LiveData<ArrayList<Coordinate>>
+        get() = _computerShips
     private var _personFailShots = MutableLiveData<ArrayList<Coordinate>>()
     val personFailedShots: LiveData<ArrayList<Coordinate>>
         get() = _personFailShots
@@ -39,11 +43,9 @@ class MainViewModel : ViewModel() {
     private var _startGameEvent = MutableLiveData<Boolean>()
     val startGameEvent: LiveData<Boolean>
         get() = _startGameEvent
-    private var _endGameEvent = MutableLiveData<Boolean>()
-    val endGameEvent: LiveData<Boolean>
+    private var _endGameEvent = MutableLiveData<Pair<Boolean, Player?>>()
+    val endGameEvent: LiveData<Pair<Boolean, Player?>>
         get() = _endGameEvent
-    private var viewModelJob = Job()
-    private var uiScope = CoroutineScope(Dispatchers.Main + viewModelJob)
     private lateinit var personBattleField: BattleField
     private lateinit var computerBattleField: BattleField
     private lateinit var shotManager: ShotManager
@@ -52,11 +54,6 @@ class MainViewModel : ViewModel() {
         initValues()
     }
 
-    override fun onCleared() {
-        super.onCleared()
-        viewModelJob.cancel()
-    }
-
     private fun initValues() {
         activePlayer = Player.NONE
         shotManager = ShotManager()
@@ -64,7 +61,7 @@ class MainViewModel : ViewModel() {
         computerBattleField = BattleField()
         _status.value = R.string.status_welcome_text
         _startGameEvent.value = false
-        _endGameEvent.value = false
+        _endGameEvent.value = false to null
         _selectedByPersonCoordinate.value = null
         computerBattleField.randomizeShips()
     }
@@ -84,6 +81,7 @@ class MainViewModel : ViewModel() {
     fun startNewGame() {
         initValues()
         _personShips.value = ArrayList()
+        _computerShips.value = ArrayList()
         _personFailShots.value = ArrayList()
         _personSuccessfulShots.value = ArrayList()
         _computerFailShots.value = ArrayList()
@@ -132,8 +130,8 @@ class MainViewModel : ViewModel() {
         val isShipHit = personBattleField.handleShot(coordinate)
         shotManager.handleShot(isShipHit)
         if (isShipHit) {
-            uiScope.launch {
-                delay(SECOND_IN_MILLIS * 2)
+            viewModelScope.launch {
+                delay(SECOND_IN_MILLIS + SECOND_IN_MILLIS / 2)
                 _computerSuccessfulShots.value = personBattleField.getCrossesCoordinates()
                 if (personBattleField.isGameOver()) {
                     endGame(false)
@@ -143,8 +141,8 @@ class MainViewModel : ViewModel() {
                 }
             }
         } else {
-            uiScope.launch {
-                delay(SECOND_IN_MILLIS * 2)
+            viewModelScope.launch {
+                delay(SECOND_IN_MILLIS + SECOND_IN_MILLIS / 2)
                 _computerFailShots.value = personBattleField.getDotsCoordinates()
                 activePlayer = Player.PERSON
                 checkCurrentPlayer()
@@ -163,10 +161,12 @@ class MainViewModel : ViewModel() {
 
     private fun endGame(isPersonWon: Boolean) {
         activePlayer = Player.NONE
-        _endGameEvent.value = true
+        _computerShips.value = computerBattleField.getAllShipsCoordinates()
         if (isPersonWon) {
+            _endGameEvent.value = true to Player.PERSON
             _status.value = R.string.status_game_over_you_win_text
         } else {
+            _endGameEvent.value = true to Player.COMPUTER
             _status.value = R.string.status_game_over_you_lose_text
         }
     }
diff --git a/app/src/main/java/com/avs/sea/battle/main/ShotManager.kt b/app/src/main/java/com/avs/sea/battle/main/ShotManager.kt
index daf5feb..b9eaff5 100644
--- a/app/src/main/java/com/avs/sea/battle/main/ShotManager.kt
+++ b/app/src/main/java/com/avs/sea/battle/main/ShotManager.kt
@@ -146,17 +146,17 @@ class ShotManager {
 
     fun getMaxCoordinate(list: MutableList<Coordinate>, orientation: Orientation): Coordinate {
         return if (orientation == Orientation.VERTICAL) {
-            list.maxBy { it.x }!!
+            list.maxByOrNull { it.x }!!
         } else {
-            list.maxBy { it.y }!!
+            list.maxByOrNull { it.y }!!
         }
     }
 
     fun getMinCoordinate(list: MutableList<Coordinate>, orientation: Orientation): Coordinate {
         return if (orientation == Orientation.VERTICAL) {
-            list.minBy { it.x }!!
+            list.minByOrNull { it.x }!!
         } else {
-            list.minBy { it.y }!!
+            list.minByOrNull { it.y }!!
         }
     }
 
@@ -291,11 +291,19 @@ class ShotManager {
     fun markHorizontalNeighbours(cell: Cell) {
         battleField.setCellState(Coordinate(cell.getX(), cell.getY() - 1), SHOT_FAILURE)
         battleField.setCellState(Coordinate(cell.getX(), cell.getY() + 1), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() - 1, cell.getY() - 1), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() - 1, cell.getY() + 1), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() + 1, cell.getY() - 1), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() + 1, cell.getY() + 1), SHOT_FAILURE)
     }
 
     fun markVerticalNeighbours(cell: Cell) {
         battleField.setCellState(Coordinate(cell.getX() - 1, cell.getY()), SHOT_FAILURE)
         battleField.setCellState(Coordinate(cell.getX() + 1, cell.getY()), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() - 1, cell.getY() - 1), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() + 1, cell.getY() - 1), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() - 1, cell.getY() + 1), SHOT_FAILURE)
+        battleField.setCellState(Coordinate(cell.getX() + 1, cell.getY() + 1), SHOT_FAILURE)
     }
 
     fun updateBattleField(shipHit: Boolean, currentCell: Cell) {
diff --git a/app/src/main/java/com/avs/sea/battle/views/ComputerSquareView.kt b/app/src/main/java/com/avs/sea/battle/views/ComputerSquareView.kt
index 822077e..0fd3110 100644
--- a/app/src/main/java/com/avs/sea/battle/views/ComputerSquareView.kt
+++ b/app/src/main/java/com/avs/sea/battle/views/ComputerSquareView.kt
@@ -13,6 +13,7 @@ import com.avs.sea.battle.battle_field.Coordinate
 
 class ComputerSquareView : SquareView {
 
+    private var shipsCoordinates: ArrayList<Coordinate> = arrayListOf()
     private lateinit var dotsCoordinates: ArrayList<Coordinate>
     private lateinit var crossesCoordinates: ArrayList<Coordinate>
     private lateinit var paintSelected: Paint
@@ -41,6 +42,11 @@ class ComputerSquareView : SquareView {
 
     override fun onDraw(canvas: Canvas?) {
         super.onDraw(canvas)
+        if (shipsCoordinates.isNotEmpty()) {
+            for (ship in shipsCoordinates) {
+                canvas?.drawSquare(ship.y, ship.x, paintShipSquare)
+            }
+        }
         if (dotsCoordinates.isNotEmpty()) {
             for (coordinate in dotsCoordinates) {
                 canvas?.drawDot(coordinate)
@@ -56,6 +62,11 @@ class ComputerSquareView : SquareView {
         }
     }
 
+    fun setShipsCoordinates(coordinates: ArrayList<Coordinate>) {
+        this.shipsCoordinates = coordinates
+        invalidate()
+    }
+
     private fun getCustomOnTouchListener(): (View, MotionEvent) -> Boolean {
         return { _: View, event: MotionEvent ->
             when (event.action) {
diff --git a/app/src/main/java/com/avs/sea/battle/views/SquareView.kt b/app/src/main/java/com/avs/sea/battle/views/SquareView.kt
index 31ff199..944e57a 100644
--- a/app/src/main/java/com/avs/sea/battle/views/SquareView.kt
+++ b/app/src/main/java/com/avs/sea/battle/views/SquareView.kt
@@ -68,8 +68,10 @@ abstract class SquareView : View {
     override fun onDraw(canvas: Canvas?) {
         paint.color = Color.BLACK
         paint.strokeWidth = lineWidth
-        drawHorizontalLines(canvas!!)
-        drawVerticalLines(canvas)
+        canvas?.let {
+            drawHorizontalLines(it)
+            drawVerticalLines(it)
+        }
     }
 
     private fun drawHorizontalLines(canvas: Canvas) {
@@ -101,7 +103,7 @@ abstract class SquareView : View {
     }
 
     fun Canvas.drawCross(i: Int, j: Int) {
-        paint.strokeWidth = lineWidth * 2
+        paint.strokeWidth = lineWidth * 2.5F
         this.drawLines(getCrossCoordinates(i, j), paint)
     }
 
diff --git a/app/src/main/res/drawable/ic_rate_review.xml b/app/src/main/res/drawable/ic_rate_review.xml
deleted file mode 100644
index 3391519..0000000
--- a/app/src/main/res/drawable/ic_rate_review.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimaryDark"
-        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,14v-2.47l6.88,-6.88c0.2,-0.2 0.51,-0.2 0.71,0l1.77,1.77c0.2,0.2 0.2,0.51 0,0.71L8.47,14L6,14zM18,14h-7.5l2,-2L18,12v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
deleted file mode 100644
index e6ada74..0000000
--- a/app/src/main/res/drawable/ic_share.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimaryDark"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_shop.xml b/app/src/main/res/drawable/ic_shop.xml
deleted file mode 100644
index 32daa99..0000000
--- a/app/src/main/res/drawable/ic_shop.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimaryDark"
-        android:pathData="M16,6L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L2,6v13c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6h-6zM10,4h4v2h-4L10,4zM9,18L9,9l7.5,4L9,18z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
deleted file mode 100644
index 630b07c..0000000
--- a/app/src/main/res/drawable/ic_star.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimaryDark"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
deleted file mode 100644
index ae97766..0000000
--- a/app/src/main/res/drawable/ic_warning.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/colorPrimaryDark"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
-</vector>
diff --git a/app/src/main/res/font/neucha.ttf b/app/src/main/res/font/neucha.ttf
new file mode 100644
index 0000000..d495d83
Binary files /dev/null and b/app/src/main/res/font/neucha.ttf differ
diff --git a/app/src/main/res/layout-land-v21/activity_main.xml b/app/src/main/res/layout-land-v21/activity_main.xml
new file mode 100644
index 0000000..c8d8007
--- /dev/null
+++ b/app/src/main/res/layout-land-v21/activity_main.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="mainViewModel"
+            type="com.avs.sea.battle.main.MainViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="horizontal"
+        tools:context=".main.MainActivity">
+
+        <ImageView
+            android:id="@+id/ivMore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/more_settings"
+            android:focusable="true"
+            android:padding="@dimen/dimen_8dp"
+            app:srcCompat="@drawable/ic_more"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dimen_10dp"
+            android:ellipsize="end"
+            android:fontFamily="@font/neucha"
+            android:gravity="center"
+            android:paddingStart="@dimen/dimen_10dp"
+            android:paddingEnd="@dimen/dimen_10dp"
+            android:singleLine="true"
+            android:text="@string/status_welcome_text"
+            android:textColor="@color/colorAccent"
+            android:textSize="@dimen/text_size_16sp"
+            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
+            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <include
+            android:id="@+id/lettersPerson"
+            layout="@layout/layout_letters_person" />
+
+        <include layout="@layout/layout_numbers_person" />
+
+        <com.avs.sea.battle.views.PersonSquareView
+            android:id="@+id/viewPerson"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/dimen_16dp"
+            android:layout_marginTop="@dimen/dimen_24dp"
+            android:layout_marginEnd="@dimen/dimen_8dp"
+            android:background="@drawable/square_background"
+            app:layout_constraintBottom_toBottomOf="@id/guideline"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/viewComputer"
+            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
+
+        <TextView
+            android:id="@+id/viewGenerate"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.generateShips()}"
+            android:text="@string/generate_ships_text"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
+            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <include
+            android:id="@+id/lettersPC"
+            layout="@layout/layout_letters_pc" />
+
+        <include layout="@layout/layout_numbers_pc" />
+
+        <com.avs.sea.battle.views.ComputerSquareView
+            android:id="@+id/viewComputer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/dimen_16dp"
+            android:layout_marginTop="@dimen/dimen_24dp"
+            android:layout_marginEnd="@dimen/dimen_8dp"
+            android:background="@drawable/square_background"
+            app:layout_constraintBottom_toBottomOf="@id/guideline"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintLeft_toRightOf="@+id/viewPerson"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
+
+        <TextView
+            android:id="@+id/viewFire"
+            style="@style/FireButtonStyle"
+            android:onClick="@{() -> mainViewModel.makeFireAsPerson()}"
+            android:text="@string/fire_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
+            app:layout_constraintStart_toStartOf="@+id/viewComputer"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.85" />
+
+        <TextView
+            android:id="@+id/viewStart"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.startGame()}"
+            android:text="@string/start_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
+            app:layout_constraintStart_toEndOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <TextView
+            android:id="@+id/viewNewGame"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.startNewGame()}"
+            android:text="@string/new_game_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
+            app:layout_constraintStart_toEndOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminateTint="@color/colorAccent"
+            android:indeterminateTintMode="src_in"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
+            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 0000000..b70358a
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="mainViewModel"
+            type="com.avs.sea.battle.main.MainViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="horizontal"
+        tools:context=".main.MainActivity">
+
+        <ImageView
+            android:id="@+id/ivMore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/more_settings"
+            android:focusable="true"
+            android:padding="@dimen/dimen_8dp"
+            app:srcCompat="@drawable/ic_more"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dimen_10dp"
+            android:ellipsize="end"
+            android:fontFamily="@font/neucha"
+            android:gravity="center"
+            android:paddingStart="@dimen/dimen_10dp"
+            android:paddingEnd="@dimen/dimen_10dp"
+            android:singleLine="true"
+            android:text="@string/status_welcome_text"
+            android:textColor="@color/colorAccent"
+            android:textSize="@dimen/text_size_16sp"
+            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
+            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <include
+            android:id="@+id/lettersPerson"
+            layout="@layout/layout_letters_person" />
+
+        <include layout="@layout/layout_numbers_person" />
+
+        <com.avs.sea.battle.views.PersonSquareView
+            android:id="@+id/viewPerson"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/dimen_16dp"
+            android:layout_marginTop="@dimen/dimen_24dp"
+            android:layout_marginEnd="@dimen/dimen_8dp"
+            android:background="@drawable/square_background"
+            app:layout_constraintBottom_toBottomOf="@id/guideline"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/viewComputer"
+            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
+
+        <TextView
+            android:id="@+id/viewGenerate"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.generateShips()}"
+            android:text="@string/generate_ships_text"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
+            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <include
+            android:id="@+id/lettersPC"
+            layout="@layout/layout_letters_pc" />
+
+        <include layout="@layout/layout_numbers_pc" />
+
+        <com.avs.sea.battle.views.ComputerSquareView
+            android:id="@+id/viewComputer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/dimen_16dp"
+            android:layout_marginTop="@dimen/dimen_24dp"
+            android:layout_marginEnd="@dimen/dimen_8dp"
+            android:background="@drawable/square_background"
+            app:layout_constraintBottom_toBottomOf="@id/guideline"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintLeft_toRightOf="@+id/viewPerson"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
+
+        <TextView
+            android:id="@+id/viewFire"
+            style="@style/FireButtonStyle"
+            android:onClick="@{() -> mainViewModel.makeFireAsPerson()}"
+            android:text="@string/fire_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
+            app:layout_constraintStart_toStartOf="@+id/viewComputer"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.85" />
+
+        <TextView
+            android:id="@+id/viewStart"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.startGame()}"
+            android:text="@string/start_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
+            app:layout_constraintStart_toEndOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <TextView
+            android:id="@+id/viewNewGame"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.startNewGame()}"
+            android:text="@string/new_game_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
+            app:layout_constraintStart_toEndOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
+            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v21/activity_main.xml b/app/src/main/res/layout-v21/activity_main.xml
new file mode 100644
index 0000000..1b7f1fe
--- /dev/null
+++ b/app/src/main/res/layout-v21/activity_main.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="mainViewModel"
+            type="com.avs.sea.battle.main.MainViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary"
+        android:orientation="horizontal"
+        tools:context=".main.MainActivity">
+
+        <ImageView
+            android:id="@+id/ivMore"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:clickable="true"
+            android:contentDescription="@string/more_settings"
+            android:focusable="true"
+            android:padding="@dimen/dimen_8dp"
+            app:srcCompat="@drawable/ic_more"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dimen_8dp"
+            android:ellipsize="end"
+            android:fontFamily="@font/neucha"
+            android:gravity="center"
+            android:paddingStart="@dimen/dimen_10dp"
+            android:paddingEnd="@dimen/dimen_10dp"
+            android:singleLine="false"
+            android:text="@string/status_welcome_text"
+            android:textColor="@color/colorAccent"
+            android:textSize="@dimen/text_size_16sp"
+            android:layout_marginStart="@dimen/dimen_4dp"
+            android:layout_marginEnd="@dimen/dimen_4dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <include
+            android:id="@+id/lettersPerson"
+            layout="@layout/layout_letters_person" />
+
+        <include
+            android:id="@+id/numbersPerson"
+            layout="@layout/layout_numbers_person" />
+
+        <com.avs.sea.battle.views.PersonSquareView
+            android:id="@+id/viewPerson"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/dimen_16dp"
+            android:background="@drawable/square_background"
+            app:layout_constraintBottom_toTopOf="@+id/guideline2"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toStartOf="@+id/guideline5"
+            app:layout_constraintStart_toStartOf="@+id/guideline4"
+            app:layout_constraintTop_toTopOf="@+id/guideline6"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <TextView
+            android:id="@+id/viewGenerate"
+            style="@style/MainButtonStyle"
+            android:gravity="center"
+            android:onClick="@{() -> mainViewModel.generateShips()}"
+            android:text="@string/generate_ships_text"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/viewStart"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <include
+            android:id="@+id/lettersPC"
+            layout="@layout/layout_letters_pc" />
+
+        <include layout="@layout/layout_numbers_pc" />
+
+        <com.avs.sea.battle.views.ComputerSquareView
+            android:id="@+id/viewComputer"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/dimen_16dp"
+            android:background="@drawable/square_background"
+            app:layout_constraintBottom_toBottomOf="@id/guideline"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintEnd_toStartOf="@+id/guideline5"
+            app:layout_constraintStart_toStartOf="@+id/guideline4"
+            app:layout_constraintTop_toTopOf="@+id/guideline2"
+            app:layout_constraintVertical_bias="0.0" />
+
+        <TextView
+            android:id="@+id/viewFire"
+            style="@style/FireButtonStyle"
+            android:onClick="@{() -> mainViewModel.makeFireAsPerson()}"
+            android:text="@string/fire_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.9" />
+
+        <TextView
+            android:id="@+id/viewStart"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.startGame()}"
+            android:text="@string/start_text"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/viewGenerate"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <TextView
+            android:id="@+id/viewNewGame"
+            style="@style/MainButtonStyle"
+            android:onClick="@{() -> mainViewModel.startNewGame()}"
+            android:text="@string/new_game_text"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:indeterminateTint="@color/colorAccent"
+            android:indeterminateTintMode="src_in"
+            android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/guideline" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.5" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.15" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.85" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.1" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c7c6148..a1b6ad9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="mainViewModel"
             type="com.avs.sea.battle.main.MainViewModel" />
@@ -20,62 +21,67 @@
             android:id="@+id/ivMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_more"
-            android:padding="@dimen/dimen_8dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
+            android:contentDescription="@string/more_settings"
             android:focusable="true"
+            android:padding="@dimen/dimen_8dp"
+            app:srcCompat="@drawable/ic_more"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:contentDescription="@string/more_settings">
-        </ImageView>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tvStatus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dimen_10dp"
+            android:layout_marginTop="@dimen/dimen_8dp"
             android:ellipsize="end"
-            android:fontFamily="casual"
+            android:fontFamily="@font/neucha"
             android:gravity="center"
             android:paddingStart="@dimen/dimen_10dp"
             android:paddingEnd="@dimen/dimen_10dp"
-            android:singleLine="true"
+            android:singleLine="false"
             android:text="@string/status_welcome_text"
+            android:maxLines="2"
+            android:layout_marginStart="@dimen/dimen_4dp"
+            android:layout_marginEnd="@dimen/dimen_4dp"
             android:textColor="@color/colorAccent"
-            android:textSize="@dimen/text_size_14sp"
-            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
-            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            android:textSize="@dimen/text_size_16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <include
             android:id="@+id/lettersPerson"
             layout="@layout/layout_letters_person" />
 
-        <include layout="@layout/layout_numbers_person" />
+        <include
+            android:id="@+id/numbersPerson"
+            layout="@layout/layout_numbers_person" />
 
         <com.avs.sea.battle.views.PersonSquareView
             android:id="@+id/viewPerson"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="@dimen/dimen_16dp"
-            android:layout_marginTop="@dimen/dimen_24dp"
-            android:layout_marginEnd="@dimen/dimen_8dp"
+            android:layout_marginBottom="@dimen/dimen_16dp"
             android:background="@drawable/square_background"
-            app:layout_constraintBottom_toBottomOf="@id/guideline"
+            app:layout_constraintBottom_toTopOf="@+id/guideline2"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toLeftOf="@+id/viewComputer"
-            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
+            app:layout_constraintEnd_toStartOf="@+id/guideline5"
+            app:layout_constraintStart_toStartOf="@+id/guideline4"
+            app:layout_constraintTop_toTopOf="@+id/guideline6"
+            app:layout_constraintVertical_bias="0.0" />
 
         <TextView
             android:id="@+id/viewGenerate"
             style="@style/MainButtonStyle"
+            android:gravity="center"
             android:onClick="@{() -> mainViewModel.generateShips()}"
             android:text="@string/generate_ships_text"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
-            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintEnd_toStartOf="@+id/viewStart"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/guideline" />
 
         <include
@@ -88,25 +94,24 @@
             android:id="@+id/viewComputer"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginStart="@dimen/dimen_16dp"
-            android:layout_marginTop="@dimen/dimen_24dp"
-            android:layout_marginEnd="@dimen/dimen_8dp"
+            android:layout_marginTop="@dimen/dimen_16dp"
             android:background="@drawable/square_background"
             app:layout_constraintBottom_toBottomOf="@id/guideline"
             app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintLeft_toRightOf="@+id/viewPerson"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvStatus" />
+            app:layout_constraintEnd_toStartOf="@+id/guideline5"
+            app:layout_constraintStart_toStartOf="@+id/guideline4"
+            app:layout_constraintTop_toTopOf="@+id/guideline2"
+            app:layout_constraintVertical_bias="0.0" />
 
         <TextView
             android:id="@+id/viewFire"
-            style="@style/MainButtonStyle"
+            style="@style/FireButtonStyle"
             android:onClick="@{() -> mainViewModel.makeFireAsPerson()}"
             android:text="@string/fire_text"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/viewComputer"
-            app:layout_constraintStart_toStartOf="@+id/viewComputer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/guideline" />
 
         <androidx.constraintlayout.widget.Guideline
@@ -114,17 +119,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.85" />
+            app:layout_constraintGuide_percent="0.9" />
 
         <TextView
             android:id="@+id/viewStart"
             style="@style/MainButtonStyle"
             android:onClick="@{() -> mainViewModel.startGame()}"
             android:text="@string/start_text"
-            android:visibility="invisible"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
-            app:layout_constraintStart_toEndOf="@+id/viewPerson"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/viewGenerate"
             app:layout_constraintTop_toTopOf="@+id/guideline" />
 
         <TextView
@@ -134,8 +140,8 @@
             android:text="@string/new_game_text"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/viewComputer"
-            app:layout_constraintStart_toEndOf="@+id/viewPerson"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/guideline" />
 
         <ProgressBar
@@ -143,14 +149,40 @@
             style="?android:attr/progressBarStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminateTint="@color/colorAccent"
             android:visibility="invisible"
-            android:indeterminateTintMode="src_in"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@+id/viewPerson"
-            app:layout_constraintStart_toStartOf="@+id/viewPerson"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/guideline" />
 
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.5" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.15" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.85" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_percent="0.1" />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_letters_pc.xml b/app/src/main/res/layout/layout_letters_pc.xml
index 5b49e0b..d70b82f 100644
--- a/app/src/main/res/layout/layout_letters_pc.xml
+++ b/app/src/main/res/layout/layout_letters_pc.xml
@@ -6,92 +6,92 @@
 
     <TextView
         android:id="@+id/tvLetterPCA"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_a"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toLeftOf="@id/viewComputer"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCB"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCB" />
 
 
     <TextView
         android:id="@+id/tvLetterPCB"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_b"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCA"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCC"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCC" />
 
     <TextView
         android:id="@+id/tvLetterPCC"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_c"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCB"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCD"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCD" />
 
     <TextView
         android:id="@+id/tvLetterPCD"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_d"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCC"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCE"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCE" />
 
     <TextView
         android:id="@+id/tvLetterPCE"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_e"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCD"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCF"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCF" />
 
     <TextView
         android:id="@+id/tvLetterPCF"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_f"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCE"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCG"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCG" />
 
     <TextView
         android:id="@+id/tvLetterPCG"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_g"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCF"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCH"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCH" />
 
     <TextView
         android:id="@+id/tvLetterPCH"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_h"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCG"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCI"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCI" />
 
     <TextView
         android:id="@+id/tvLetterPCI"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_i"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCH"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCJ"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterPCJ" />
 
     <TextView
         android:id="@+id/tvLetterPCJ"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_j"
         app:layout_constraintBottom_toTopOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterPCI"
-        app:layout_constraintRight_toRightOf="@id/viewComputer"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toRightOf="@id/viewComputer" />
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_letters_person.xml b/app/src/main/res/layout/layout_letters_person.xml
index 68878e5..7cc6a39 100644
--- a/app/src/main/res/layout/layout_letters_person.xml
+++ b/app/src/main/res/layout/layout_letters_person.xml
@@ -6,92 +6,92 @@
 
     <TextView
         android:id="@+id/tvLetterA"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_a"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toLeftOf="@id/viewPerson"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterB"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterB" />
 
 
     <TextView
         android:id="@+id/tvLetterB"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_b"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterA"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterC"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterC" />
 
     <TextView
         android:id="@+id/tvLetterC"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_c"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterB"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterD"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterD" />
 
     <TextView
         android:id="@+id/tvLetterD"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_d"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterC"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterE"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterE" />
 
     <TextView
         android:id="@+id/tvLetterE"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_e"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterD"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterF"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterF" />
 
     <TextView
         android:id="@+id/tvLetterF"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_f"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterE"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterG"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterG" />
 
     <TextView
         android:id="@+id/tvLetterG"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_g"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterF"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterH"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterH" />
 
     <TextView
         android:id="@+id/tvLetterH"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_h"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterG"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterI"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterI" />
 
     <TextView
         android:id="@+id/tvLetterI"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_i"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterH"
-        app:layout_constraintRight_toLeftOf="@+id/tvLetterJ"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toLeftOf="@+id/tvLetterJ" />
 
     <TextView
         android:id="@+id/tvLetterJ"
+        style="@style/SingleCharacterStyle"
         android:text="@string/letter_j"
         app:layout_constraintBottom_toTopOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintLeft_toRightOf="@+id/tvLetterI"
-        app:layout_constraintRight_toRightOf="@id/viewPerson"
-        style="@style/SingleDigitStyle" />
+        app:layout_constraintRight_toRightOf="@id/viewPerson" />
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_numbers_pc.xml b/app/src/main/res/layout/layout_numbers_pc.xml
index eb56c9c..4b9d600 100644
--- a/app/src/main/res/layout/layout_numbers_pc.xml
+++ b/app/src/main/res/layout/layout_numbers_pc.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:tools="http://schemas.android.com/tools"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     tools:showIn="@layout/activity_main">
 
     <TextView
         android:id="@+id/tvNumber1PC"
-        android:text="@string/number_1"
         style="@style/SingleDigitStyle"
         android:gravity="center"
+        android:text="@string/number_1"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber2PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -17,18 +17,18 @@
     <TextView
         android:id="@+id/tvNumber2PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_2"
         android:gravity="center"
+        android:text="@string/number_2"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber3PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
-        app:layout_constraintTop_toBottomOf="@+id/tvNumber1" />
+        app:layout_constraintTop_toBottomOf="@+id/tvNumber1PC" />
 
     <TextView
         android:id="@+id/tvNumber3PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_3"
         android:gravity="center"
+        android:text="@string/number_3"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber4PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -37,8 +37,8 @@
     <TextView
         android:id="@+id/tvNumber4PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_4"
         android:gravity="center"
+        android:text="@string/number_4"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber5PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -47,8 +47,8 @@
     <TextView
         android:id="@+id/tvNumber5PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_5"
         android:gravity="center"
+        android:text="@string/number_5"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber6PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -57,8 +57,8 @@
     <TextView
         android:id="@+id/tvNumber6PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_6"
         android:gravity="center"
+        android:text="@string/number_6"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber7PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -67,8 +67,8 @@
     <TextView
         android:id="@+id/tvNumber7PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_7"
         android:gravity="center"
+        android:text="@string/number_7"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber8PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -77,8 +77,8 @@
     <TextView
         android:id="@+id/tvNumber8PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_8"
         android:gravity="center"
+        android:text="@string/number_8"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber9PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -87,8 +87,8 @@
     <TextView
         android:id="@+id/tvNumber9PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_9"
         android:gravity="center"
+        android:text="@string/number_9"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber10PC"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
@@ -97,8 +97,8 @@
     <TextView
         android:id="@+id/tvNumber10PC"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_10"
         android:gravity="center"
+        android:text="@string/number_10"
         app:layout_constraintBottom_toBottomOf="@+id/viewComputer"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewComputer"
diff --git a/app/src/main/res/layout/layout_numbers_person.xml b/app/src/main/res/layout/layout_numbers_person.xml
index cc949a8..0f222ef 100644
--- a/app/src/main/res/layout/layout_numbers_person.xml
+++ b/app/src/main/res/layout/layout_numbers_person.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:tools="http://schemas.android.com/tools"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     tools:showIn="@layout/activity_main">
 
     <TextView
         android:id="@+id/tvNumber1"
-        android:text="@string/number_1"
         style="@style/SingleDigitStyle"
         android:gravity="center_vertical"
+        android:text="@string/number_1"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber2"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -17,8 +17,8 @@
     <TextView
         android:id="@+id/tvNumber2"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_2"
         android:gravity="center_vertical"
+        android:text="@string/number_2"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber3"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -27,8 +27,8 @@
     <TextView
         android:id="@+id/tvNumber3"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_3"
         android:gravity="center_vertical"
+        android:text="@string/number_3"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber4"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -37,8 +37,8 @@
     <TextView
         android:id="@+id/tvNumber4"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_4"
         android:gravity="center_vertical"
+        android:text="@string/number_4"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber5"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -47,8 +47,8 @@
     <TextView
         android:id="@+id/tvNumber5"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_5"
         android:gravity="center_vertical"
+        android:text="@string/number_5"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber6"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -57,8 +57,8 @@
     <TextView
         android:id="@+id/tvNumber6"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_6"
         android:gravity="center_vertical"
+        android:text="@string/number_6"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber7"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -67,8 +67,8 @@
     <TextView
         android:id="@+id/tvNumber7"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_7"
         android:gravity="center_vertical"
+        android:text="@string/number_7"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber8"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -77,8 +77,8 @@
     <TextView
         android:id="@+id/tvNumber8"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_8"
         android:gravity="center_vertical"
+        android:text="@string/number_8"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber9"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -87,8 +87,8 @@
     <TextView
         android:id="@+id/tvNumber9"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_9"
         android:gravity="center_vertical"
+        android:text="@string/number_9"
         app:layout_constraintBottom_toTopOf="@+id/tvNumber10"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
@@ -97,8 +97,8 @@
     <TextView
         android:id="@+id/tvNumber10"
         style="@style/SingleDigitStyle"
-        android:text="@string/number_10"
         android:gravity="center_vertical"
+        android:text="@string/number_10"
         app:layout_constraintBottom_toBottomOf="@+id/viewPerson"
         app:layout_constraintDimensionRatio="1:1"
         app:layout_constraintEnd_toStartOf="@+id/viewPerson"
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 099af99..04ac390 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -3,27 +3,22 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/share"
-        android:icon="@drawable/ic_share"
         android:title="@string/menu_share_text"
         app:showAsAction="never" />
     <item
         android:id="@+id/rate"
-        android:icon="@drawable/ic_star"
         android:title="@string/menu_rate_on_play_market_text"
         app:showAsAction="never" />
     <item
         android:id="@+id/more_apps"
-        android:icon="@drawable/ic_shop"
         android:title="@string/menu_more_apps_text"
         app:showAsAction="never" />
     <item
         android:id="@+id/write_to_author"
-        android:icon="@drawable/ic_rate_review"
         android:title="@string/menu_write_to_author_text"
         app:showAsAction="never" />
     <item
         android:id="@+id/privacy_policy"
-        android:icon="@drawable/ic_warning"
         android:title="@string/menu_privacy_policy_text"
         app:showAsAction="never" />
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..be72335
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Морской Бой</string>
+    <string name="letter_a">А</string>
+    <string name="letter_b">Б</string>
+    <string name="letter_c">В</string>
+    <string name="letter_d">Г</string>
+    <string name="letter_e">Д</string>
+    <string name="letter_f">Е</string>
+    <string name="letter_g">Ж</string>
+    <string name="letter_h">З</string>
+    <string name="letter_i">И</string>
+    <string name="letter_j">К</string>
+    <string name="generate_ships_text">Расставить корабли случайно</string>
+    <string name="fire_text">Огонь!</string>
+    <string name="start_text">Старт</string>
+    <string name="new_game_text">Новая игра</string>
+    <string name="status_welcome_text">Добро пожаловать!</string>
+    <string name="status_generate_or_start_text">Сгенерируйте корабли снова или начните игру</string>
+    <string name="status_select_to_fire_text">Выберите клетку для выстрела</string>
+    <string name="status_game_over_you_win_text">Игра окончена вы победили!</string>
+    <string name="status_game_over_you_lose_text">Игра окончена вы проиграли</string>
+    <string name="status_shot_ship_again_text">Выберите клетку и сделайте выстрел снова</string>
+    <string name="status_opponent_shot_text">Оппонент совершает выстрел</string>
+    <string name="status_opponent_shot_again_text">Оппонент совершает выстрел снова</string>
+    <string name="menu_share_text">Поделиться</string>
+    <string name="menu_rate_on_play_market_text">Оценить на Play Market</string>
+    <string name="menu_write_to_author_text">Письмо автору</string>
+    <string name="menu_more_apps_text">Больше приложений</string>
+    <string name="menu_privacy_policy_text">Политика конфиденциальности</string>
+    <string name="cannot_send_email_error_text">Невозможно отправить email</string>
+    <string name="share_body_text">Рекомендую вам игру Морской бой!</string>
+    <string name="share_text">Завершить действие с помощью</string>
+    <string name="cannot_open_market_error_text">Невозможно запустить приложение Play Market</string>
+    <string name="more_settings">Больше</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 0000000..9b31574
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Морский Бій</string>
+    <string name="letter_a">А</string>
+    <string name="letter_b">Б</string>
+    <string name="letter_c">В</string>
+    <string name="letter_d">Г</string>
+    <string name="letter_e">Ґ</string>
+    <string name="letter_f">Д</string>
+    <string name="letter_g">Є</string>
+    <string name="letter_h">Ж</string>
+    <string name="letter_i">З</string>
+    <string name="letter_j">И</string>
+    <string name="generate_ships_text">Згенерувати кораблі</string>
+    <string name="fire_text">Вогонь!</string>
+    <string name="start_text">Старт</string>
+    <string name="new_game_text">Нова Гра</string>
+    <string name="status_welcome_text">Ласкаво просимо!</string>
+    <string name="status_generate_or_start_text">Згенеруйте кораблі знову або розпочніть гру</string>
+    <string name="status_select_to_fire_text">Оберіть клітинку для пострілу</string>
+    <string name="status_game_over_you_win_text">Гра завершена ви перемогли!</string>
+    <string name="status_game_over_you_lose_text">Гра завершена ви програли</string>
+    <string name="status_shot_ship_again_text">Оберіть клітинку та зробіть постріл знову</string>
+    <string name="status_opponent_shot_text">Опонент робить постріл</string>
+    <string name="status_opponent_shot_again_text">Опонент робить постріл знову</string>
+    <string name="menu_share_text">Поділитися</string>
+    <string name="menu_rate_on_play_market_text">Оцінити на Play Market</string>
+    <string name="menu_write_to_author_text">Лист автору</string>
+    <string name="menu_more_apps_text">Більше додатків</string>
+    <string name="menu_privacy_policy_text">Політика конфіденційності</string>
+    <string name="cannot_send_email_error_text">Неможливо надіслати email</string>
+    <string name="share_body_text">Рекомендую вам гру Морський бій!</string>
+    <string name="share_text">Завершити дію за допомогою</string>
+    <string name="cannot_open_market_error_text">Неможливо запустити додаток Play Market</string>
+    <string name="more_settings">Більше</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bcbb67a..9658c97 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,8 +5,8 @@
     <dimen name="dimen_10dp">10dp</dimen>
     <dimen name="dimen_16dp">16dp</dimen>
     <dimen name="dimen_24dp">24dp</dimen>
-    <dimen name="text_size_12sp">12sp</dimen>
     <dimen name="text_size_14sp">14sp</dimen>
     <dimen name="text_size_15sp">15sp</dimen>
+    <dimen name="text_size_16sp">16sp</dimen>
     <dimen name="circle_radius" format="float">4.0</dimen>
 </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 78c09d4..3369df9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,16 +10,16 @@
     <string name="letter_h">H</string>
     <string name="letter_i">I</string>
     <string name="letter_j">J</string>
-    <string name="number_1">1</string>
-    <string name="number_2">2</string>
-    <string name="number_3">3</string>
-    <string name="number_4">4</string>
-    <string name="number_5">5</string>
-    <string name="number_6">6</string>
-    <string name="number_7">7</string>
-    <string name="number_8">8</string>
-    <string name="number_9">9</string>
-    <string name="number_10">10</string>
+    <string name="number_1" translatable="false">1</string>
+    <string name="number_2" translatable="false">2</string>
+    <string name="number_3" translatable="false">3</string>
+    <string name="number_4" translatable="false">4</string>
+    <string name="number_5" translatable="false">5</string>
+    <string name="number_6" translatable="false">6</string>
+    <string name="number_7" translatable="false">7</string>
+    <string name="number_8" translatable="false">8</string>
+    <string name="number_9" translatable="false">9</string>
+    <string name="number_10" translatable="false">10</string>
     <string name="generate_ships_text">Generate Ships</string>
     <string name="fire_text">Fire!</string>
     <string name="start_text">Start</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f6d7647..502ba70 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,28 +9,40 @@
     </style>
 
     <style name="PopupStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:fontFamily">casual</item>
-        <item name="android:textSize">@dimen/text_size_15sp</item>
+        <item name="android:fontFamily">@font/neucha</item>
+        <item name="android:textSize">@dimen/text_size_16sp</item>
     </style>
 
     <style name="SingleDigitStyle">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">0dp</item>
-        <item name="android:fontFamily">casual</item>
+        <item name="android:fontFamily">@font/neucha</item>
         <item name="android:gravity">center_horizontal|bottom</item>
         <item name="android:textAlignment">center</item>
-        <item name="android:textSize">@dimen/text_size_12sp</item>
+        <item name="android:textSize">@dimen/text_size_15sp</item>
+    </style>
+
+    <style name="SingleCharacterStyle" parent="SingleDigitStyle">
+        <item name="android:textSize">@dimen/text_size_14sp</item>
     </style>
 
     <style name="MainButtonStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/square_background</item>
-        <item name="android:fontFamily">casual</item>
+        <item name="android:fontFamily">@font/neucha</item>
+        <item name="android:textSize">@dimen/text_size_16sp</item>
         <item name="android:paddingStart">@dimen/dimen_8dp</item>
         <item name="android:paddingTop">2dp</item>
         <item name="android:paddingEnd">@dimen/dimen_8dp</item>
         <item name="android:paddingBottom">2dp</item>
     </style>
 
+    <style name="FireButtonStyle" parent="MainButtonStyle">
+        <item name="android:paddingStart">@dimen/dimen_16dp</item>
+        <item name="android:paddingEnd">@dimen/dimen_16dp</item>
+        <item name="android:paddingTop">@dimen/dimen_4dp</item>
+        <item name="android:paddingBottom">@dimen/dimen_4dp</item>
+    </style>
+
 </resources>
diff --git a/app/src/test/java/com/avs/sea/battle/ExampleUnitTest.kt b/app/src/test/java/com/avs/sea/battle/ExampleUnitTest.kt
deleted file mode 100644
index 5817740..0000000
--- a/app/src/test/java/com/avs/sea/battle/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.avs.sea.battle
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/build.gradle b/build.gradle
index cbb36b8..e7c78fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.71'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         jcenter()
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c12ce03..3468112 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 29 15:45:01 EET 2020
+#Mon Nov 30 23:14:14 EET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip