diff --git a/backend/service-message/server.js b/backend/service-message/server.js
index c436ca9..6117c97 100644
--- a/backend/service-message/server.js
+++ b/backend/service-message/server.js
@@ -60,7 +60,7 @@ io.on('connection',socket => {
 
             socket.on('general',function(data){
                 const username = data.username;
-                const date = Date.now();
+                const date = data.date;
                 const channel = 'general';
                 const message = data.message;
 
diff --git a/frontend/src/app/services/chat/chat.service.ts b/frontend/src/app/services/chat/chat.service.ts
index 7245b07..fa6e8d6 100644
--- a/frontend/src/app/services/chat/chat.service.ts
+++ b/frontend/src/app/services/chat/chat.service.ts
@@ -9,7 +9,6 @@ export interface ChatInfo {
   message: string
 }
 
-
 @Injectable({
   providedIn: 'root'
 })
@@ -39,16 +38,27 @@ export class ChatService {
     });
   }
 
-  sendMessage(username: string | null, room: string, message: string) {
-    // @ts-ignore
-    this.socket.emit(room, {
-      username: username,
-      date: new Date(),
-      room: room,
-      message: message
-    });
-  }
+  sendMessage(sender: string | null, receiver: string | null, room: string, message: string) {
+    if(receiver === null){
+      // @ts-ignore
+      this.socket.emit(room, {
+        username: sender,
+        date: new Date(),
+        room: room,
+        message: message
+      });
+    }
+    else{
+      // @ts-ignore
+      this.socket.emit('privateroom', {
+        sender: sender,
+        receiver: receiver,
+        date: new Date(),
+        message: message
+      });
+    }
 
+  }
   leaveRoom(): void {
     // @ts-ignore
     this.socket?.disconnect();
diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
index 057c44d..7cf16ef 100644
--- a/frontend/src/styles.scss
+++ b/frontend/src/styles.scss
@@ -56,10 +56,11 @@ body {
     align-items: center;
 
     .username {
-      font-size: 14px;
+      font-size: 20px;
       font-weight: 500;
       margin-bottom: 0;
       display: flex;
+      margin-left: 5px;
       justify-content: center;
       align-items: center;
     }
@@ -109,3 +110,7 @@ body {
     }
   }
 }
+
+.modal-footer{
+  display: block;
+}