diff --git a/.DS_Store b/.DS_Store
index ae27df9e..c2a6a0cb 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/osinaweb/.DS_Store b/osinaweb/.DS_Store
index d39507ca..87b62318 100644
Binary files a/osinaweb/.DS_Store and b/osinaweb/.DS_Store differ
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 95194055..fa8120b5 100644
Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ
diff --git a/osinaweb/input.css b/osinaweb/input.css
index c7d86d94..36b451d1 100644
--- a/osinaweb/input.css
+++ b/osinaweb/input.css
@@ -20,13 +20,22 @@
     width: 0px !important;
 }
 
+#conversation::-webkit-scrollbar {
+    width: 3px !important;
+    }
+
+#conversation::-webkit-scrollbar-thumb  {
+    background: #c0c2c58b !important;
+}
+
+
+
 @media screen and (max-width: 798px) {
     #closeChatContainer {
         display: none !important;
     }
 }
 
-
 .rtl {
     direction: rtl;
 }
diff --git a/osinaweb/osichat/__pycache__/admin.cpython-310.pyc b/osinaweb/osichat/__pycache__/admin.cpython-310.pyc
index 01a6452c..7306fde1 100644
Binary files a/osinaweb/osichat/__pycache__/admin.cpython-310.pyc and b/osinaweb/osichat/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc
index 56ea9268..24fe4200 100644
Binary files a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc and b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc differ
diff --git a/osinaweb/osichat/__pycache__/models.cpython-310.pyc b/osinaweb/osichat/__pycache__/models.cpython-310.pyc
index 0a006e4c..5c8ded38 100644
Binary files a/osinaweb/osichat/__pycache__/models.cpython-310.pyc and b/osinaweb/osichat/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/osichat/admin.py b/osinaweb/osichat/admin.py
index 50a8a297..7f28068c 100644
--- a/osinaweb/osichat/admin.py
+++ b/osinaweb/osichat/admin.py
@@ -2,6 +2,7 @@ from django.contrib import admin
 from .models import *
 # Register your models here.
 admin.site.register(Visitor)
+admin.site.register(VisitorLog)
 admin.site.register(ChatRoom)
 admin.site.register(ChatRoomGuest)
 admin.site.register(ChatMember)
diff --git a/osinaweb/osichat/api/__pycache__/serializers.cpython-310.pyc b/osinaweb/osichat/api/__pycache__/serializers.cpython-310.pyc
index f8fd8d40..6c2b519f 100644
Binary files a/osinaweb/osichat/api/__pycache__/serializers.cpython-310.pyc and b/osinaweb/osichat/api/__pycache__/serializers.cpython-310.pyc differ
diff --git a/osinaweb/osichat/api/serializers.py b/osinaweb/osichat/api/serializers.py
index b55694fd..1655e754 100644
--- a/osinaweb/osichat/api/serializers.py
+++ b/osinaweb/osichat/api/serializers.py
@@ -7,6 +7,13 @@ class ChatRoomGuestSerializer(serializers.ModelSerializer):
         model = ChatRoomGuest
         fields = '__all__'
 
+
+class ChatMessageAttachement(serializers.ModelSerializer):
+    class Meta:
+        model = ChatMessageAttachment
+        fields =  '__all__'
+
+
 class ChatRoomSerializer(serializers.ModelSerializer):
     chatroomguest = ChatRoomGuestSerializer()
     class Meta:
diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py
index 81a37092..7103c6a1 100644
--- a/osinaweb/osichat/consumers.py
+++ b/osinaweb/osichat/consumers.py
@@ -19,23 +19,32 @@ class OsitcomVisitor(WebsocketConsumer):
 
     def disconnect(self, close_code):
         if self.visitor:
-            self.visitor.left_date = datetime.now()
-            self.visitor.save()
+            self.current_log.left_date = datetime.now()
+            self.current_log.save()
         async_to_sync(self.channel_layer.group_discard)(
             'ositcom_visitors', self.channel_name
         )
     def receive(self, text_data): 
         text_data_json = json.loads(text_data)
         event_type = text_data_json.get('event_type')
-        if event_type == 'new_visitor':
-            self.visitor = Visitor.objects.create(
-                session_id = text_data_json.get('session_id'),
-                ip_address = text_data_json.get('client_ip'),
+        if event_type == 'visitor_ping': 
+            session_id = text_data_json.get('session_id')
+            if Visitor.objects.filter(session_id=session_id).last():
+                self.visitor = Visitor.objects.filter(session_id=session_id).last()
+            else:
+                self.visitor = Visitor.objects.create(
+                    session_id = session_id,
+                    ip_address = text_data_json.get('client_ip'),
+                    country = text_data_json.get('country'),
+                )
+                
+            self.current_log = VisitorLog.objects.create(
+                visitor = self.visitor,
                 referrer = text_data_json.get('referrer'),
-                country =  text_data_json.get('client_country'),
                 url = text_data_json.get('url'),
                 visit_date = datetime.now()
-                )
+            )
+
 
 
 
@@ -48,14 +57,14 @@ class OsitcomChatRoom(WebsocketConsumer):
             self.session_id, self.channel_name
         )
         self.accept()
-        chat_room_guest = ChatRoomGuest.objects.filter(session_id=self.session_id).last()
+        self.visitor = Visitor.objects.filter(session_id=self.session_id).last()
+        chat_room_guest = ChatRoomGuest.objects.filter(visitor=self.visitor).last()
         if chat_room_guest:
             chat_room = chat_room_guest.room
             self.chat_room = chat_room
         else:
             self.chat_room = None
         
-
     def disconnect(self, close_code):
         async_to_sync(self.channel_layer.group_discard)(
             self.session_id, self.channel_name
@@ -79,11 +88,15 @@ class OsitcomChatRoom(WebsocketConsumer):
                 name=f"Support: {self.session_id}",
                 date_created = datetime.now()
             )
+            if text_data_json.get('guest_name'):
+                self.visitor.name = text_data_json.get('guest_name')
+                self.visitor.save()
+            if  text_data_json.get('guest_mobile_number'):
+                self.visitor.mobile_number = text_data_json.get('guest_mobile_number')
+                self.visitor.save()
             chat_room_guest = ChatRoomGuest.objects.create(
                 room=chat_room,
-                name= text_data_json.get('guest_name'),
-                mobile_number=  text_data_json.get('guest_mobile_number'),
-                session_id=self.session_id
+                visitor=self.visitor
             )
             self.chat_room = chat_room
             event = {
@@ -193,7 +206,7 @@ class OsitcomChatRoom(WebsocketConsumer):
                 
                 else:
                     number_of_unread = ChatMessage.objects.filter(room=self.chat_room, member__isnull=False).exclude(chatmessageseen__guest=guest).count()
-                    latest_unread_message = ChatMessage.objects.filter(room=self.chat_room).exclude(chatmessageseen__guest=guest).last()
+                    latest_unread_message = ChatMessage.objects.filter(room=self.chat_room, member__isnull=False).exclude(chatmessageseen__guest=guest).last()
 
             event = {
                 'type': 'update_read_messages_handler',
@@ -220,21 +233,39 @@ class OsitcomChatRoom(WebsocketConsumer):
         if self.chat_room:
             chat_room = self.chat_room
             chat_room_messages = ChatMessage.objects.filter(room=chat_room).order_by('date_sent')
+            
         else:
             chat_room = None
             chat_room_messages = None
+
         context = {
             'chat_room': chat_room,
             'chat_room_messages': chat_room_messages,
         }
+
         if self.client_type == 'mobile_admin':
-                chat_room_data = model_to_dict(chat_room)
-                chat_room_messages_data = [model_to_dict(message) for message in chat_room_messages]
-                self.send(text_data=json.dumps({
-                    'event_type': 'load_chat',
-                    'chat_room_data': chat_room_data,
-                    'chat_room_messages_data': chat_room_messages_data
-                },cls=DjangoJSONEncoder))
+            chat_room_data = model_to_dict(chat_room)
+            chat_room_messages_data = []
+
+            for message in chat_room_messages:
+                message_data = model_to_dict(message)
+                attachment = getattr(message, 'chatmessageattachment', None)
+                if attachment:
+                    message_data['attachment'] = {
+                        'attachment': attachment.attachment,
+                        'is_image': attachment.is_image(),
+                        'file_name': attachment.file_name,
+                    }
+                else:
+                    message_data['attachment'] = None
+
+                chat_room_messages_data.append(message_data)
+            
+            self.send(text_data=json.dumps({
+                'event_type': 'load_chat',
+                'chat_room_data': chat_room_data,
+                'chat_room_messages_data': chat_room_messages_data,
+            }, cls=DjangoJSONEncoder))
 
         elif self.client_type == 'website_admin':
             html = render_to_string("chat_templates/chat-widget.html", context=context)
@@ -328,12 +359,22 @@ class OsitcomChatRoom(WebsocketConsumer):
             'message_attachment': message_attachment,
             'file_type': event['file_type']
         }
-        html = render_to_string("partials/message-attachment.html", context=context)
-        self.send(text_data=json.dumps({
-            'event_type': 'uploaded_file',
-            'file_name': event['file_name'],
-            'html': html,
-        }))
+        if self.client_type == 'mobile_admin':
+            message_attachment_data = model_to_dict(message_attachment)
+            self.send(text_data=json.dumps({
+                'event_type': 'uploaded_file',
+                'message_attachment_data': message_attachment_data,
+                'user': message_attachment.message.member.id if message_attachment.message.member else None,
+                'file_type': event['file_type']
+            },cls=DjangoJSONEncoder))
+        else:
+            html = render_to_string("partials/message-attachment.html", context=context)
+            self.send(text_data=json.dumps({
+                'event_type': 'uploaded_file',
+                'file_name': event['file_name'],
+                'user': message_attachment.message.member.id if message_attachment.message.member else None,
+                'html': html,
+            }))
 
     def update_read_messages_handler(self, event): 
         latest_unread_message_id = event.get('latest_unread_message_id')
@@ -351,19 +392,6 @@ class OsitcomChatRoom(WebsocketConsumer):
         else:
             latest_unread_message = None
 
-    def uploaded_file_handler(self, event):
-        message_attachment = get_object_or_404(ChatMessageAttachment, id=event['message_attachment_id'])
-        context = {
-            'message_attachment': message_attachment,
-            'file_type': event['file_type']
-        }
-        html = render_to_string("partials/message-attachment.html", context=context)
-        self.send(text_data=json.dumps({
-            'event_type': 'uploaded_file',
-            'file_name': event['file_name'],
-            'html': html,
-        }))
-
     def end_chat_handler(self, event):
         if event['user_id']:
             member = get_object_or_404(User, id=event['user_id'])
diff --git a/osinaweb/osichat/migrations/0018_visitorlog_remove_chatroomguest_mobile_number_and_more.py b/osinaweb/osichat/migrations/0018_visitorlog_remove_chatroomguest_mobile_number_and_more.py
new file mode 100644
index 00000000..1682ddf3
--- /dev/null
+++ b/osinaweb/osichat/migrations/0018_visitorlog_remove_chatroomguest_mobile_number_and_more.py
@@ -0,0 +1,72 @@
+# Generated by Django 4.2.5 on 2024-08-02 19:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osichat', '0017_chatroom_date_terminated_chatroom_terminated_by'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VisitorLog',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('url', models.URLField()),
+                ('referrer', models.URLField(blank=True, null=True)),
+                ('visit_date', models.DateTimeField(null=True)),
+                ('left_date', models.DateTimeField(null=True)),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='chatroomguest',
+            name='mobile_number',
+        ),
+        migrations.RemoveField(
+            model_name='chatroomguest',
+            name='name',
+        ),
+        migrations.RemoveField(
+            model_name='chatroomguest',
+            name='session_id',
+        ),
+        migrations.RemoveField(
+            model_name='visitor',
+            name='left_date',
+        ),
+        migrations.RemoveField(
+            model_name='visitor',
+            name='referrer',
+        ),
+        migrations.RemoveField(
+            model_name='visitor',
+            name='url',
+        ),
+        migrations.RemoveField(
+            model_name='visitor',
+            name='visit_date',
+        ),
+        migrations.AddField(
+            model_name='chatroomguest',
+            name='visitor',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='osichat.visitor'),
+        ),
+        migrations.AddField(
+            model_name='visitor',
+            name='email',
+            field=models.CharField(blank=True, max_length=100, null=True),
+        ),
+        migrations.AddField(
+            model_name='visitor',
+            name='mobile_number',
+            field=models.CharField(blank=True, max_length=10, null=True),
+        ),
+        migrations.AddField(
+            model_name='visitor',
+            name='name',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+    ]
diff --git a/osinaweb/osichat/migrations/0019_visitorlog_visitor.py b/osinaweb/osichat/migrations/0019_visitorlog_visitor.py
new file mode 100644
index 00000000..a5beeaf0
--- /dev/null
+++ b/osinaweb/osichat/migrations/0019_visitorlog_visitor.py
@@ -0,0 +1,19 @@
+# Generated by Django 4.2.5 on 2024-08-02 20:01
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osichat', '0018_visitorlog_remove_chatroomguest_mobile_number_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='visitorlog',
+            name='visitor',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='osichat.visitor'),
+        ),
+    ]
diff --git a/osinaweb/osichat/migrations/__pycache__/0018_visitorlog_remove_chatroomguest_mobile_number_and_more.cpython-310.pyc b/osinaweb/osichat/migrations/__pycache__/0018_visitorlog_remove_chatroomguest_mobile_number_and_more.cpython-310.pyc
new file mode 100644
index 00000000..e70f87d4
Binary files /dev/null and b/osinaweb/osichat/migrations/__pycache__/0018_visitorlog_remove_chatroomguest_mobile_number_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osichat/migrations/__pycache__/0019_visitorlog_visitor.cpython-310.pyc b/osinaweb/osichat/migrations/__pycache__/0019_visitorlog_visitor.cpython-310.pyc
new file mode 100644
index 00000000..a4dc8754
Binary files /dev/null and b/osinaweb/osichat/migrations/__pycache__/0019_visitorlog_visitor.cpython-310.pyc differ
diff --git a/osinaweb/osichat/models.py b/osinaweb/osichat/models.py
index 35eaa056..55c4b464 100644
--- a/osinaweb/osichat/models.py
+++ b/osinaweb/osichat/models.py
@@ -8,11 +8,19 @@ class Visitor(models.Model):
     session_id = models.CharField(max_length=300)
     ip_address = models.CharField(max_length=300)
     country = models.CharField(max_length=15, null=True)
