diff --git a/app/build.gradle b/app/build.gradle
index 679dbba4..6211813f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,16 +1,16 @@
 plugins {
     id 'com.android.application'
-    id 'kotlin-android'
+    id 'org.jetbrains.kotlin.android'
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "otus.homework.coroutines"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -30,16 +30,19 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'otus.homework.coroutines'
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.squareup.picasso:picasso:2.71828'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'junit:junit:4.12'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index fe34985b..cd907c28 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="otus.homework.coroutines">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <application
diff --git a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt b/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
deleted file mode 100644
index e4b05120..00000000
--- a/app/src/main/java/otus/homework/coroutines/CatsPresenter.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package otus.homework.coroutines
-
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class CatsPresenter(
-    private val catsService: CatsService
-) {
-
-    private var _catsView: ICatsView? = null
-
-    fun onInitComplete() {
-        catsService.getCatFact().enqueue(object : Callback<Fact> {
-
-            override fun onResponse(call: Call<Fact>, response: Response<Fact>) {
-                if (response.isSuccessful && response.body() != null) {
-                    _catsView?.populate(response.body()!!)
-                }
-            }
-
-            override fun onFailure(call: Call<Fact>, t: Throwable) {
-                CrashMonitor.trackWarning()
-            }
-        })
-    }
-
-    fun attachView(catsView: ICatsView) {
-        _catsView = catsView
-    }
-
-    fun detachView() {
-        _catsView = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CatsService.kt b/app/src/main/java/otus/homework/coroutines/CatsService.kt
index 479b2cfb..f0cd2e6f 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsService.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsService.kt
@@ -1,10 +1,15 @@
 package otus.homework.coroutines
 
-import retrofit2.Call
+import otus.homework.coroutines.domain.CatImage
+import otus.homework.coroutines.domain.Fact
+import retrofit2.Response
 import retrofit2.http.GET
 
 interface CatsService {
 
     @GET("fact")
-    fun getCatFact() : Call<Fact>
-}
\ No newline at end of file
+    suspend fun getCatFact(): Response<Fact>
+
+    @GET("meow")
+    suspend fun getCatImage(): Response<CatImage>
+}
diff --git a/app/src/main/java/otus/homework/coroutines/CatsView.kt b/app/src/main/java/otus/homework/coroutines/CatsView.kt
index 30ac2531..4f4b0aa0 100644
--- a/app/src/main/java/otus/homework/coroutines/CatsView.kt
+++ b/app/src/main/java/otus/homework/coroutines/CatsView.kt
@@ -3,8 +3,12 @@ package otus.homework.coroutines
 import android.content.Context
 import android.util.AttributeSet
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.squareup.picasso.Picasso
+import otus.homework.coroutines.domain.CatImage
+import otus.homework.coroutines.domain.Fact
 
 class CatsView @JvmOverloads constructor(
     context: Context,
@@ -12,21 +16,32 @@ class CatsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), ICatsView {
 
-    var presenter :CatsPresenter? = null
+
+    var callback: (() -> Unit)? = null
+    private lateinit var button: Button
+    private lateinit var textView: TextView
+    private lateinit var imageView: ImageView
 
     override fun onFinishInflate() {
         super.onFinishInflate()
-        findViewById<Button>(R.id.button).setOnClickListener {
-            presenter?.onInitComplete()
+        button = findViewById(R.id.button)
+        button.setOnClickListener {
+            callback?.invoke()
         }
+        textView = findViewById(R.id.fact_textView)
+        imageView = findViewById(R.id.cat_image_view)
     }
 
-    override fun populate(fact: Fact) {
-        findViewById<TextView>(R.id.fact_textView).text = fact.text
+    override fun populate(data: Any) {
+        if (data is Fact) textView.text = data.fact
+        else if (data is CatImage) {
+            Picasso.get()
+                .load(data.url)
+                .error(R.drawable.baseline_image_not_supported_24)
+                .centerCrop()
+                .fit()
+                .into(imageView)
+        }
+
     }
 }
-
-interface ICatsView {
-
-    fun populate(fact: Fact)
-}
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
index 32e6b018..35730440 100644
--- a/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
+++ b/app/src/main/java/otus/homework/coroutines/CrashMonitor.kt
@@ -1,10 +1,37 @@
 package otus.homework.coroutines
 
+import otus.homework.coroutines.domain.Error
+import otus.homework.coroutines.domain.ResultException
+import java.net.SocketTimeoutException
+
 object CrashMonitor {
 
     /**
      * Pretend this is Crashlytics/AppCenter
      */
-    fun trackWarning() {
+
+    fun trackWarning(result: Any): String {
+        val e: String
+        when (result) {
+            is Error<*> -> {
+                e = "Error: Error code: ${result.errorCode}(${result.errorMessage})"
+                println(e)
+            }
+
+            is ResultException<*> -> {
+                e = if (result.throwable is SocketTimeoutException) SOCKET_TIMEOUT_EXCEPTION_MESSAGE
+                else "Exception: ${result.throwable.message}"
+                println(e)
+            }
+
+            else -> e = UNKNOWN_EXCEPTION
+        }
+
+        return e
+
     }
-}
\ No newline at end of file
+
+    private const val SOCKET_TIMEOUT_EXCEPTION_MESSAGE = "Не удалось получить ответ от сервера"
+
+    private const val UNKNOWN_EXCEPTION = "Unknown Exception"
+}
diff --git a/app/src/main/java/otus/homework/coroutines/DataType.kt b/app/src/main/java/otus/homework/coroutines/DataType.kt
new file mode 100644
index 00000000..7410acd1
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/DataType.kt
@@ -0,0 +1,7 @@
+package otus.homework.coroutines
+
+
+enum class DataType {
+    FACT,
+    CAT_IMAGE
+}
diff --git a/app/src/main/java/otus/homework/coroutines/DiContainer.kt b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
index 23ddc3b2..7da40ac1 100644
--- a/app/src/main/java/otus/homework/coroutines/DiContainer.kt
+++ b/app/src/main/java/otus/homework/coroutines/DiContainer.kt
@@ -3,14 +3,22 @@ package otus.homework.coroutines
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
-class DiContainer {
+class DiContainer(private val url: String) {
 
     private val retrofit by lazy {
         Retrofit.Builder()
-            .baseUrl("https://catfact.ninja/")
+            .baseUrl(url)
             .addConverterFactory(GsonConverterFactory.create())
             .build()
     }
 
-    val service by lazy { retrofit.create(CatsService::class.java) }
-}
\ No newline at end of file
+    val service: CatsService by lazy { retrofit.create(CatsService::class.java) }
+
+    companion object {
+        const val FACT_URL = "https://catfact.ninja/"
+
+        //const val IMAGE_URL = "https://aws.random.cat/"
+        const val IMAGE_URL = "https://testing-server-indol.vercel.app/"
+
+    }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/Fact.kt b/app/src/main/java/otus/homework/coroutines/Fact.kt
deleted file mode 100644
index 15c6c7ae..00000000
--- a/app/src/main/java/otus/homework/coroutines/Fact.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package otus.homework.coroutines
-
-import com.google.gson.annotations.SerializedName
-
-data class Fact(
-	@field:SerializedName("createdAt")
-	val createdAt: String,
-	@field:SerializedName("deleted")
-	val deleted: Boolean,
-	@field:SerializedName("_id")
-	val id: String,
-	@field:SerializedName("text")
-	val text: String,
-	@field:SerializedName("source")
-	val source: String,
-	@field:SerializedName("used")
-	val used: Boolean,
-	@field:SerializedName("type")
-	val type: String,
-	@field:SerializedName("user")
-	val user: String,
-	@field:SerializedName("updatedAt")
-	val updatedAt: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/otus/homework/coroutines/ICatsView.kt b/app/src/main/java/otus/homework/coroutines/ICatsView.kt
new file mode 100644
index 00000000..587447cb
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/ICatsView.kt
@@ -0,0 +1,5 @@
+package otus.homework.coroutines
+
+interface ICatsView {
+    fun populate(data: Any)
+}
diff --git a/app/src/main/java/otus/homework/coroutines/MainActivity.kt b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
index a9dafb3b..43e4c6dd 100644
--- a/app/src/main/java/otus/homework/coroutines/MainActivity.kt
+++ b/app/src/main/java/otus/homework/coroutines/MainActivity.kt
@@ -2,29 +2,78 @@ package otus.homework.coroutines
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import otus.homework.coroutines.view_models.PresenterViewModel
 
 class MainActivity : AppCompatActivity() {
 
-    lateinit var catsPresenter: CatsPresenter
+    private lateinit var viewModel: PresenterViewModel
+    private var _catsView: ICatsView? = null
+    private lateinit var view: CatsView
+    private var scope: CoroutineScope? = null
 
-    private val diContainer = DiContainer()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        val view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
+        viewModel = ViewModelProvider(this)[PresenterViewModel::class.java]
+        CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
+        view = layoutInflater.inflate(R.layout.activity_main, null) as CatsView
+        scope = CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
         setContentView(view)
+        attachView(view)
+        downloadData()
+        viewModel.data.observe(this) {
+            _catsView?.populate(it)
+
+        }
+
+
+    }
+
+    private fun moreFactsButtonOnClick() {
+        view.callback = {
+            viewModel.scope.cancel()
+            downloadData()
+        }
+    }
+
+    private fun downloadData() {
+        scope?.launch {
+            viewModel.getDataFromNet(DataType.FACT)
+            viewModel.getDataFromNet(DataType.CAT_IMAGE)
+        }
+
+    }
+
+    private fun attachView(catsView: ICatsView) {
+        _catsView = catsView
+    }
+
+    private fun detachView() {
+        _catsView = null
 
-        catsPresenter = CatsPresenter(diContainer.service)
-        view.presenter = catsPresenter
-        catsPresenter.attachView(view)
-        catsPresenter.onInitComplete()
     }
 
     override fun onStop() {
         if (isFinishing) {
-            catsPresenter.detachView()
+            detachView()
         }
         super.onStop()
+        scope?.cancel()
+
+
+    }
+
+    override fun onResume() {
+        scope = CoroutineScope(Dispatchers.Main + CoroutineName("CatsCoroutine"))
+        super.onResume()
+        moreFactsButtonOnClick()
+
+
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/otus/homework/coroutines/data/CatsRepositoryImpl.kt b/app/src/main/java/otus/homework/coroutines/data/CatsRepositoryImpl.kt
new file mode 100644
index 00000000..74a06dd8
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/data/CatsRepositoryImpl.kt
@@ -0,0 +1,49 @@
+package otus.homework.coroutines.data
+
+
+import otus.homework.coroutines.CatsService
+import otus.homework.coroutines.DataType
+import otus.homework.coroutines.domain.CatsRepository
+import otus.homework.coroutines.domain.Error
+import otus.homework.coroutines.domain.Result
+import otus.homework.coroutines.domain.ResultException
+import otus.homework.coroutines.domain.Success
+import retrofit2.HttpException
+import java.io.IOException
+
+import java.net.SocketTimeoutException
+
+
+class CatsRepositoryImpl(private val service: CatsService) : CatsRepository<Result<Any>> {
+
+
+    override suspend fun getFact() = downloadData(DataType.FACT)
+
+
+    override suspend fun getImage() = downloadData(DataType.CAT_IMAGE)
+
+
+    private suspend fun downloadData(dataType: DataType): Result<Any> {
+        return try {
+            val data = when (dataType) {
+                DataType.FACT -> service.getCatFact()
+                DataType.CAT_IMAGE -> service.getCatImage()
+            }
+            val body = data.body()
+
+            if (data.isSuccessful && body != null) Success(body)
+            else Error(data.code(), data.message())
+        } catch (e: SocketTimeoutException) {
+            ResultException(e)
+        } catch (e: IOException) {
+            ResultException(e)
+        } catch (e: HttpException) {
+            ResultException(e)
+        } catch (e: Throwable) {
+            ResultException(e)
+        }
+
+    }
+
+
+}
diff --git a/app/src/main/java/otus/homework/coroutines/domain/CatImage.kt b/app/src/main/java/otus/homework/coroutines/domain/CatImage.kt
new file mode 100644
index 00000000..f6987add
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/CatImage.kt
@@ -0,0 +1,7 @@
+package otus.homework.coroutines.domain
+
+data class CatImage(
+    val id: Int,
+    val url: String
+)
+
diff --git a/app/src/main/java/otus/homework/coroutines/domain/CatsRepository.kt b/app/src/main/java/otus/homework/coroutines/domain/CatsRepository.kt
new file mode 100644
index 00000000..912de08f
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/CatsRepository.kt
@@ -0,0 +1,10 @@
+package otus.homework.coroutines.domain
+
+interface CatsRepository<T : Any> {
+
+    suspend fun getFact(): T
+
+    suspend fun getImage(): T
+
+
+}
diff --git a/app/src/main/java/otus/homework/coroutines/domain/Fact.kt b/app/src/main/java/otus/homework/coroutines/domain/Fact.kt
new file mode 100644
index 00000000..f035d25f
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/Fact.kt
@@ -0,0 +1,32 @@
+package otus.homework.coroutines.domain
+
+import com.google.gson.annotations.SerializedName
+
+//data class Fact(
+//	@field:SerializedName("createdAt")
+//	val createdAt: String,
+//	@field:SerializedName("deleted")
+//	val deleted: Boolean,
+//	@field:SerializedName("_id")
+//	val id: String,
+//	@field:SerializedName("text")
+//	val text: String,
+//	@field:SerializedName("source")
+//	val source: String,
+//	@field:SerializedName("used")
+//	val used: Boolean,
+//	@field:SerializedName("type")
+//	val type: String,
+//	@field:SerializedName("user")
+//	val user: String,
+//	@field:SerializedName("updatedAt")
+//	val updatedAt: String
+//)
+
+data class Fact(
+    val fact: String,
+    val length: Int
+
+)
+
+
diff --git a/app/src/main/java/otus/homework/coroutines/domain/GetFactUseCase.kt b/app/src/main/java/otus/homework/coroutines/domain/GetFactUseCase.kt
new file mode 100644
index 00000000..0bedef74
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/GetFactUseCase.kt
@@ -0,0 +1,8 @@
+package otus.homework.coroutines.domain
+
+class GetFactUseCase(private val catsRepository: CatsRepository<Result<Any>>) {
+
+    suspend fun getFact(): Any {
+        return catsRepository.getFact()
+    }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/domain/GetImageUseCase.kt b/app/src/main/java/otus/homework/coroutines/domain/GetImageUseCase.kt
new file mode 100644
index 00000000..7911193b
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/GetImageUseCase.kt
@@ -0,0 +1,7 @@
+package otus.homework.coroutines.domain
+
+class GetImageUseCase(private val catsRepository: CatsRepository<Result<Any>>) {
+    suspend fun getImage(): Any {
+        return catsRepository.getImage()
+    }
+}
diff --git a/app/src/main/java/otus/homework/coroutines/domain/Result.kt b/app/src/main/java/otus/homework/coroutines/domain/Result.kt
new file mode 100644
index 00000000..ce51d38f
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/domain/Result.kt
@@ -0,0 +1,12 @@
+package otus.homework.coroutines.domain
+
+sealed interface Result<T : Any?>
+
+class Success<T : Any>(val data: T) : Result<T>
+
+class Error<T : Any>(val errorCode: Int?, val errorMessage: String?) : Result<T>
+
+class ResultException<T : Any>(val throwable: Throwable) : Result<T>
+
+
+
diff --git a/app/src/main/java/otus/homework/coroutines/view_models/PresenterViewModel.kt b/app/src/main/java/otus/homework/coroutines/view_models/PresenterViewModel.kt
new file mode 100644
index 00000000..105c2dea
--- /dev/null
+++ b/app/src/main/java/otus/homework/coroutines/view_models/PresenterViewModel.kt
@@ -0,0 +1,74 @@
+package otus.homework.coroutines.view_models
+
+import android.app.Application
+import android.util.Log
+import android.widget.Toast
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.cancel
+import otus.homework.coroutines.CrashMonitor
+import otus.homework.coroutines.DataType
+import otus.homework.coroutines.DiContainer
+import otus.homework.coroutines.data.CatsRepositoryImpl
+import otus.homework.coroutines.domain.GetFactUseCase
+import otus.homework.coroutines.domain.GetImageUseCase
+import otus.homework.coroutines.domain.Success
+
+
+class PresenterViewModel(application: Application) : AndroidViewModel(application) {
+    private val mutableData = MutableLiveData<Any>()
+
+    val data get() = mutableData
+
+    lateinit var scope: CoroutineScope
+
+
+    private val fact = CatsRepositoryImpl(DiContainer(DiContainer.FACT_URL).service)
+    private val catImage = CatsRepositoryImpl(DiContainer(DiContainer.IMAGE_URL).service)
+    private val getFactUseCase = GetFactUseCase(fact)
+    private val getImageUseCase = GetImageUseCase(catImage)
+
+
+    suspend fun getDataFromNet(flag: DataType) {
+        scope = CoroutineScope(Dispatchers.IO)
+        var result: Any? = null
+        scope.async {
+            result = when (flag) {
+                DataType.FACT -> getFactUseCase.getFact()
+                DataType.CAT_IMAGE -> getImageUseCase.getImage()
+            }
+        }.await()
+
+
+        result?.let {
+            when (result) {
+                is Success<*> -> {
+                    val data = (result as Success<*>).data
+                    mutableData.value = data
+                }
+
+                else -> {
+                    val exc = result?.let { CrashMonitor.trackWarning(it) }
+                    Toast.makeText(
+                        getApplication(), exc,
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+            }
+        }
+
+
+    }
+
+
+    override fun onCleared() {
+        super.onCleared()
+        scope.cancel()
+        Log.d("PVM", "Coroutine canceled")
+    }
+
+
+}
diff --git a/app/src/main/res/drawable/baseline_image_not_supported_24.xml b/app/src/main/res/drawable/baseline_image_not_supported_24.xml
new file mode 100644
index 00000000..bf7d6d5c
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_image_not_supported_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21.9,21.9l-8.49,-8.49l0,0L3.59,3.59l0,0L2.1,2.1L0.69,3.51L3,5.83V19c0,1.1 0.9,2 2,2h13.17l2.31,2.31L21.9,21.9zM5,18l3.5,-4.5l2.5,3.01L12.17,15l3,3H5zM21,18.17L5.83,3H19c1.1,0 2,0.9 2,2V18.17z"/>
+</vector>
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 00000000..6d55850f
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<otus.homework.coroutines.CatsView 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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    tools:context=".MainActivity">
+
+    <ImageView
+        android:id="@+id/cat_image_view"
+        android:layout_width="300dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@tools:sample/avatars[3]" />
+
+    <TextView
+        android:id="@+id/fact_textView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginBottom="10dp"
+        android:textColor="@color/black"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toTopOf="@id/button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/cat_image_view"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:text="@string/more_facts"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/fact_textView"
+        app:layout_constraintStart_toStartOf="@id/fact_textView" />
+
+</otus.homework.coroutines.CatsView>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9508066d..811a0a26 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,28 +3,44 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:padding="16dp"
     android:layout_height="match_parent"
+    android:padding="16dp"
     tools:context=".MainActivity">
 
+    <ImageView
+        android:id="@+id/cat_image_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="30dp"
+        app:layout_constraintBottom_toTopOf="@id/fact_textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@tools:sample/avatars[3]" />
+
     <TextView
         android:id="@+id/fact_textView"
-        android:textColor="@color/black"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="10dp"
+        android:textColor="@color/black"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="@id/button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/cat_image_view" />
 
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
         android:text="@string/more_facts"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fact_textView" />
+        app:layout_constraintTop_toBottomOf="@id/fact_textView" />
 
-</otus.homework.coroutines.CatsView>
\ No newline at end of file
+</otus.homework.coroutines.CatsView>
diff --git a/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt b/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt
index 566b967d..711dac5d 100644
--- a/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt
+++ b/app/src/test/java/otus/homework/coroutines/ExampleUnitTest.kt
@@ -14,4 +14,5 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
\ No newline at end of file
+}
+
diff --git a/build.gradle b/build.gradle
index 8ca0a2e2..6630dc3e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.6.20"
+    ext.kotlin_version = '1.6.21'
     repositories {
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 58c7ebb5..360abf0c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip