diff --git a/src/app/chat/chat.page.ts b/src/app/chat/chat.page.ts
index c8a8145..a48d64d 100644
--- a/src/app/chat/chat.page.ts
+++ b/src/app/chat/chat.page.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { ModalController } from '@ionic/angular';
 import * as faker from 'faker';
 
 type IMember = {
@@ -39,7 +40,13 @@ export class ChatPage implements OnInit {
     members: Array<IMember> = [];
     myAccount: IMember;
 
-    constructor() { }
+    constructor(
+        private modalController: ModalController
+    ) { }
+
+    back() {
+        this.modalController.dismiss();
+    }
 
     ngOnInit() {
 
@@ -99,12 +106,6 @@ export class ChatPage implements OnInit {
             });
         }
 
-
-        setTimeout(() => {
-            this.scrollToEnd();
-        }, 500);
-
-
         setTimeout(() => {
             let options = [];
 
@@ -134,7 +135,7 @@ export class ChatPage implements OnInit {
             }, 500);
             
 
-        }, 3000);
+        }, 200);
 
     }
 
diff --git a/src/app/live/live.page.html b/src/app/live/live.page.html
index 4778d94..3591e42 100644
--- a/src/app/live/live.page.html
+++ b/src/app/live/live.page.html
@@ -52,7 +52,7 @@
     </div>
 
     <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-        <ion-fab-button class="chat-button" [routerLink]="['/chat']">
+        <ion-fab-button class="chat-button" (click)="presentChatModal()">
             <ion-icon name="chatbubble-ellipses-outline"></ion-icon>
         </ion-fab-button>
     </ion-fab>