+    name = models.CharField(max_length=200, blank=True, null=True)
+    mobile_number = models.CharField(max_length=10, null=True, blank=True)
+    email = models.CharField(max_length=100, null=True, blank=True)
+
+
+class VisitorLog(models.Model):
+    visitor = models.ForeignKey(Visitor, on_delete=models.CASCADE, null=True)
     url = models.URLField()
     referrer = models.URLField(null=True, blank=True)
     visit_date = models.DateTimeField(null=True)
     left_date = models.DateTimeField(null=True)
 
+
 class ChatRoom(models.Model):
     name = models.CharField(max_length=300)
     created_by = models.ForeignKey(User, null=True, on_delete=models.SET_NULL, blank=True)
@@ -36,11 +44,7 @@ class ChatRoom(models.Model):
 
 class ChatRoomGuest(models.Model):
     room = models.OneToOneField(ChatRoom, on_delete=models.CASCADE, null=True)
-    name = models.CharField(max_length=300)
-    mobile_number = models.CharField(max_length=100)
-    session_id = models.CharField(max_length=300)
-
-
+    visitor = models.ForeignKey(Visitor, null=True, on_delete=models.CASCADE)
 
 class ChatMember(models.Model):
     member = models.ForeignKey(User, on_delete=models.CASCADE)
diff --git a/osinaweb/osichat/templates/chat-room.html b/osinaweb/osichat/templates/chat-room.html
index f63ce930..406a1706 100644
--- a/osinaweb/osichat/templates/chat-room.html
+++ b/osinaweb/osichat/templates/chat-room.html
@@ -1,5 +1,6 @@
 {%load static%}
 
+
 <p id="chatRoomId" class="hidden">{{chat_room.id}}</p>
 
 <div class="w-full h-full md:h-[450px] lg:h-[550px] bg-white rounded-b-none md:rounded-b-md flex flex-col justify-end">
@@ -32,14 +33,13 @@
             </div>
             <div
                 class="max-w-[80%] bg-gray-50 px-4 py-3 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-7 bg-opacity-50 shadow-md border border-gray-100">
-                <p>{% if chat_room.chatroomguest.name %}Hello {{chat_room.chatroomguest.name}},{% else %}Hello,{% endif %} thank you for contacting us. Please bear with us while we
+                <p>{% if chat_room.chatroomguest.visitor.name %}Hello {{chat_room.chatroomguest.visitor.name}},{% else %}Hello,{% endif %} thank you for contacting us. Please bear with us while we
                     connect you with the next available agent as soon as possible.</p>
             </div>
         </div>
 
         <!-- USER MESSAGES -->
         <div id="messages" class="w-full flex flex-col gap-5 pb-1">
-            
             {% for message in chat_room_messages %}
                 <!-- STAFF MESSAGE  -->
                 {% if message.member %}
@@ -64,7 +64,7 @@
                                 {% if message.chatmessageattachment.is_image %}
                                     <div
                                     class="max-w-[80%] bg-gray-50 p-4 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
-                                            <img src="http://192.168.1.106:8000/{{message.chatmessageattachment.attachment}}" class="rounded-md">
+                                            <img src="http://192.168.1.111:8000/{{message.chatmessageattachment.attachment}}" class="rounded-md">
                                     </div>
                                 {% else %}
                                     <div
@@ -130,14 +130,12 @@
         <div id="typing" class="hidden"></div>
     </div>
 
-
-
-    <form class="px-5 p-3 bg-transparent relative" id="sendMessage">
+    <form class="px-5 pt-3 bg-transparent relative" id="sendMessage">
         {% csrf_token %}
         <div class="w-full bg-white h-fit rounded-md border border-gray-200 flex items-center justify-between">
             <textarea name="message" id="dynamicTextarea"
                 placeholder="Write your message..."
-                class="w-full outline-none p-3 resize-none h-[50px] max-h-[200px] duration-500"></textarea>
+                class="w-full outline-none p-3 resize-none h-[50px] max-h-[200px] duration-500 border-none rounded-md"></textarea>
 
 
             <div class="h-full right-0 top-0 px-3 flex items-center gap-2 text-osiblue">
@@ -159,12 +157,13 @@
                 </button>
             </div>
         </div>
+    </form>
 
-        <div class="w-full rounded-b-md px-3 pt-3 flex justify-center items-center gap-1 bg-white">
-            <img src="http://192.168.1.111:8000/static/images/ositcom_logos/ositcom(o).png" class="w-[20px]">
+    <!-- FOOTER -->
+    <div class="w-full rounded-b-md px-3 py-3 flex justify-center items-center gap-1 bg-white">
+        <img src="http://192.168.1.111:8000/static/images/ositcom_logos/ositcom(o).png" class="w-[20px]">
 
-            <p class="text-xs text-secondosiblue">Osichat 2.0 by <a href="https://ositcom.com/" target="_blank"
-                    class="hover:text-gray-400 duration-500">Ositcom</a></p>
-        </div>
-    </form>
-</div>
\ No newline at end of file
+        <p class="text-xs text-secondosiblue">Osichat 2.0 by <a href="https://ositcom.com/" target="_blank"
+                class="hover:text-gray-400 duration-500">Ositcom</a></p>
+    </div>
+</div> 
\ No newline at end of file
diff --git a/osinaweb/osichat/templates/chat-widget.html b/osinaweb/osichat/templates/chat-widget.html
index 952cf388..e9ad768e 100644
--- a/osinaweb/osichat/templates/chat-widget.html
+++ b/osinaweb/osichat/templates/chat-widget.html
@@ -3,11 +3,19 @@
 
 <div class="w-full h-full md:h-fit md:w-[400px] flex flex-col fixed z-50 right-0 md:right-5 bottom-0 md:bottom-24 shadow-md duration-500 hidden"
     id="chatWidget">
-    <div class="w-full h-full inset-0 absolute flex justify-center items-center p-2 bg-black z-20 bg-opacity-50 rounded-none md:rounded-md hidden" id="osichatLoader">
+
+    <!-- LOADER -->
+    <div class="w-full h-full inset-0 absolute flex justify-center items-center p-2 bg-black z-20 bg-opacity-50 rounded-none md:rounded-md hidden"
+        id="osichatLoader">
         <div role="status">
-            <svg aria-hidden="true" class="w-14 h-14 text-gray-200 animate-spin fill-secondosiblue" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+            <svg aria-hidden="true" class="w-14 h-14 text-gray-200 animate-spin fill-secondosiblue"
+                viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path
+                    d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                    fill="currentColor" />
+                <path
+                    d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                    fill="currentFill" />
             </svg>
         </div>
     </div>
@@ -30,11 +38,13 @@
 
         <div id="endChat" class="{% if not chat_room  or chat_room.date_terminated %} hidden {% endif %}">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
-                class="text-white w-7 notFilledSvg cursor-pointer hover:scale-105 duration-500" fill="none">
+                class="text-white w-7 notFilledSvg cursor-pointer hover:scale-105 duration-500 hover:scale-105 duration-500"
+                fill="none">
                 <path
                     d="M11 3L10.3374 3.23384C7.75867 4.144 6.46928 4.59908 5.73464 5.63742C5 6.67576 5 8.0431 5 10.7778V13.2222C5 15.9569 5 17.3242 5.73464 18.3626C6.46928 19.4009 7.75867 19.856 10.3374 20.7662L11 21"
                     stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
-                <path d="M21 12L11 12M21 12C21 11.2998 19.0057 9.99153 18.5 9.5M21 12C21 12.7002 19.0057 14.0085 18.5 14.5"
+                <path
+                    d="M21 12L11 12M21 12C21 11.2998 19.0057 9.99153 18.5 9.5M21 12C21 12.7002 19.0057 14.0085 18.5 14.5"
                     stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
             </svg>
         </div>
