diff --git a/TalkIn/.idea/deploymentTargetDropDown.xml b/TalkIn/.idea/deploymentTargetDropDown.xml
index 0c0c338..491ce83 100644
--- a/TalkIn/.idea/deploymentTargetDropDown.xml
+++ b/TalkIn/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <runningDeviceTargetSelectedWithDropDown>
+            <Target>
+              <type value="RUNNING_DEVICE_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="SERIAL_NUMBER" />
+                  <value value="89C6Q4PZIFJZRSWK" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </runningDeviceTargetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-05-15T12:47:56.963177600Z" />
+        </State>
       </entry>
     </value>
   </component>
diff --git a/TalkIn/.idea/vcs.xml b/TalkIn/.idea/vcs.xml
index 94a25f7..6c0b863 100644
--- a/TalkIn/.idea/vcs.xml
+++ b/TalkIn/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/TalkIn/app/src/main/res/drawable/shape_item_message_left.xml b/TalkIn/app/src/main/res/drawable/shape_item_message_left.xml
index 85cb220..02c0cdf 100644
--- a/TalkIn/app/src/main/res/drawable/shape_item_message_left.xml
+++ b/TalkIn/app/src/main/res/drawable/shape_item_message_left.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorMsgLeft" />
+    <solid android:color="@color/gray" />
     <corners android:radius="4dp" />
 </shape>
\ No newline at end of file
diff --git a/TalkIn/app/src/main/res/layout/activity_main.xml b/TalkIn/app/src/main/res/layout/activity_main.xml
index bed1bde..5e5bf18 100644
--- a/TalkIn/app/src/main/res/layout/activity_main.xml
+++ b/TalkIn/app/src/main/res/layout/activity_main.xml
@@ -5,29 +5,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
-
-<FrameLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-
-    android:layout_below="@id/main_toolbar"
-
-    android:layout_above="@id/divider"
-
-    />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/black"
+        android:id="@+id/main_toolbar"
+        android:padding="10dp">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Chats"
+            android:textSize="22sp"
+            android:textColor="@color/white"
+            android:textStyle="bold"
+            android:layout_marginStart="10dp"
+            android:layout_centerVertical="true"
+            />
+    </RelativeLayout>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/main_toolbar"
+        android:layout_above="@id/divider"
+        />
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/userRecyclerView"
-
-        android:layout_below="@id/main_toolbar" />
-
+        android:layout_below="@id/main_toolbar"
         android:layout_above="@id/divider"/>
-
     <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:layout_above="@id/bottom_navigation"/>
+        android:layout_above="@id/bottom_navigation"
+        android:id="@+id/divider"/>
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:layout_width="match_parent"
@@ -38,84 +49,5 @@
         app:menu="@menu/bottom_navigation_menu"/>
 
 
-<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">
-
-
-
-<RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ChatActivity">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/divider"
-        android:clipToPadding="false"
-        android:padding="8dp"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:stackFromEnd="true"
-        tools:listitem="@layout/item_message_base" />
-
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_above="@id/linearLayout"
-        android:background="?android:attr/listDivider" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true"
-        android:background="@color/white"
-        android:elevation="4dp"
-        android:orientation="horizontal"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp">
 
-        <ImageButton
-            android:id="@+id/photoPickerButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/ic_camera_alt_black_24dp"
-            android:padding="8dp" />
-
-        <EditText
-            android:id="@+id/messageEditText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:background="@color/transparent"
-            android:hint="@string/type_a_message"
-            />
-
-        <ImageButton
-            android:id="@+id/sendButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="4dp"
-            android:background="@drawable/selector_button_send"
-            android:padding="8dp" />
-    </LinearLayout>
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
-</RelativeLayout>
-</layout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/TalkIn/app/src/main/res/layout/item_message_base.xml b/TalkIn/app/src/main/res/layout/item_message_base.xml
deleted file mode 100644
index ba681d2..0000000
--- a/TalkIn/app/src/main/res/layout/item_message_base.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-
-    <LinearLayout
-        android:id="@+id/msgContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/shape_item_message_left"
-        android:elevation="2dp"
-        android:orientation="vertical"
-        android:paddingStart="8dp"
-        android:paddingTop="6dp"
-        android:paddingEnd="8dp"
-        android:paddingBottom="6dp">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/photoImageView"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:onClick="@{(v) -> msgAdapterInt.showPic(v, message)}"
-                android:scaleType="centerCrop"
-                app:imageUrl="@{message.photoUrl}"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <TextView
-            android:id="@+id/nameTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="0dp"
-            android:textColor="@color/black"
-            android:textSize="14sp"
-            app:groupChat="@{false}"
-            app:textOrGoneName="@{message.name}"
-            tools:text="Name" />
-
-        <TextView
-            android:id="@+id/messageTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:textSize="16sp"
-            app:textOrGone="@{message.text}"
-            tools:text="Message" />
-
-        <TextView
-            android:id="@+id/timeTextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginStart="8dp"
-            android:textColor="@color/black"
-            android:textSize="12sp"
-            app:goneIfNotNull="@{message.audioUrl}"
-            app:hourTime="@{message.timestamp}"
-            tools:text="Name" />
-    </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file