diff --git a/Employee_Managment_App/src/App.tsx b/Employee_Managment_App/src/App.tsx
index 3dff7ae..abe986b 100644
--- a/Employee_Managment_App/src/App.tsx
+++ b/Employee_Managment_App/src/App.tsx
@@ -151,6 +151,7 @@ function App() {
           isOpen={sbIsOpen}
           type={sbType as any}
           position="Left"
+          className='app-nav-sidebar'
           showBackdrop={!isDesktop}
           closeOnDocumentClick={!isDesktop}
           open={() => {
diff --git a/Employee_Managment_App/src/components/EmployeeInfo.tsx b/Employee_Managment_App/src/components/EmployeeInfo.tsx
index acce3d5..3ad2292 100644
--- a/Employee_Managment_App/src/components/EmployeeInfo.tsx
+++ b/Employee_Managment_App/src/components/EmployeeInfo.tsx
@@ -235,14 +235,12 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ
                             <TabItemDirective header={headerText[0]} content={content0} />
                             {employeeData &&
                                 userInfo &&
-                                (userInfo.Name === employeeData.Name ||
-                                    userInfo.Name === employeeData.TeamLead) && (
+                                (userInfo.Name === employeeData.Name) && (
                                     <TabItemDirective header={headerText[1]} content={content1} />
                                 )}
                             {employeeData &&
                                 userInfo &&
-                                (userInfo.Name === employeeData.Name ||
-                                    userInfo.Name === employeeData.TeamLead) && (
+                                (userInfo.Name === employeeData.Name) && (
                                     <TabItemDirective header={headerText[2]} content={content2} />
                                 )}
                             {employeeData &&
diff --git a/Employee_Managment_App/src/components/TopNav.tsx b/Employee_Managment_App/src/components/TopNav.tsx
index bf1f0de..4cc0ccf 100644
--- a/Employee_Managment_App/src/components/TopNav.tsx
+++ b/Employee_Managment_App/src/components/TopNav.tsx
@@ -80,14 +80,10 @@ const TopNav: React.FC<TopNavProps> = ({
       if (avatarRef.current && !avatarRef.current.contains(ev.target as Node)) {
         setAvatarMenuOpen(false);
       }
-      if (createRef.current && !createRef.current.contains(ev.target as Node)) {
-        setCreateMenuOpen(false);
-      }
     };
     const handleEsc = (e: KeyboardEvent) => {
       if (e.key === 'Escape') {
         setAvatarMenuOpen(false);
-        setCreateMenuOpen(false);
         setMobileSearchOpen(false);
         setPanelOpen(false);
       }
@@ -203,6 +199,11 @@ const TopNav: React.FC<TopNavProps> = ({
               </svg>
             </ButtonComponent>
 
+            <button className="icon-btn" type="button" onClick={onOpenChat} title="Messages">
+              <svg width="20" height="20" viewBox="0 0 24 24" aria-hidden="true">
+                <path fill="currentColor" d="M21 6H3v12h5v4l4-4h9z" />
+              </svg>
+
             <div className="btn-create-group" ref={createRef}>
               <ButtonComponent
                 cssClass="btn-create"
diff --git a/Employee_Managment_App/src/index.css b/Employee_Managment_App/src/index.css
index c2df43c..4f61d23 100644
--- a/Employee_Managment_App/src/index.css
+++ b/Employee_Managment_App/src/index.css
@@ -54932,6 +54932,10 @@ ejs-sidebar {
   display: block;
 }
 
+.e-sidebar.app-nav-sidebar {
+  overflow: hidden;
+}
+
 .e-menu-wrapper.e-hamburger .e-popup.e-menu-popup,
 .e-menu-container.e-hamburger .e-popup.e-menu-popup {
   border: 0;