@@ -42,20 +52,35 @@
 
 
     <!-- CLOSE CHAT CONFIRMATION MESSAGE -->
-    <div class="w-full h-full absolute inset-0 rounded-none md:rounded-md bg-black bg-opacity-50 flex justify-center items-center p-5 z-20 hidden" id="endChatConfirmationContainer">
-        <div class="w-full h-fit p-5 bg-white rounded-md shadow-md flex flex-col justify-center items-center gap-3 relative">
+    <div class="w-full h-full absolute inset-0 rounded-none md:rounded-md bg-black bg-opacity-50 flex justify-center items-center p-5 z-20 hidden"
+        id="endChatConfirmationContainer">
+        <div
+            class="w-full h-fit p-5 bg-white rounded-md shadow-md flex flex-col justify-center items-center gap-3 relative">
 
             <div id="closeConfirmationMessage">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 text-secondosiblue absolute top-3 right-3 hover:text-fifthosiblue duration-300 cursor-pointer">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                    stroke="currentColor"
+                    class="w-5 text-secondosiblue absolute top-3 right-3 hover:text-fifthosiblue duration-300 cursor-pointer">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
                 </svg>
             </div>
-              
-            <p class="text-center text-secondosiblue mt-5">Are you sure you want to end this chat?</p>
 
-            <button id="endChatComfirmed" class="rounded-md bg-red-500 border border-red-500 uppercase text-white px-5 py-2 shadow-md text-sm cursor-pointer hover:bg-white hover:text-red-500 duration-300">
-                End chat
-            </button>
+            <p class="text-center text-secondosiblue">Are you sure you want to end this chat?</p>
+
+            <div class="px-5 py-2 flex items-center gap-2 bg-gray-100 rounded-md shadow-md flex justify-center items-center text-secondosiblue text-sm cursor-pointer hover:scale-105 duration-500" id="endChatComfirmed">
+                End
+
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 notFilledSvg"
+                fill="none">
+                <path
+                    d="M11 3L10.3374 3.23384C7.75867 4.144 6.46928 4.59908 5.73464 5.63742C5 6.67576 5 8.0431 5 10.7778V13.2222C5 15.9569 5 17.3242 5.73464 18.3626C6.46928 19.4009 7.75867 19.856 10.3374 20.7662L11 21"
+                    stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
+                <path
+                    d="M21 12L11 12M21 12C21 11.2998 19.0057 9.99153 18.5 9.5M21 12C21 12.7002 19.0057 14.0085 18.5 14.5"
+                    stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+            </svg>
+
+            </div>
         </div>
     </div>
     <!-- END CLOSE CHAT CONFIRMATION MESSAGE -->
@@ -65,12 +90,12 @@
     <div id="roomContainer" class="flex-l overflow-hidden h-full">
         {% if chat_room %}
             {% if not chat_room.date_terminated %}
-                {% include 'chat-room.html' %}
+            {% include 'chat-room.html' %}
             {% else %}
-                {% include 'ended-chat.html' %}
+            {% include 'ended-chat.html' %}
             {% endif %}
         {% else %}
-            {% include 'start-chat.html' %}
+        {% include 'start-chat.html' %}
         {% endif %}
     </div>
 </div>
diff --git a/osinaweb/osichat/templates/ended-chat.html b/osinaweb/osichat/templates/ended-chat.html
index dd2a078d..577927a8 100644
--- a/osinaweb/osichat/templates/ended-chat.html
+++ b/osinaweb/osichat/templates/ended-chat.html
@@ -1,8 +1,6 @@
-{%load static%}
 
-<p id="chatRoomId" class="hidden">{{chat_room.id}}</p>
 
-<div class="w-full h-full md:h-[450px] lg:h-[550px] bg-white rounded-b-none md:rounded-b-md flex flex-col justify-end">
+<div class="w-full h-full md:h-[450px] lg:h-[550px] bg-white rounded-b-none md:rounded-b-md flex flex-col justify-end"> 
     <div class="overflow-y-auto flex flex-col gap-5 px-5 pt-3" id="conversation">
         <!-- ROBOT -->
         <div class="w-full flex items-end gap-2">
@@ -32,103 +30,374 @@
             </div>
             <div
                 class="max-w-[80%] bg-gray-50 px-4 py-3 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-7 bg-opacity-50 shadow-md border border-gray-100">
-                <p>{% if chat_room.chatroomguest.name %}Hello {{chat_room.chatroomguest.name}},{% else %}Hello,{% endif %} thank you for contacting us. Please bear with us while we
+                <p>{% if chat_room.chatroomguest.visitor.name %}Hello {{chat_room.chatroomguest.visitor.name}},{% else %}Hello,{% endif %} thank you for contacting us. Please bear with us while we
                     connect you with the next available agent as soon as possible.</p>
             </div>
         </div>
-
-        <!-- USER MESSAGES -->
+        
         <div id="messages" class="w-full flex flex-col gap-5 pb-1">
-            
             {% for message in chat_room_messages %}
-                <!-- STAFF MESSAGE  -->
-                {% if message.member %}
-                        <div class="w-full flex items-end justify-start gap-2">
-                            <div>
-                                <div
-                                    class="w-[25px] h-[25px] rounded-full shadow-md text-white flex justify-center items-center bg-osiblue uppercase text-xs">
-                                    {% if message.member.staffprofile.image %}
-                                    <img class="w-full h-full rounded-full"
-                                        src="http://192.168.1.111:8000{{message.member.staffprofile.image.url}}">
-                                    {% else %}
-                                    <p>{{message.member.first_name.0}}{{message.member.last_name.0}}</p>
-                                    {% endif %}
-                                </div>
-                            </div>
-                            {% if not message.chatmessageattachment %}
-                                <div
-                                    class="max-w-[80%] bg-gray-50 px-4 py-3 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
-                                    <p style="white-space: pre-line; overflow-wrap: anywhere;">{{message.content}}</p>
-                                </div>
-                            {% else %}
-                                {% if message.chatmessageattachment.is_image %}
-                                    <div
-                                    class="max-w-[80%] bg-gray-50 p-4 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
-                                            <img src="http://192.168.1.106:8000/{{message.chatmessageattachment.attachment}}" class="rounded-md">
-                                    </div>
-                                {% else %}
-                                    <div
-                                        class="max-w-[80%]  bg-gray-50 p-4 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
-                                        <div class="w-full flex items-center gap-1">
-                                            <div>
-                                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 text-secondosiblue notFilledSvg">
-                                                    <path d="M8 7L16 7" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-                                                    <path d="M8 11L12 11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-                                                    <path d="M13 21.5V21C13 18.1716 13 16.7574 13.8787 15.8787C14.7574 15 16.1716 15 19 15H19.5M20 13.3431V10C20 6.22876 20 4.34315 18.8284 3.17157C17.6569 2 15.7712 2 12 2C8.22877 2 6.34315 2 5.17157 3.17157C4 4.34314 4 6.22876 4 10L4 14.5442C4 17.7892 4 19.4117 4.88607 20.5107C5.06508 20.7327 5.26731 20.9349 5.48933 21.1139C6.58831 22 8.21082 22 11.4558 22C12.1614 22 12.5141 22 12.8372 21.886C12.9044 21.8623 12.9702 21.835 13.0345 21.8043C13.3436 21.6564 13.593 21.407 14.0919 20.9081L18.8284 16.1716C19.4065 15.5935 19.6955 15.3045 19.8478 14.9369C20 14.5694 20 14.1606 20 13.3431Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-                                                </svg>
-                                            </div>
-                                            <div class="flex flex-col">
-                                                <span class="text-xs">{{message.chatmessageattachment.file_name}}</span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                {% endif %}
-                            {% endif %}
-                        </div>
-
-                <!-- GUEST MESSAGE  -->
+            <!-- STAFF MESSAGE  -->
+            {% if message.member %}
+            <div class="w-full flex items-end justify-start gap-2">
+                <div>
+                    <div
+                        class="w-[25px] h-[25px] rounded-full shadow-md text-white flex justify-center items-center bg-osiblue uppercase text-xs">
+                        {% if message.member.staffprofile.image %}
+                        <img class="w-full h-full rounded-full"
+                            src="http://192.168.1.111:8000{{message.member.staffprofile.image.url}}">
+                        {% else %}
+                        <p>{{message.member.first_name.0}}{{message.member.last_name.0}}</p>
+                        {% endif %}
+                    </div>
+                </div>
+                {% if not message.chatmessageattachment %}
+                <div
+                    class="max-w-[80%] bg-gray-50 px-4 py-3 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
+                    <p style="white-space: pre-line; overflow-wrap: anywhere;">{{message.content}}</p>
+                </div>
                 {% else %}
-                    {% if not message.chatmessageattachment %}
-                        <div class="w-full flex justify-end">
-                            <div
-                                class="max-w-[80%] px-4 py-3 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
-                                <p style="white-space: pre-line; overflow-wrap: anywhere;">{{message.content}}</p>
-                            </div>
+                {% if message.chatmessageattachment.is_image %}
+                <div
+                    class="max-w-[80%] bg-gray-50 p-4 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
+                    <img src="http://192.168.1.111:8000/{{message.chatmessageattachment.attachment}}"
+                        class="rounded-md">
+                </div>
+                {% else %}
+                <div
+                    class="max-w-[80%]  bg-gray-50 p-4 rounded-r-3xl rounded-tl-3xl text-secondosiblue text-sm leading-6 bg-opacity-50 shadow-md border border-gray-100">
+                    <div class="w-full flex items-center gap-1">
+                        <div>
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
+                                class="w-5 text-secondosiblue notFilledSvg">
+                                <path d="M8 7L16 7" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round"></path>
+                                <path d="M8 11L12 11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round"></path>
+                                <path
+                                    d="M13 21.5V21C13 18.1716 13 16.7574 13.8787 15.8787C14.7574 15 16.1716 15 19 15H19.5M20 13.3431V10C20 6.22876 20 4.34315 18.8284 3.17157C17.6569 2 15.7712 2 12 2C8.22877 2 6.34315 2 5.17157 3.17157C4 4.34314 4 6.22876 4 10L4 14.5442C4 17.7892 4 19.4117 4.88607 20.5107C5.06508 20.7327 5.26731 20.9349 5.48933 21.1139C6.58831 22 8.21082 22 11.4558 22C12.1614 22 12.5141 22 12.8372 21.886C12.9044 21.8623 12.9702 21.835 13.0345 21.8043C13.3436 21.6564 13.593 21.407 14.0919 20.9081L18.8284 16.1716C19.4065 15.5935 19.6955 15.3045 19.8478 14.9369C20 14.5694 20 14.1606 20 13.3431Z"
+                                    stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round">
+                                </path>
+                            </svg>
                         </div>
