diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index a53954fc4..ce0b7defd 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -99,7 +99,11 @@
         <app-contacts (openMessage)="openMessagesPage($event)" *ngIf="showContacts" class="d-flex height-100 flex-column"></app-contacts>
         <app-new-group (addGroupMessage)="openGroupContactsPage($event)" *ngIf="showNewGroup" class="d-flex height-100 flex-column"></app-new-group>
         <app-group-contacts (openGroupMessage)="openGroupMessagesPage($event)" [roomId]="groupRoomId" class="d-flex height-100 flex-column" *ngIf="showGroupContacts"></app-group-contacts>
-        <app-group-messages (openGroupContacts)="openGroupContactsPage($event)" *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
+        <app-group-messages
+          (closeAllDesktopComponents)="closeAllDesktopComponents()"
+          (showEmptyContainer)="showEmptyContainer()"
+          (openGroupContacts)="openGroupContactsPage($event)" 
+          *ngIf="showGroupMessages" class="d-flex height-100 flex-column" [roomId]="roomId" #messagecontainer></app-group-messages>
       </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index f93e4b569..b998aa2b3 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -110,6 +110,9 @@ export class ChatPage implements OnInit {
     this.showGroupContacts=false;
     console.log('All components closed!');
   }
+  showEmptyContainer(){
+    this.showEmptyComponent=true;
+  }
   openGroupContactsPage(data){
     console.log(data);
     this.groupRoomId = data;
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index b15fd0816..d5e3e9cda 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -134,26 +134,27 @@ export class GroupMessagesPage implements OnInit {
     this.message = "";
   }
 
-  async openOptions(ev: any) {
-    const popover = await this.popoverController.create({
+  async openOptions() {
+    console.log('OK');
+    const modal = await this.modalController.create({
       component: ChatPopoverPage,
       cssClass: 'chat-popover',
-      event: ev,
       componentProps: {
-        room: this.room,
+        roomId: this.roomId,
       },
-      translucent: true
     });
-    await popover.present();
-    popover.onDidDismiss().then(res=>{
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log('OK2');
+      
       console.log(res);
-      if(res.data){
+      /* if(res.data ==){
         this.roomName = res.data.name.split('-').join(' ');
         console.log(this.roomName);
         
         this.getRoomInfo();
-        /* this.modalController.dismiss(); */
-      };
+        //this.modalController.dismiss();
+      }; */
       
     });
   }
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 15e3c3c37..5e06ea714 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle">
-          <ion-label class="title">{{room.name.split('-').join(' ')}}</ion-label>
+          <ion-label class="title">{{roomName}}</ion-label>
         </div>
         <div class="right">
           <button class="btn-no-color" (click)="openGroupMessagesOptions()">
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 2e4a5b159..f3da29159 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -23,9 +23,12 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   
 
   room:any;
+  roomName:any;
   members:any;
 
   @Input() roomId:string;
+  @Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
+  @Output() showEmptyContainer:EventEmitter<any> = new EventEmitter<any>();
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
@@ -79,6 +82,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     this.showLoader = true;
     this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
       this.room = room['room'];
+      this.roomName = this.room.name.split('-').join(' ');
       this.getGroupContacts(this.room);
       this.loadGroupMessages(this.room);
       this.showLoader = false;
@@ -190,7 +194,29 @@ export class GroupMessagesPage implements OnInit, OnChanges {
         roomId: this.roomId,
       }
     });
-    return await modal.present();
+    await modal.present();
+    modal.onDidDismiss().then(res=>{
+      console.log(res);
+      if(res.data == 'leave'){
+        console.log('LEAVE');
+        
+      }
+      else if(res.data == 'delete'){
+        this.closeAllDesktopComponents.emit();
+        this.showEmptyContainer.emit();
+      }
+      else if(res.data == 'cancel'){
+        console.log('CANCEL');
+      }
+      else{
+        this.roomName = res.data.name.split('-').join(' ');
+        console.log(this.roomName);
+        
+        this.getRoomInfo();
+        //this.modalController.dismiss();
+      };
+      
+    });
   }
 
   openSendGroupMessageOptions(ev: any){
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index e44a2188c..d04851177 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -27,17 +27,20 @@ export class ChatPopoverPage implements OnInit {
   }
   close(){
     if( window.innerWidth <= 1024){
-      this.popoverController.dismiss();
+      //this.popoverController.dismiss();
+      this.modalController.dismiss('cancel');
     }
     else{
-      this.modalController.dismiss();
+      this.modalController.dismiss('cancel');
     }
   }
 
    //Top menu options
    //Close
    leaveGroup(){
-    let body = { "roomId":this.roomId, }
+     console.log('leave');
+     
+    /* let body = { "roomId":this.roomId, }
 
     this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
       this.room = room['room'];
@@ -52,10 +55,8 @@ export class ChatPopoverPage implements OnInit {
           console.log(res);
         });
       }
-
-
-    });
-    this.popoverController.dismiss(true);
+    }); */
+    this.modalController.dismiss('leave');
   }
   //Delete
   deleteGroup(){
@@ -74,8 +75,9 @@ export class ChatPopoverPage implements OnInit {
         });
       }
     });
-    this.popoverController.dismiss(true);
+    this.modalController.dismiss('delete');
   }
+
   async openChangeGroupName(){
     const modal = await this.modalController.create({
       component: EditGroupPage,
@@ -89,7 +91,7 @@ export class ChatPopoverPage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then((res)=>{
       console.log(res.data);
-      this.popoverController.dismiss(res.data);
+      this.modalController.dismiss(res.data);
     });
   }
 
diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts
index 6aebde7d5..7d718f479 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -70,10 +70,10 @@ export class NewPublicationPage implements OnInit {
 
   getPublicationDetail(){
     this.showLoader = true;
-    console.log(this.publicationId);
+    //console.log(this.publicationId);
     /* console.log(this.folderId); */
     this.publications.GetPublicationById(this.publicationId).subscribe(res=>{
-      console.log(res);
+      //console.log(res);
       /* this.publication = res; */
       this.publication = {
         DateIndex: res.DateIndex,