diff --git a/client/ui/app-state/AppStateContextWrapper.tsx b/client/ui/app-state/AppStateContextWrapper.tsx
index accbd98..cc35c56 100644
--- a/client/ui/app-state/AppStateContextWrapper.tsx
+++ b/client/ui/app-state/AppStateContextWrapper.tsx
@@ -84,7 +84,7 @@ export default function DialogContextWrapper({ children, useRef }: { children: R
                 setCurrentSelectedChatId('')
         }
     }}>
-        {<ChatFragmentDialog chatId={currentSelectedChatId} useRef={chatFragmentDialogRef} />}
+        <ChatFragmentDialog chatId={currentSelectedChatId} useRef={chatFragmentDialogRef} />
         <UserOrChatInfoDialog chat={userOrChatInfoDialogState[userOrChatInfoDialogState.length - 1] || lastUserOrChatInfoDialogStateRef.current} useRef={userOrChatInfoDialogRef} />
         <EditMyProfileDialog useRef={editMyProfileDialogRef} />
         <AddFavourtieChatDialog useRef={addFavouriteChatDialogRef} />
diff --git a/client/ui/chat-fragment/ChatFragment.tsx b/client/ui/chat-fragment/ChatFragment.tsx
index c1d6692..b99fab4 100644
--- a/client/ui/chat-fragment/ChatFragment.tsx
+++ b/client/ui/chat-fragment/ChatFragment.tsx
@@ -77,13 +77,13 @@ export default function ChatFragment({
                 display: "flex",
                 flexDirection: "column",
             }}>
-                {/* {
+                {
                     openedInDialog && <mdui-button-icon icon="arrow_back" onClick={() => AppState.closeChat()} style={{
                         alignSelf: 'center',
                         marginLeft: '5px',
                         marginRight: '5px',
                     }}></mdui-button-icon>
-                } */}
+                }
                 <mdui-tabs ref={tabRef} value={tabItemSelected} style={{
                     position: 'sticky',
                     display: "flex",
@@ -105,6 +105,8 @@ export default function ChatFragment({
                 <div style={{
                     flexGrow: '1',
                 }}></div>
+                {
+                /*
                 <mdui-button-icon icon="open_in_new" onClick={() => {
                     window.open('/chat?id=' + chatInfo.getId(), '_blank')
                 }} style={{
@@ -112,6 +114,8 @@ export default function ChatFragment({
                     marginLeft: '5px',
                     marginRight: '5px',
                 }}></mdui-button-icon>
+                */
+                }
                 <mdui-button-icon icon="refresh" onClick={() => {
 
                 }} style={{
diff --git a/client/ui/chat-fragment/ChatMessage.tsx b/client/ui/chat-fragment/ChatMessage.tsx
index 72cfae0..c4d9104 100644
--- a/client/ui/chat-fragment/ChatMessage.tsx
+++ b/client/ui/chat-fragment/ChatMessage.tsx
@@ -170,10 +170,9 @@ export default function ChatMessage({ message, noUserDisplay, avatarMenuItems, m
                 flexDirection: "column"
             }}>
             {
-                !noUserDisplay &&
-                <div
+            	<div
                     style={{
-                        display: "flex",
+                        display: noUserDisplay ? "none" : "flex",
                         justifyContent: isAtRight ? "flex-end" : "flex-start",
                     }}>
                     {
diff --git a/client/utils/useEventListener.ts b/client/utils/useEventListener.ts
index 54e0ff5..c8770f8 100644
--- a/client/utils/useEventListener.ts
+++ b/client/utils/useEventListener.ts
@@ -1,7 +1,9 @@
 import * as React from 'react'
 
 export default function useEventListener<T extends HTMLElement | undefined | null>(ref: React.MutableRefObject<T>, eventName: string, callback: (event: Event) => void) {
+	// console.error(ref, eventName, callback)
     React.useEffect(() => {
+    	// console.warn(ref, eventName, callback)
         ref.current!.addEventListener(eventName, callback)
         return () => ref.current?.removeEventListener(eventName, callback)
     }, [ref, eventName, callback])