-                    {% else %}
-                        {% if message.chatmessageattachment.is_image %}
-                        <div class="w-full flex justify-end">
-                            <div class="max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
-                                <img src="http://192.168.1.111:8000/{{message.chatmessageattachment.attachment}}" class="rounded-md">
-                            </div>
-                        </div>  
-                        {% else %}
-                        <div class="w-full flex justify-end">
-                            <div class="max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
-                                <div class="w-full flex items-center gap-1">
-                                    <div>
-                                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 text-white notFilledSvg">
-                                            <path d="M8 7L16 7" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-                                            <path d="M8 11L12 11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-                                            <path d="M13 21.5V21C13 18.1716 13 16.7574 13.8787 15.8787C14.7574 15 16.1716 15 19 15H19.5M20 13.3431V10C20 6.22876 20 4.34315 18.8284 3.17157C17.6569 2 15.7712 2 12 2C8.22877 2 6.34315 2 5.17157 3.17157C4 4.34314 4 6.22876 4 10L4 14.5442C4 17.7892 4 19.4117 4.88607 20.5107C5.06508 20.7327 5.26731 20.9349 5.48933 21.1139C6.58831 22 8.21082 22 11.4558 22C12.1614 22 12.5141 22 12.8372 21.886C12.9044 21.8623 12.9702 21.835 13.0345 21.8043C13.3436 21.6564 13.593 21.407 14.0919 20.9081L18.8284 16.1716C19.4065 15.5935 19.6955 15.3045 19.8478 14.9369C20 14.5694 20 14.1606 20 13.3431Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-                                        </svg>
-                                    </div>
-                                    <div class="flex flex-col">
-                                        <span class="text-xs">{{message.chatmessageattachment.file_name}}</span>
-                                    </div>
-                                </div>
-                            </div>
+                        <div class="flex flex-col">
+                            <span class="text-xs">{{message.chatmessageattachment.file_name}}</span>
                         </div>
-                        {% endif %}
-                    {% endif %}
+                    </div>
+                </div>
+                {% endif %}
                 {% endif %}
+            </div>
+
+            <!-- GUEST MESSAGE  -->
+            {% else %}
+            {% if not message.chatmessageattachment %}
+            <div class="w-full flex justify-end">
+                <div
+                    class="max-w-[80%] px-4 py-3 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
+                    <p style="white-space: pre-line; overflow-wrap: anywhere;">{{message.content}}</p>
+                </div>
+            </div>
+            {% else %}
+            {% if message.chatmessageattachment.is_image %}
+            <div class="w-full flex justify-end">
+                <div
+                    class="max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
+                    <img src="http://192.168.1.111:8000/{{message.chatmessageattachment.attachment}}"
+                        class="rounded-md">
+                </div>
+            </div>
+            {% else %}
+            <div class="w-full flex justify-end">
+                <div
+                    class="max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
+                    <div class="w-full flex items-center gap-1">
+                        <div>
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
+                                class="w-5 text-white notFilledSvg">
+                                <path d="M8 7L16 7" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round"></path>
+                                <path d="M8 11L12 11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round"></path>
+                                <path
+                                    d="M13 21.5V21C13 18.1716 13 16.7574 13.8787 15.8787C14.7574 15 16.1716 15 19 15H19.5M20 13.3431V10C20 6.22876 20 4.34315 18.8284 3.17157C17.6569 2 15.7712 2 12 2C8.22877 2 6.34315 2 5.17157 3.17157C4 4.34314 4 6.22876 4 10L4 14.5442C4 17.7892 4 19.4117 4.88607 20.5107C5.06508 20.7327 5.26731 20.9349 5.48933 21.1139C6.58831 22 8.21082 22 11.4558 22C12.1614 22 12.5141 22 12.8372 21.886C12.9044 21.8623 12.9702 21.835 13.0345 21.8043C13.3436 21.6564 13.593 21.407 14.0919 20.9081L18.8284 16.1716C19.4065 15.5935 19.6955 15.3045 19.8478 14.9369C20 14.5694 20 14.1606 20 13.3431Z"
+                                    stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round">
+                                </path>
+                            </svg>
+                        </div>
+                        <div class="flex flex-col">
+                            <span class="text-xs">{{message.chatmessageattachment.file_name}}</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {% endif %}
+            {% endif %}
+            {% endif %}
             {% endfor %}
+
+
+            <!-- REVIEW CONTAINER SENT BY THE BOTT -->
+            <div class="w-full flex items-end gap-2">
+                <div>
+                    <div
+                        class="w-[25px] h-[25px] rounded-full shadow-md text-white flex justify-center items-center bg-osiblue">
+                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-4" color="#000000"
+                            fill="none">
+                            <path d="M4 15.5C2.89543 15.5 2 14.6046 2 13.5C2 12.3954 2.89543 11.5 4 11.5" stroke="white"
+                                stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                            <path d="M20 15.5C21.1046 15.5 22 14.6046 22 13.5C22 12.3954 21.1046 11.5 20 11.5"
+                                stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                            <path d="M7 7L7 4" stroke="white" stroke-width="1.5" stroke-linejoin="round" />
+                            <path d="M17 7L17 4" stroke="white" stroke-width="1.5" stroke-linejoin="round" />
+                            <circle cx="7" cy="3" r="1" stroke="white" stroke-width="1.5" stroke-linejoin="round" />
+                            <circle cx="17" cy="3" r="1" stroke="white" stroke-width="1.5" stroke-linejoin="round" />
+                            <path
+                                d="M13.5 7H10.5C7.67157 7 6.25736 7 5.37868 7.90898C4.5 8.81796 4.5 10.2809 4.5 13.2069C4.5 16.1329 4.5 17.5958 5.37868 18.5048C6.25736 19.4138 7.67157 19.4138 10.5 19.4138H11.5253C12.3169 19.4138 12.5962 19.5773 13.1417 20.1713C13.745 20.8283 14.6791 21.705 15.5242 21.9091C16.7254 22.1994 16.8599 21.7979 16.5919 20.6531C16.5156 20.327 16.3252 19.8056 16.526 19.5018C16.6385 19.3316 16.8259 19.2898 17.2008 19.2061C17.7922 19.074 18.2798 18.8581 18.6213 18.5048C19.5 17.5958 19.5 16.1329 19.5 13.2069C19.5 10.2809 19.5 8.81796 18.6213 7.90898C17.7426 7 16.3284 7 13.5 7Z"
+                                stroke="white" stroke-width="1.5" stroke-linejoin="round" />
+                            <path d="M9.5 15C10.0701 15.6072 10.9777 16 12 16C13.0223 16 13.9299 15.6072 14.5 15"
+                                stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                stroke-linejoin="round" />
+                            <path d="M9.00896 11H9" stroke="#20336b" stroke-width="2" stroke-linecap="round"
+                                stroke-linejoin="round" />
+                            <path d="M15.009 11H15" stroke="#20336b" stroke-width="2" stroke-linecap="round"
+                                stroke-linejoin="round" />
+                        </svg>
+                    </div>
+                </div>
+
+                <div
+                    class="w-[80%] flex flex-col gap-3 bg-gray-50 px-4 py-3 rounded-r-3xl border-t-2 border-secondosiblue rounded-tl-3xl text-secondosiblue text-sm leading-7 bg-opacity-50 shadow-md">
+                    <p class="text-center text-secondosiblue">Rate your conversation</p>
+
+                    <div class="w-full flex justify-center items-center gap-3">
+                        <button data-reaction="" class="cursor-pointer hover:scale-105 duration-500 w-fit h-fit rounded-full">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="w-9"
+                                xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px"
+                                viewBox="0 0 999 961" style="enable-background:new 0 0 999 961;" xml:space="preserve">
+                                <style type="text/css">
+                                    .st0 {
+                                        fill: #D62B2B;
+                                    }
+
+                                    .st1 {
+                                        fill: #FFFFFF;
+                                    }
+
+                                    .st2 {
+                                        fill: #1A212D;
+                                    }
+
+                                    .st3 {
+                                        fill: #962A2A;
+                                    }
+
+                                    .st4 {
+                                        fill: #EFC029;
+                                    }
+
+                                    .st5 {
+                                        fill: #B79430;
+                                    }
+
+                                    .st6 {
+                                        fill: #8ACC36;
+                                    }
+
+                                    .st7 {
+                                        fill: #5D891F;
+                                    }
+                                </style>
+                                <g id="background">
+                                </g>
+                                <g id="objects">
+                                    <g>
+                                        <circle class="st6" cx="482" cy="485" r="470.3" />
+                                        <g>
+                                            <circle class="st1" cx="292.8" cy="418.6" r="124.3" />
+                                            <circle class="st2" cx="302" cy="426.7" r="67.9" />
+                                            <circle class="st1" cx="349.2" cy="387.6" r="24.2" />
+                                        </g>
+                                        <g>
+                                            <circle class="st1" cx="671.2" cy="418.6" r="124.3" />
+                                            <circle class="st2" cx="662" cy="426.7" r="67.9" />
+                                            <circle class="st1" cx="705.8" cy="387.6" r="24.2" />
+                                        </g>
+                                        <path class="st7"
+                                            d="M626.5,612c4.1,0,8.3,1.1,12.2,3.3c11.5,6.7,15.3,21.5,8.6,33c-0.6,1.1-16.2,27.4-45.7,53.3    C561.8,736.6,515,755,466.2,755s-95.6-18.5-135.4-53.4c-29.6-26-45.1-52.2-45.7-53.3c-6.7-11.5-2.9-26.3,8.6-33    c11.5-6.7,26.2-2.9,33,8.6c0.2,0.3,13,21.7,37.1,42.5c31,26.8,65.5,40.4,102.4,40.4s71.4-13.6,102.4-40.4    c24.1-20.9,37-42.3,37.1-42.5C610.2,616.2,618.3,612,626.5,612z" />
+                                    </g>
+                                </g>
+                            </svg>
+                        </button>
+
+                        <button data-reaction="" class="cursor-pointer hover:scale-105 duration-500  w-fit h-fit rounded-full">
+                            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+                                version="1.1" x="0px" y="0px" class="w-9" viewBox="0 0 999 961"
+                                style="enable-background:new 0 0 999 961;" xml:space="preserve">
+                                <style type="text/css">
+                                    .st0 {
+                                        fill: #D62B2B;
+                                    }
+
+                                    .st1 {
+                                        fill: #FFFFFF;
+                                    }
+
+                                    .st2 {
+                                        fill: #1A212D;
+                                    }
+
+                                    .st3 {
+                                        fill: #962A2A;
+                                    }
+
+                                    .st4 {
+                                        fill: #EFC029;
+                                    }
+
+                                    .st5 {
+                                        fill: #B79430;
+                                    }
+
+                                    .st6 {
+                                        fill: #8ACC36;
+                                    }
+
+                                    .st7 {
+                                        fill: #5D891F;
+                                    }
+                                </style>
+                                <g id="background">
+                                </g>
+                                <g id="objects">
+                                    <g>
+                                        <circle class="st4" cx="499.5" cy="480.5" r="470.3" />
+                                        <g>
+                                            <circle class="st1" cx="310.3" cy="414.1" r="124.3" />
+                                            <circle class="st2" cx="319.5" cy="422.1" r="67.9" />
+                                            <circle class="st1" cx="366.7" cy="383" r="24.2" />
+                                        </g>
+                                        <g>
+                                            <circle class="st1" cx="688.7" cy="414.1" r="124.3" />
+                                            <circle class="st2" cx="679.5" cy="422.1" r="67.9" />
+                                            <circle class="st1" cx="723.2" cy="383" r="24.2" />
+                                        </g>
+                                        <rect x="309.9" y="646.4" class="st5" width="379.1" height="48.2" />
+                                    </g>
+                                </g>
+                            </svg>
+                        </button>
+
+
+                        <button data-reaction="" class="cursor-pointer hover:scale-105 duration-500  w-fit h-fit rounded-full">
+                            <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+                                version="1.1" x="0px" y="0px" class="w-9" viewBox="0 0 999 961"
+                                style="enable-background:new 0 0 999 961;" xml:space="preserve">
+                                <style type="text/css">
+                                    .st0 {
+                                        fill: #D62B2B;
+                                    }
+
+                                    .st1 {
+                                        fill: #FFFFFF;
+                                    }
+
+                                    .st2 {
+                                        fill: #1A212D;
+                                    }
+
+                                    .st3 {
+                                        fill: #962A2A;
+                                    }
+
+                                    .st4 {
+                                        fill: #EFC029;
+                                    }
+
+                                    .st5 {
+                                        fill: #B79430;
+                                    }
+
+                                    .st6 {
+                                        fill: #8ACC36;
+                                    }
+
+                                    .st7 {
+                                        fill: #5D891F;
+                                    }
+                                </style>
+                                <g id="background">
+                                </g>
+                                <g id="objects">
+                                    <g>
+                                        <circle class="st0" cx="499.5" cy="480.5" r="470.3" />
+                                        <g>
+                                            <circle class="st1" cx="310.3" cy="414.1" r="124.3" />
+                                            <circle class="st2" cx="319.5" cy="422.1" r="67.9" />
+                                            <circle class="st1" cx="366.7" cy="383" r="24.2" />
+                                        </g>
+                                        <g>
+                                            <circle class="st1" cx="688.7" cy="414.1" r="124.3" />
+                                            <circle class="st2" cx="679.5" cy="422.1" r="67.9" />
+                                            <circle class="st1" cx="723.2" cy="383" r="24.2" />
+                                        </g>
+                                        <path class="st3"
+                                            d="M336.7,746.1c-4.1,0-8.3-1.1-12.2-3.3c-11.5-6.7-15.3-21.5-8.6-33c0.6-1.1,16.2-27.4,45.7-53.3    c39.8-34.9,86.6-53.4,135.4-53.4c48.8,0,95.6,18.5,135.4,53.4c29.6,26,45.1,52.2,45.7,53.3c6.7,11.5,2.9,26.3-8.6,33    c-11.5,6.7-26.2,2.9-33-8.6c-0.2-0.3-13-21.7-37.1-42.5c-31-26.8-65.5-40.4-102.4-40.4s-71.4,13.6-102.4,40.4    c-24.1,20.9-37,42.3-37.1,42.5C353.1,741.8,345,746.1,336.7,746.1z" />
+                                    </g>
+                                </g>
+                            </svg>
+                        </button>
+                    </div>
+
+
+                    <form class="w-full relative" id="sendReview">
+                        {% csrf_token %}
+                        <div
+                            class="w-full bg-white h-fit rounded-md border border-gray-200 flex items-center justify-between">
+                            <input name="message" placeholder="Tell us more..." id="messageInputTag"
+                                class="w-full border-none rounded-md outline-none px-3 py-2 resize-none duration-500">
+
+                            <div class="h-full right-0 top-0 px-3 flex items-center gap-2 text-osiblue">
+                                <button type="submit" id="submitButton" class="hidden">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" class="w-5 notFilledSvg">
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M6 12 3.269 3.125A59.769 59.769 0 0 1 21.485 12 59.768 59.768 0 0 1 3.27 20.875L5.999 12Zm0 0h7.5" />
+                                    </svg>
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="mt-5">
+        <!-- NEW CONVERSATION BUTTON -->
+        <div class="px-5">
+            <button id="startNewConversation"
+                class="w-full px-5 py-2 bg-osiblue border border-osiblue rounded-md text-white cursor-pointer hover:bg-white hover:text-osiblue duration-300">
+                Start New Conversation
+            </button>
         </div>
 
-        <audio id="notification-sound" src="http://192.168.1.111:8000/static/notifications/osichat-notification.mp3" preload="auto"></audio>
 
-        <div id="typing" class="hidden"></div>
+        <!-- FOOTER -->
+        <div class="w-full rounded-b-md px-3 py-3 flex justify-center items-center gap-1 bg-white">
+            <img src="http://192.168.1.111:8000/static/images/ositcom_logos/ositcom(o).png" class="w-[20px]">
+
+            <p class="text-xs text-secondosiblue">Osichat 2.0 by <a href="https://ositcom.com/" target="_blank"
+                    class="hover:text-gray-400 duration-500">Ositcom</a></p>
+        </div>
     </div>
 
+</div>
+
+
+{% block form %}
 
-</div>
\ No newline at end of file
+{% endblock form %}
\ No newline at end of file
diff --git a/osinaweb/osichat/templates/partials/message.html b/osinaweb/osichat/templates/partials/message.html
index 6bb6ea85..02500bc5 100644
--- a/osinaweb/osichat/templates/partials/message.html
+++ b/osinaweb/osichat/templates/partials/message.html
@@ -1,5 +1,5 @@
 {% if chat_message.member %}
-    <div class="w-full flex items-end justify-start gap-2 fade-in-up">
+    <div class="w-full flex items-end justify-start gap-2">
         <div>
             <div
                 class="w-[25px] h-[25px] rounded-full shadow-md text-white flex justify-center items-center bg-osiblue uppercase text-xs">
@@ -45,7 +45,7 @@
 <!-- GUEST MESSAGE  -->
 {% else %}
     {% if not chat_message.chatmessageattachment %}
-        <div class="w-full flex justify-end fade-in-up">
+        <div class="w-full flex justify-end">
             <div
                 class="max-w-[80%] px-4 py-3 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
                 <p style="white-space: pre-line; overflow-wrap: anywhere;">{{chat_message.content}}</p>
@@ -53,13 +53,13 @@
         </div>
     {% else %}
         {% if chat_message.chatmessageattachment.is_image %}
-        <div class="w-full flex justify-end fade-in-up">
+        <div class="w-full flex justify-end">
             <div class="max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
                 <img src="http://192.168.1.111:8000/{{chat_message.chatmessageattachment.attachment}}" class="rounded-md">
             </div>
         </div>  
         {% else %}
-        <div class="w-full flex justify-end fade-in-up">
+        <div class="w-full flex justify-end">
             <div class="max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue">
                 <div class="w-full flex items-center gap-1">
                     <div>
@@ -78,14 +78,3 @@
         {% endif %}
     {% endif %}
 {% endif %}
-
-
-<style>
-    @keyframes fadeInAndUp {
-        from { opacity: 0; transform: translateY(12px); }
-        to { opacity: 1; transform: translateY(0px); }
-    }
-    .fade-in-up {
-        animation: fadeInAndUp 0.6s ease;
-    }
-</style>
\ No newline at end of file
diff --git a/osinaweb/osichat/templates/partials/unread-messages.html b/osinaweb/osichat/templates/partials/unread-messages.html
index bbd0a743..8d2159c2 100644
--- a/osinaweb/osichat/templates/partials/unread-messages.html
+++ b/osinaweb/osichat/templates/partials/unread-messages.html
@@ -45,7 +45,7 @@
             </div>
         {% else %}
         <div class="w-fit bg-opacity-70 bg-osiblue px-3 py-2 rounded-md w-full h-[300px]">
-                <img src="http://192.168.1.111:8000{{latest_unread_message.chatmessageattachment.attachment}}" class="w-full h-full object-cover rounded-md">
+                <img src="http://192.168.1.111:8000/{{latest_unread_message.chatmessageattachment.attachment}}" class="w-full h-full object-cover rounded-md">
             </div> 
         {% endif %}
 
diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc
index 7cfcd227..04de05ac 100644
Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/custom_context.py b/osinaweb/osinacore/custom_context.py
index 6e3f79b2..8de6cdfe 100644
--- a/osinaweb/osinacore/custom_context.py
+++ b/osinaweb/osinacore/custom_context.py
@@ -107,7 +107,8 @@ def utilities(request):
 
     latest_chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent')).order_by('-last_update', '-date_created')
     
-    return {'total_tasks': total_tasks, 
+    return {
+            'total_tasks': total_tasks, 
             'latest_statuses' : latest_statuses, 
             'last_status': last_status,
             'notes' : notes, 
diff --git a/osinaweb/osinacore/templates/chat_templates/chat-room.html b/osinaweb/osinacore/templates/chat_templates/chat-room.html
index 0d07c30c..c17fd45e 100644
--- a/osinaweb/osinacore/templates/chat_templates/chat-room.html
+++ b/osinaweb/osinacore/templates/chat_templates/chat-room.html
@@ -3,7 +3,7 @@
 <p id="sessionid" class="hidden">{{guest_session_id}}</p>
 <p id="userId" class="hidden">{{request.user.id}}</p>
 
-<div class="w-full h-full flex flex-col justify-between">
+<div class="w-full h-full flex flex-col justify-end">
     <!-- HEADER -->
     <div class="w-full flex items-center gap-1 py-3 px-3 border-b border-gray-100 text-[17px] text-secondosiblue">
         <div class="w-[30px] h-[30px] rounded-full shadow-md text-white flex justify-center items-center bg-osiblue">
@@ -17,9 +17,8 @@
         <p>{{chat_room.chatroomguest.name}}</p>
     </div>
 
-
     <!-- MESSAGES -->
-    <div class="w-full h-full overflow-y-auto flex-l flex flex-col justify-end gap-3 p-3 relative" style="overflow-y: auto !important;">
+    <div class="flex-1 overflow-y-auto p-3 flex flex-col gap-4" id="messages_container">
         {% for message in chat_messages %}
         {% if message.member == request.user %}
         <div class="w-full flex items-end justify-end gap-2">
@@ -69,7 +68,6 @@
         <!-- END TYPING -->
     </div>
 
-
     <!-- INPUT FORM -->
     <form class="px-5 pb-5 bg-transparent relative" id="sendMessage">
         {% csrf_token %}
diff --git a/osinaweb/osinacore/templates/chat_templates/chat-widget.html b/osinaweb/osinacore/templates/chat_templates/chat-widget.html
index 4790b733..554975d3 100644
--- a/osinaweb/osinacore/templates/chat_templates/chat-widget.html
+++ b/osinaweb/osinacore/templates/chat_templates/chat-widget.html
@@ -40,7 +40,7 @@
 
 
         <!-- RIGHT SIDE - CONVERSATION -->
-        <div class="col-span-2 h-full" id="inner-conversation">
+        <div class="col-span-2 overflow-hidden" id="inner-conversation">
             <!-- the messages are here -->
         </div>
     </div>
diff --git a/osinaweb/osinacore/templates/index.html b/osinaweb/osinacore/templates/index.html
index a2a84c26..ee79f345 100644
--- a/osinaweb/osinacore/templates/index.html
+++ b/osinaweb/osinacore/templates/index.html
@@ -5,13 +5,11 @@
 
 <!-- LEFT SIDE -->
 <div class="w-full xxlg1:w-[75%] flex flex-col items-center gap-5">
-
     <!-- RESPONSE MESSGAE FOR SHARING A TICKET -->
     <div id="successMessage"
         class="fixed mx-auto top-10 opacity-0 w-[85%] s:w-fit px-9 s:px-14 py-3 rounded-md bg-osiblue bg-opacity-80 text-white text-center rounded-t-md shadow-md z-10 pointer-events-none">
     </div>
 
-
     <!-- TICKETS -->
     <div class="w-full h-fit bg-white p-3 rounded-md shadow-md {% if not open_tickets %} hidden {% endif %}" id="tickets-div">
         <div class="overflow-x-auto border border-gray-300 rounded-md tableContainer" id="openTickets">
diff --git a/osinaweb/static/.DS_Store b/osinaweb/static/.DS_Store
index a53a2dcf..bf414b15 100644
Binary files a/osinaweb/static/.DS_Store and b/osinaweb/static/.DS_Store differ
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index cf970409..442ced92 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -1039,6 +1039,10 @@ video {
   height: 2rem;
 }
 
+.h-\[100\%\] {
+  height: 100%;
+}
+
 .h-\[1000px\] {
   height: 1000px;
 }
@@ -1256,6 +1260,10 @@ video {
   width: 2rem;
 }
 
+.w-9 {
+  width: 2.25rem;
+}
+
 .w-\[100px\] {
   width: 100px;
 }
@@ -1876,6 +1884,10 @@ video {
   border-top-width: 1px;
 }
 
+.border-t-2 {
+  border-top-width: 2px;
+}
+
 .border-none {
   border-style: none;
 }
@@ -1944,6 +1956,11 @@ video {
   border-right-color: transparent;
 }
 
+.border-t-secondosiblue {
+  --tw-border-opacity: 1;
+  border-top-color: rgb(55 74 122 / var(--tw-border-opacity));
+}
+
 .border-opacity-10 {
   --tw-border-opacity: 0.1;
 }
@@ -2361,6 +2378,11 @@ video {
   padding-right: 0.75rem;
 }
 
+.ps-3 {
+  -webkit-padding-start: 0.75rem;
+          padding-inline-start: 0.75rem;
+}
+
 .pt-2 {
   padding-top: 0.5rem;
 }
@@ -2679,6 +2701,16 @@ video {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
 
+.grayscale {
+  --tw-grayscale: grayscale(100%);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
+.grayscale-0 {
+  --tw-grayscale: grayscale(0);
+  filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
+}
+
 .filter {
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
 }
@@ -2721,6 +2753,14 @@ video {
   width: 0px !important;
 }
 
+#conversation::-webkit-scrollbar {
+  width: 3px !important;
+}
+
+#conversation::-webkit-scrollbar-thumb  {
+  background: #c0c2c58b !important;
+}
+
 @media screen and (max-width: 798px) {
   #closeChatContainer {
     display: none !important;
diff --git a/osinaweb/static/images/.DS_Store b/osinaweb/static/images/.DS_Store
index 6277becc..277ba293 100644
Binary files a/osinaweb/static/images/.DS_Store and b/osinaweb/static/images/.DS_Store differ
diff --git a/osinaweb/static/images/uploaded_chat_files/.DS_Store b/osinaweb/static/images/uploaded_chat_files/.DS_Store
new file mode 100644
index 00000000..dace6ef9
Binary files /dev/null and b/osinaweb/static/images/uploaded_chat_files/.DS_Store differ
diff --git a/osinaweb/static/images/uploaded_chat_files/4d198000-d76e-440e-af50-e6b16a21eada.jpeg b/osinaweb/static/images/uploaded_chat_files/4d198000-d76e-440e-af50-e6b16a21eada.jpeg
deleted file mode 100644
index 2c7b114b..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/4d198000-d76e-440e-af50-e6b16a21eada.jpeg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/5178d421-0fed-470e-a643-8cf5669aade6.jpeg b/osinaweb/static/images/uploaded_chat_files/5178d421-0fed-470e-a643-8cf5669aade6.jpeg
deleted file mode 100644
index 44837dcc..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/5178d421-0fed-470e-a643-8cf5669aade6.jpeg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Classic-Car-Database-by-Teoalida-SAMPLE.xlsx b/osinaweb/static/images/uploaded_chat_files/Classic-Car-Database-by-Teoalida-SAMPLE.xlsx
deleted file mode 100644
index 90c5397a..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Classic-Car-Database-by-Teoalida-SAMPLE.xlsx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/IMG_1902.webp b/osinaweb/static/images/uploaded_chat_files/IMG_1902.webp
deleted file mode 100644
index 30570b3b..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/IMG_1902.webp and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/IMG_1903.webp b/osinaweb/static/images/uploaded_chat_files/IMG_1903.webp
deleted file mode 100644
index e5001017..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/IMG_1903.webp and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/IMG_1918.webp b/osinaweb/static/images/uploaded_chat_files/IMG_1918.webp
deleted file mode 100644
index 66e4f7fa..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/IMG_1918.webp and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/IMG_3174.png b/osinaweb/static/images/uploaded_chat_files/IMG_3174.png
deleted file mode 100644
index 8e86d3e9..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/IMG_3174.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722494859477.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722494859477.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722494859477.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722495031613.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722495031613.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722495031613.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722495601233.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722495601233.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722495601233.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496171081.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496171081.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496171081.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496329936.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496329936.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496329936.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496713330.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496713330.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496713330.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496907173.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496907173.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722496907173.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497140421.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497140421.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497140421.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497634420.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497634420.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497634420.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497655353.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497655353.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497655353.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497773211.mp4 b/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497773211.mp4
deleted file mode 100644
index 199bc257..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/RPReplay_Final1722494778-1722497773211.mp4 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.46.14 PM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.46.14 PM.png
deleted file mode 100644
index dddc80d2..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.46.14 PM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.49.51 PM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.49.51 PM.png
deleted file mode 100644
index 597cdef3..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.49.51 PM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.49.51 PM_1.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.49.51 PM_1.png
deleted file mode 100644
index 597cdef3..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-29 at 3.49.51 PM_1.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.04.51 AM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.04.51 AM.png
deleted file mode 100644
index fc866528..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.04.51 AM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.04.51 AM_1.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.04.51 AM_1.png
deleted file mode 100644
index fc866528..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.04.51 AM_1.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.37 AM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.37 AM.png
deleted file mode 100644
index 8bc889c2..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.37 AM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.44 AM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.44 AM.png
deleted file mode 100644
index 7b0e93c7..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.44 AM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.44 AM_1.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.44 AM_1.png
deleted file mode 100644
index 7b0e93c7..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-30 at 11.06.44 AM_1.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM.png
deleted file mode 100644
index 38e88b88..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_1.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_1.png
deleted file mode 100644
index 38e88b88..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_1.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_2.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_2.png
deleted file mode 100644
index 38e88b88..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_2.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_3.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_3.png
deleted file mode 100644
index 38e88b88..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_3.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_4.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_4.png
deleted file mode 100644
index 38e88b88..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_4.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_5.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_5.png
deleted file mode 100644
index 38e88b88..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_5.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_6.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_6.png
deleted file mode 100644
index 38e88b88..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 10.10.29 AM_6.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_1.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_1.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_1.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_2.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_2.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_2.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_3.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_3.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_3.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_4.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_4.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_4.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_5.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_5.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_5.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_6.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_6.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_6.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_7.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_7.png
deleted file mode 100644
index 7c044759..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-07-31 at 12.54.43 PM_7.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-08-01 at 3.28.50 PM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-08-01 at 3.28.50 PM.png
deleted file mode 100644
index 13a2626a..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-08-01 at 3.28.50 PM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-08-01 at 3.28.59 PM.png b/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-08-01 at 3.28.59 PM.png
deleted file mode 100644
index 14497981..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/Screenshot 2024-08-01 at 3.28.59 PM.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/WS2-MAT418-Interpolation.pdf b/osinaweb/static/images/uploaded_chat_files/WS2-MAT418-Interpolation.pdf
deleted file mode 100644
index db659515..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/WS2-MAT418-Interpolation.pdf and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/WS3-MAT418-NumericalDifferentiationAndIntegration.pdf b/osinaweb/static/images/uploaded_chat_files/WS3-MAT418-NumericalDifferentiationAndIntegration.pdf
deleted file mode 100644
index 5a673a7c..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/WS3-MAT418-NumericalDifferentiationAndIntegration.pdf and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/WS3-MAT418-NumericalDifferentiationAndIntegration_1.pdf b/osinaweb/static/images/uploaded_chat_files/WS3-MAT418-NumericalDifferentiationAndIntegration_1.pdf
deleted file mode 100644
index 5a673a7c..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/WS3-MAT418-NumericalDifferentiationAndIntegration_1.pdf and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/WSM_LOG_20240731_0751.log b/osinaweb/static/images/uploaded_chat_files/WSM_LOG_20240731_0751.log
deleted file mode 100644
index e69de29b..00000000
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_1.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_1.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_1.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_2.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_2.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_2.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_3.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_3.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_3.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_4.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_4.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_4.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_5.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_5.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_5.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_6.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_6.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_6.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_7.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_7.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_7.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_8.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_8.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_8.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_9.docx b/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_9.docx
deleted file mode 100644
index 62027f86..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/daralothman-family-tree_9.docx and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/decorators.py b/osinaweb/static/images/uploaded_chat_files/decorators.py
deleted file mode 100644
index 0456eae1..00000000
--- a/osinaweb/static/images/uploaded_chat_files/decorators.py
+++ /dev/null
@@ -1,15 +0,0 @@
-
-from django.http import HttpResponseForbidden
-from functools import wraps
-def require_token(view_func):
-    @wraps(view_func)
-    def _wrapped_view(request, *args, **kwargs):
-        token = request.META.get('HTTP_AUTHORIZATION')
-        static_token = 'A3uLHUthhCTba5q62eVG4XSHghB5nmPqk!XZyHsHP'  # Replace with your static token.
-
-        if token == f'Token {static_token}':
-            return view_func(request, *args, **kwargs)
-        else:
-            return HttpResponseForbidden()
-
-    return _wrapped_view
diff --git a/osinaweb/static/images/uploaded_chat_files/decorators_1.py b/osinaweb/static/images/uploaded_chat_files/decorators_1.py
deleted file mode 100644
index 0456eae1..00000000
--- a/osinaweb/static/images/uploaded_chat_files/decorators_1.py
+++ /dev/null
@@ -1,15 +0,0 @@
-
-from django.http import HttpResponseForbidden
-from functools import wraps
-def require_token(view_func):
-    @wraps(view_func)
-    def _wrapped_view(request, *args, **kwargs):
-        token = request.META.get('HTTP_AUTHORIZATION')
-        static_token = 'A3uLHUthhCTba5q62eVG4XSHghB5nmPqk!XZyHsHP'  # Replace with your static token.
-
-        if token == f'Token {static_token}':
-            return view_func(request, *args, **kwargs)
-        else:
-            return HttpResponseForbidden()
-
-    return _wrapped_view
diff --git a/osinaweb/static/images/uploaded_chat_files/empty-cart.png b/osinaweb/static/images/uploaded_chat_files/empty-cart.png
deleted file mode 100644
index e335e7f9..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/empty-cart.png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image.jpg b/osinaweb/static/images/uploaded_chat_files/image.jpg
deleted file mode 100644
index a75a2374..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_4CCD54BE-3E2F-45A6-B3FB-8EC563EE4E7C-47056-0000009C6F4BA91D.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_4CCD54BE-3E2F-45A6-B3FB-8EC563EE4E7C-47056-0000009C6F4BA91D.jpg
deleted file mode 100644
index 355bb998..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_4CCD54BE-3E2F-45A6-B3FB-8EC563EE4E7C-47056-0000009C6F4BA91D.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_57A3176D-FD38-4700-BF87-575696D08BC9-47056-0000009C8497FCC3.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_57A3176D-FD38-4700-BF87-575696D08BC9-47056-0000009C8497FCC3.jpg
deleted file mode 100644
index 1dbe779d..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_57A3176D-FD38-4700-BF87-575696D08BC9-47056-0000009C8497FCC3.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_904A1F47-01E6-45A7-B92F-653F056E80C4-88858-00000094FBC3B8ED.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_904A1F47-01E6-45A7-B92F-653F056E80C4-88858-00000094FBC3B8ED.jpg
deleted file mode 100644
index 699fa16e..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_904A1F47-01E6-45A7-B92F-653F056E80C4-88858-00000094FBC3B8ED.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_962BCFEF-6A5D-4986-994E-66B5AF874021-88858-000000990DFE88FF.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_962BCFEF-6A5D-4986-994E-66B5AF874021-88858-000000990DFE88FF.jpg
deleted file mode 100644
index 1dbe779d..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_962BCFEF-6A5D-4986-994E-66B5AF874021-88858-000000990DFE88FF.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_B7DB17EB-1482-4F90-A05B-A1F5FF3E0431-47056-0000009E38884205.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_B7DB17EB-1482-4F90-A05B-A1F5FF3E0431-47056-0000009E38884205.jpg
deleted file mode 100644
index 5303e477..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_B7DB17EB-1482-4F90-A05B-A1F5FF3E0431-47056-0000009E38884205.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_BA57AB0B-00C4-4595-BA5E-D501CEECE772-47056-0000009D84B1BED5.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_BA57AB0B-00C4-4595-BA5E-D501CEECE772-47056-0000009D84B1BED5.jpg
deleted file mode 100644
index 65d09a3a..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_BA57AB0B-00C4-4595-BA5E-D501CEECE772-47056-0000009D84B1BED5.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_CB00CCA1-A61B-421B-9935-4524BE7A5125-47056-0000009BADD134B7.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_CB00CCA1-A61B-421B-9935-4524BE7A5125-47056-0000009BADD134B7.jpg
deleted file mode 100644
index 355bb998..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_CB00CCA1-A61B-421B-9935-4524BE7A5125-47056-0000009BADD134B7.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_E648F637-6E02-409D-94FE-69582E4643B3-47056-0000009B14855DDA.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_E648F637-6E02-409D-94FE-69582E4643B3-47056-0000009B14855DDA.jpg
deleted file mode 100644
index 699fa16e..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_E648F637-6E02-409D-94FE-69582E4643B3-47056-0000009B14855DDA.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_EF6EEDCF-604B-4E43-A697-42564654DEB1-30954-0000004943F52A54.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_EF6EEDCF-604B-4E43-A697-42564654DEB1-30954-0000004943F52A54.jpg
deleted file mode 100644
index 7018e1ff..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_EF6EEDCF-604B-4E43-A697-42564654DEB1-30954-0000004943F52A54.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_F105E107-1F2E-4661-9D66-1D3CBF3A1FBC-47056-0000009DF76FC60D.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_F105E107-1F2E-4661-9D66-1D3CBF3A1FBC-47056-0000009DF76FC60D.jpg
deleted file mode 100644
index 5303e477..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_F105E107-1F2E-4661-9D66-1D3CBF3A1FBC-47056-0000009DF76FC60D.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/image_picker_FF1CC6C5-C51B-4A97-8848-5EE37B9A5346-47056-0000009A6CB843EF.jpg b/osinaweb/static/images/uploaded_chat_files/image_picker_FF1CC6C5-C51B-4A97-8848-5EE37B9A5346-47056-0000009A6CB843EF.jpg
deleted file mode 100644
index 699fa16e..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/image_picker_FF1CC6C5-C51B-4A97-8848-5EE37B9A5346-47056-0000009A6CB843EF.jpg and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/osichat-notification.mp3 b/osinaweb/static/images/uploaded_chat_files/osichat-notification.mp3
deleted file mode 100644
index 71d80c70..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/osichat-notification.mp3 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/osichat-notification_1.mp3 b/osinaweb/static/images/uploaded_chat_files/osichat-notification_1.mp3
deleted file mode 100644
index 71d80c70..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/osichat-notification_1.mp3 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/osichat-notification_2.mp3 b/osinaweb/static/images/uploaded_chat_files/osichat-notification_2.mp3
deleted file mode 100644
index 71d80c70..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/osichat-notification_2.mp3 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/osichat-notification_3.mp3 b/osinaweb/static/images/uploaded_chat_files/osichat-notification_3.mp3
deleted file mode 100644
index 71d80c70..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/osichat-notification_3.mp3 and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/ositcom(o).png b/osinaweb/static/images/uploaded_chat_files/ositcom(o).png
deleted file mode 100644
index d3d6a541..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/ositcom(o).png and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/product11_S5recHH.webp b/osinaweb/static/images/uploaded_chat_files/product11_S5recHH.webp
deleted file mode 100644
index cac6b0ca..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/product11_S5recHH.webp and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/product7_TYkPvOP_kCDQZrR.webp b/osinaweb/static/images/uploaded_chat_files/product7_TYkPvOP_kCDQZrR.webp
deleted file mode 100644
index b7b09d95..00000000
Binary files a/osinaweb/static/images/uploaded_chat_files/product7_TYkPvOP_kCDQZrR.webp and /dev/null differ
diff --git a/osinaweb/static/images/uploaded_chat_files/upload-file.js b/osinaweb/static/images/uploaded_chat_files/upload-file.js
deleted file mode 100644
index 7435bc4d..00000000
--- a/osinaweb/static/images/uploaded_chat_files/upload-file.js
+++ /dev/null
@@ -1,120 +0,0 @@
-const imageDomain = "http://192.168.1.106:8000";
-
-// TO TRIGGER TEH FILE UPLOADER WHEN CLICKING ON THE UPLOAD FILE SVG
-document.getElementById('svgFileUpload').addEventListener('click', function() {
-    document.getElementById('fileupload').click();
-});
-
-document.getElementById('fileupload').addEventListener('change', function(event) {
-    let files = event.target.files;
-
-    for (let file of files) {
-        let formData = new FormData();
-        formData.append('file', file);
-        formData.append('filename', file.name);
-
-        // Display the file during upload
-        if (file.type.startsWith('image/')) {
-            displayImageDuringUpload(file);
-        } else {
-            displayDocumentDuringUpload(file);
-        }
-
-        // Perform the upload
-        fetch(`${imageDomain}/chat-file-uploader/`, {
-            method: 'POST',
-            body: formData,
-        })
-        .then(response => response.json())
-        .then(data => {
-            if (data.data === 'Uploaded Successfully') {
-                const fullPath = `${imageDomain}/${data.existingPath}`;
-                updateSelectTag(fullPath, file.name);
-                if (file.type.startsWith('image/')) {
-                    osichatSocket.send(JSON.stringify({ 'event_type': 'uploaded_image', 'fullPath': fullPath, 'type': 'image' }));
-                } else {
-                    osichatSocket.send(JSON.stringify({ 'event_type': 'uploaded_file',  'fullPath': fullPath, 'type': 'document' }));
-                }
-            } else {
-                console.error('Upload failed');
-            }
-        })
-        .catch(error => console.error('Error:', error));
-    }
-});
-
-function displayImageDuringUpload(file) {
-    let reader = new FileReader();
-    reader.onload = function(event) {
-        let outerDiv = document.createElement('div');
-        outerDiv.className = 'w-fit p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue';
-        
-        let div = document.createElement('div');
-        div.id = 'uploading-' + file.name;
-        div.className = 'image-' + file.name;
-        
-        let img = document.createElement('img');
-        img.src = event.target.result;
-        img.style.opacity = '0.2';
-        
-        div.appendChild(img);
-        
-        outerDiv.appendChild(div);
-        
-        document.getElementById('messages').appendChild(outerDiv);
-    };
-    reader.readAsDataURL(file);
-}
-
-
-function displayDocumentDuringUpload(file) {
-    let outerDiv = document.createElement('div');
-    outerDiv.className = 'w-full p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue';
-
-    let flexContainer = document.createElement('div');
-    flexContainer.className = 'w-full flex items-center gap-1';
-
-    let svg = `
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-7 text-white notFilledSvg">
-            <path d="M8 7L16 7" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M8 11L12 11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-            <path d="M13 21.5V21C13 18.1716 13 16.7574 13.8787 15.8787C14.7574 15 16.1716 15 19 15H19.5M20 13.3431V10C20 6.22876 20 4.34315 18.8284 3.17157C17.6569 2 15.7712 2 12 2C8.22877 2 6.34315 2 5.17157 3.17157C4 4.34314 4 6.22876 4 10L4 14.5442C4 17.7892 4 19.4117 4.88607 20.5107C5.06508 20.7327 5.26731 20.9349 5.48933 21.1139C6.58831 22 8.21082 22 11.4558 22C12.1614 22 12.5141 22 12.8372 21.886C12.9044 21.8623 12.9702 21.835 13.0345 21.8043C13.3436 21.6564 13.593 21.407 14.0919 20.9081L18.8284 16.1716C19.4065 15.5935 19.6955 15.3045 19.8478 14.9369C20 14.5694 20 14.1606 20 13.3431Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
-        </svg>
-    `;
-
-    let svgDiv = document.createElement('div');
-    svgDiv.innerHTML = svg;
-
-    let textContainer = document.createElement('div');
-    textContainer.className = 'flex flex-col';
-
-    let uploadingText = document.createElement('span');
-    uploadingText.id = 'uploading-' + file.name;
-    uploadingText.textContent = 'Uploading...';
-
-    let fileNameDiv = document.createElement('div');
-    fileNameDiv.className = 'file-name';
-    fileNameDiv.textContent = file.name;
-
-    textContainer.appendChild(uploadingText);
-    textContainer.appendChild(fileNameDiv);
-
-    flexContainer.appendChild(svgDiv);
-    flexContainer.appendChild(textContainer);
-
-    outerDiv.appendChild(flexContainer);
-
-    document.getElementById('messages').appendChild(outerDiv);
-}
-
-
-
-
-function updateSelectTag(path, fileName) {
-    let option = document.createElement('option');
-    option.value = path;
-    option.textContent = fileName;
-    option.selected = true;
-    document.getElementById('filePathInput').appendChild(option);
-}
-
diff --git a/osinaweb/static/js/osichat/conversation.js b/osinaweb/static/js/osichat/conversation.js
index c75a45aa..fb6bc0b0 100644
--- a/osinaweb/static/js/osichat/conversation.js
+++ b/osinaweb/static/js/osichat/conversation.js
@@ -5,6 +5,12 @@ let isOpen = false;
 let chatLoaded = false;
 
 
+function scrollBottom() {
+    const conversationContainer = document.getElementById('conversation');
+    if (conversationContainer) {
+        conversationContainer.scrollTop = conversationContainer.scrollHeight;
+    }
+}
 
 
 // FUNCTION TO FETCH THE SESSION ID
@@ -58,6 +64,9 @@ function handleFormSubmission(form, eventType, osichatSocket) {
         formData.forEach((value, key) => {
             eventMessage[key] = value;
         });
+        if (eventType === 'start_conversation') {
+            showLoader(); 
+        }
         osichatSocket.send(JSON.stringify(eventMessage));
         form.reset();
     });
@@ -73,6 +82,13 @@ function handleLoadChatEvent(data, osichatSocket) {
     }
 
     chatDiv.innerHTML = data.html;
+    scrollBottom();
+
+    if (isOpen) { // If chat widget isOpen (declared in chat-toggle.js) mark all messages as read by guest else just return number of unread messages
+        osichatSocket.send(JSON.stringify({ 'event_type': 'update_read_messages', 'chat_state': 'open' }));
+    } else {
+        osichatSocket.send(JSON.stringify({ 'event_type': 'update_read_messages', 'chat_state': 'closed' }));
+    }
 
 
     if (!document.querySelector('script[src="http://' + domain + '/static/js/osichat/chat-toggle.js"]')) {
@@ -105,6 +121,14 @@ function handleLoadChatEvent(data, osichatSocket) {
         const endChatButton = document.getElementById('endChat');
         endChatButton.classList.remove('hidden')
     }
+
+    const sendReviewContainer = document.getElementById('sendReview');  //Case where returned is ended-chat.html
+    if (sendReviewContainer) {
+        const sendReviewScript = document.createElement('script');
+        sendReviewScript.type = 'text/javascript';
+        sendReviewScript.src = `http://${domain}/static/js/osichat/send-review.js`;
+        chatDiv.appendChild(sendReviewScript);
+    }
 }
 
 
@@ -153,9 +177,23 @@ async function initializeChatWebSocket() {
                 }
                 break;
             case 'uploaded_file':
+                if (isOpen) { 
+                    osichatSocket.send(JSON.stringify({ 'event_type': 'update_read_messages', 'chat_state': 'open' }));
+                } else {
+                    osichatSocket.send(JSON.stringify({ 'event_type': 'update_read_messages', 'chat_state': 'closed' }));
+                }
                 const uploadingDiv = document.getElementById(`uploading-${data.file_name}`);
                 if (uploadingDiv) {
                     uploadingDiv.outerHTML = data.html;
+                    scrollBottom();
+                }
+                else{
+                    document.getElementById('messages').insertAdjacentHTML('beforeend', data.html);
+                    scrollBottom();
+                }
+                if (data.user) { // If it is sent by an Osina user play a notification sound for the guest
+                    const notificationSound = document.getElementById('notification-sound');
+                    notificationSound.play();
                 }
                 break;
             case 'update_read_messages':  
@@ -177,6 +215,10 @@ async function initializeChatWebSocket() {
                 }
                 document.getElementById(`endChatConfirmationContainer`).classList.add('hidden');
                 document.getElementById(`endChat`).classList.add('hidden');
+                const sendReviewScript = document.createElement('script');
+                sendReviewScript.type = 'text/javascript';
+                sendReviewScript.src = `http://${domain}/static/js/osichat/send-review.js`;
+                currentChat.appendChild(sendReviewScript);
                 break;
             default:
                 console.log('Unknown event type:', data.event_type);
diff --git a/osinaweb/static/js/osichat/send-review.js b/osinaweb/static/js/osichat/send-review.js
new file mode 100644
index 00000000..b3ea9aa2
--- /dev/null
+++ b/osinaweb/static/js/osichat/send-review.js
@@ -0,0 +1,24 @@
+(function () {
+    const messageInput = document.getElementById('messageInputTag');
+    const submitButton = document.getElementById('submitButton');
+
+    messageInput.addEventListener('input', function () {
+        if (messageInput.value.trim() !== "") {
+            submitButton.classList.remove('hidden');
+        } else {
+            submitButton.classList.add('hidden');
+        }
+    });
+
+
+
+    document.getElementById("startNewConversation").addEventListener("click", function() {
+        const eventMessage = {
+            event_type: "start_conversation"
+        };
+        osichatSocket.send(JSON.stringify(eventMessage));
+    });
+
+
+
+})();
\ No newline at end of file
diff --git a/osinaweb/static/js/osichat/textarea.js b/osinaweb/static/js/osichat/textarea.js
index ee484829..233d7a14 100644
--- a/osinaweb/static/js/osichat/textarea.js
+++ b/osinaweb/static/js/osichat/textarea.js
@@ -1,39 +1,55 @@
-(function() {
-// FUNCTION TO ADJUST TEXTAREA HEIGHT AND SUBMIT BUTTON VISIBILITY
-function adjustTextAreaAndButton(textarea, submitButton) {
-    // Adjust the height of the textarea
-    if (textarea.value.trim() === '') {
-        textarea.style.height = '50px';
-    } else {
-        textarea.style.height = textarea.scrollHeight + 'px';
+(function () {
+    // FUNCTION TO ADJUST TEXTAREA HEIGHT AND SUBMIT BUTTON VISIBILITY
+    function adjustTextAreaAndButton(textarea, submitButton) {
+        // Adjust the height of the textarea
+        if (textarea.value.trim() === '') {
+            textarea.style.height = '50px';
+        } else {
+            textarea.style.height = textarea.scrollHeight + 'px';
+        }
+
+        // Display and hide the submit button
+        if (textarea.value.trim() === '') {
+            submitButton.classList.add('hidden');
+        } else {
+            submitButton.classList.remove('hidden');
+        }
     }
 
-    // Display and hide the submit button
-    if (textarea.value.trim() === '') {
-        submitButton.classList.add('hidden');
-    } else {
-        submitButton.classList.remove('hidden');
+    function scrollBottom() {
+        const conversationContainer = document.getElementById('conversation');
+        conversationContainer.scrollTop = conversationContainer.scrollHeight;
     }
-}
 
 
-// INITIALIZE ELEMENTS
-const form = document.querySelector('#sendMessage');
-const textarea = document.querySelector('#dynamicTextarea');
-const conversationContainer = document.getElementById('conversation');
-const submitButton = document.getElementById('submitMessageButton');
 
+    // INITIALIZE ELEMENTS
+    const form = document.querySelector('#sendMessage');
+    const textarea = document.querySelector('#dynamicTextarea');
+    const conversationContainer = document.getElementById('conversation');
+    const submitButton = document.getElementById('submitMessageButton');
 
-// EVENT LISTENERS
-textarea.addEventListener('input', () => adjustTextAreaAndButton(textarea, submitButton));
 
-form.addEventListener('submit', (event) => {
-    textarea.style.height = '50px';
-    submitButton.classList.add('hidden');
+    // EVENT LISTENERS
+    textarea.addEventListener('input', () => adjustTextAreaAndButton(textarea, submitButton));
 
-    setTimeout(() => {
-        conversationContainer.scrollTop = conversationContainer.scrollHeight;
-    }, 100);
-});
+    form.addEventListener('submit', (event) => {
+        textarea.style.height = '50px';
+        submitButton.classList.add('hidden');
+
+        setTimeout(() => {
+            scrollBottom();
+        }, 100);
+    });
+
+    textarea.addEventListener('keydown', (event) => {
+        if (event.key === 'Enter' && !event.shiftKey) {
+            event.preventDefault();
+            if (!submitButton.classList.contains('hidden')) {
+                submitButton.click();
+            }
+            scrollBottom();
+        }
+    });
 
 })();
diff --git a/osinaweb/static/js/osichat/upload-file.js b/osinaweb/static/js/osichat/upload-file.js
index 04bdf8e6..b2285a81 100644
--- a/osinaweb/static/js/osichat/upload-file.js
+++ b/osinaweb/static/js/osichat/upload-file.js
@@ -48,6 +48,8 @@
     function displayImageDuringUpload(file) {
         let reader = new FileReader();
         reader.onload = function (event) {
+            let mainDiv = document.createElement('div');
+            mainDiv.className = 'w-full flex items-end justify-end gap-2'
             let outerDiv = document.createElement('div');
             outerDiv.id = 'uploading-' + file.name;
             outerDiv.className = 'max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue';
@@ -61,13 +63,18 @@
 
             outerDiv.appendChild(div);
 
-            document.getElementById('messages').appendChild(outerDiv);
+            mainDiv.appendChild(outerDiv);
+
+            document.getElementById('messages').appendChild(mainDiv);
+            scrollBottom();
         };
         reader.readAsDataURL(file);
     }
 
 
     function displayDocumentDuringUpload(file) {
+        let mainDiv = document.createElement('div');
+        mainDiv.className = 'w-full flex items-end justify-end gap-2'
         let outerDiv = document.createElement('div');
         outerDiv.id = 'uploading-' + file.name;
         outerDiv.className = 'max-w-[80%] p-4 rounded-l-3xl rounded-tr-3xl text-white shadow-md text-sm leading-6 bg-opacity-70 bg-osiblue';
@@ -105,7 +112,11 @@
 
         outerDiv.appendChild(flexContainer);
 
-        document.getElementById('messages').appendChild(outerDiv);
+        mainDiv.appendChild(outerDiv);
+
+        document.getElementById('messages').appendChild(mainDiv);
+
+        scrollBottom();
     }
 
 
diff --git a/osinaweb/static/js/osichat/visitors.js b/osinaweb/static/js/osichat/visitors.js
index 2b6dcd6a..529f3d95 100644
--- a/osinaweb/static/js/osichat/visitors.js
+++ b/osinaweb/static/js/osichat/visitors.js
@@ -1,11 +1,11 @@
 const visitors_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws";
-const my_domain = "osina.ositcom.com";
+const my_domain = "192.168.1.111:8000";
 
 async function fetchClientData() {
     let clientData = { client_ip: 'Unknown', client_country: 'Unknown' };
     while (clientData.client_ip === 'Unknown') {
         try {
-            const response = await fetch('https://osina.ositcom.com/get-client-ip/');
+            const response = await fetch('http://192.168.1.111:8000/get-client-ip/');
             const data = await response.json();
             if (data.ip) {
                 clientData = {
@@ -25,7 +25,7 @@ async function fetchVisitorsSession() {
     let session_id = 'Unknown';
     while (session_id === 'Unknown') {
         try {
-            const response = await fetch('https://ositcom.com/get-client-session/');
+            const response = await fetch('http://192.168.1.111:3000/get-client-session/');
             const data = await response.json();
             if (data.session_id) {
                 session_id = data.session_id;
@@ -49,7 +49,7 @@ async function initializeVisitorsWebSocket() {
         console.log('WebSocket connection to visitors established');
 
         const event_message = {
-            'event_type': 'new_visitor',
+            'event_type': 'visitor_ping',
             'referrer': referrer,
             'url': window.location.href,
             'client_ip': clientData.client_ip,