diff --git a/src/App.tsx b/src/App.tsx
index b1f0ec8..d08f4c0 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -396,6 +396,8 @@ function App() {
   const resetAtomIsUsingImportExportSettingsAtom = useResetRecoilState(isUsingImportExportSettingsAtom)
   const { toggleFullScreen } = useAppFullScreen(setFullScreen);
   const generatorRef = useRef(null)
+  const [isRunningPublicNode, setIsRunningPublicNode] = useState(false)
+
   const exportSeedphrase = ()=> {
     const seedPhrase = generatorRef.current.parsedString
     saveSeedPhraseToDisk(seedPhrase)
@@ -487,7 +489,13 @@ function App() {
     }
   }, [extState]);
 
-  
+  useEffect(()=> {
+    isRunningGateway().then((res)=> {
+      setIsRunningPublicNode(res)
+    }).catch((error)=> {
+      console.error(error)
+    })
+  }, [extState])
 
   useEffect(() => {
     isFocusedRef.current = isFocused;
@@ -1932,7 +1940,8 @@ function App() {
                  isUserBlocked,
                  addToBlockList,
                  removeBlockFromList,
-                 getAllBlockedUsers
+                 getAllBlockedUsers,
+                 isRunningPublicNode
                }}
              >
                  <TaskManger getUserInfo={getUserInfo} />
@@ -2101,7 +2110,8 @@ function App() {
             isUserBlocked,
             addToBlockList,
             removeBlockFromList,
-            getAllBlockedUsers
+            getAllBlockedUsers,
+            isRunningPublicNode
           }}
         >
           <Box
diff --git a/src/Wallets.tsx b/src/Wallets.tsx
index 073afbd..d8d2192 100644
--- a/src/Wallets.tsx
+++ b/src/Wallets.tsx
@@ -301,11 +301,16 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
            />
            <Spacer height="7px" />
            <Label>Seed-phrase</Label>
-           <Input
-             placeholder="Seed-phrase"
-             value={seedValue}
-             onChange={(e) => setSeedValue(e.target.value)}
-           />
+           <PasswordField
+           placeholder="Seed-phrase"
+              id="standard-adornment-password"
+              value={seedValue}
+              onChange={(e) => setSeedValue(e.target.value)}
+              autoComplete="off"
+              sx={{
+                width: '100%'
+              }}
+            />
                       <Spacer height="7px" />
 
            <Label>Choose new password</Label>
@@ -314,6 +319,9 @@ export const Wallets = ({ setExtState, setRawWallet, rawWallet }) => {
               value={password}
               onChange={(e) => setPassword(e.target.value)}
               autoComplete="off"
+              sx={{
+                width: '100%'
+              }}
             />
  
          </Box>
diff --git a/src/atoms/global.ts b/src/atoms/global.ts
index b3b0b16..ef572da 100644
--- a/src/atoms/global.ts
+++ b/src/atoms/global.ts
@@ -21,9 +21,6 @@ export const sortablePinnedAppsAtom = atom({
   }, {
     name: 'Q-Shop',
     service: 'APP'
-  },{
-    name: 'qombo',
-    service: 'APP'
   },
   {
     name: 'Q-Trade',
@@ -33,10 +30,6 @@ export const sortablePinnedAppsAtom = atom({
     name: 'Q-Support',
     service: 'APP'
   },
-  {
-    name: 'NodeInfo',
-    service: 'APP'
-  },
   {
     name: 'Q-Mintership',
     service: 'APP'
diff --git a/src/background.ts b/src/background.ts
index 23bfe2b..d971c04 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -4931,8 +4931,15 @@ const checkGroupList = async () => {
     });
     const data = await response.json();
 
-    const filteredGroups =
-      data.groups?.filter((item) => item?.groupId !== 0) || [];
+    const copyGroups = [...(data?.groups || [])]
+              const findIndex = copyGroups?.findIndex(item => item?.groupId === 0)
+              if(findIndex !== -1){
+                copyGroups[findIndex] = {
+                  ...(copyGroups[findIndex] || {}),
+                  groupId: "0"
+                }
+              }
+              const filteredGroups = copyGroups
     const sortedGroups = filteredGroups.sort(
       (a, b) => (b.timestamp || 0) - (a.timestamp || 0)
     );
diff --git a/src/components/Apps/AppsLibrary.tsx b/src/components/Apps/AppsLibrary.tsx
index 0b0d8b1..7274d9b 100644
--- a/src/components/Apps/AppsLibrary.tsx
+++ b/src/components/Apps/AppsLibrary.tsx
@@ -39,12 +39,10 @@ const officialAppList = [
   "q-share",
   "q-support",
   "q-mail",
-  "qombo",
   "q-fund",
   "q-shop",
   "q-trade",
   "q-support",
-  "nodeinfo"
 ];
 
 const ScrollerStyled = styled('div')({
diff --git a/src/components/Apps/AppsLibraryDesktop.tsx b/src/components/Apps/AppsLibraryDesktop.tsx
index 71f823e..b96abf0 100644
--- a/src/components/Apps/AppsLibraryDesktop.tsx
+++ b/src/components/Apps/AppsLibraryDesktop.tsx
@@ -54,12 +54,10 @@ const officialAppList = [
   "q-share",
   "q-support",
   "q-mail",
-  "qombo",
   "q-fund",
   "q-shop",
   "q-trade",
   "q-support",
-  "nodeinfo",
   "q-mintership",
   "q-manager"
 ];
diff --git a/src/components/Chat/MessageItem.tsx b/src/components/Chat/MessageItem.tsx
index 1f4a21d..de9b519 100644
--- a/src/components/Chat/MessageItem.tsx
+++ b/src/components/Chat/MessageItem.tsx
@@ -185,7 +185,7 @@ const onSeenFunc = useCallback(()=> {
           
           
         </WrapperUserAction>
-        <Tooltip disableFocusListener title={`level ${userInfo}`}>
+        <Tooltip disableFocusListener title={`level ${userInfo ?? 0}`}>
             
          
             <img style={{
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index e441e16..6d2f225 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -460,7 +460,7 @@ export const Group = ({
   const [openAddGroup, setOpenAddGroup] = useState(false);
   const [isInitialGroups, setIsInitialGroups] = useState(false);
   const [openManageMembers, setOpenManageMembers] = useState(false);
-  const { setMemberGroups, memberGroups, rootHeight } = useContext(MyContext);
+  const { setMemberGroups, memberGroups, rootHeight, isRunningPublicNode } = useContext(MyContext);
   const lastGroupNotification = useRef<null | number>(null);
   const [timestampEnterData, setTimestampEnterData] = useState({});
   const [chatMode, setChatMode] = useState("groups");
@@ -2244,7 +2244,8 @@ export const Group = ({
               />
               Group Mgmt
             </CustomButton>
-            <CustomButton
+            {!isRunningPublicNode && (
+              <CustomButton
               onClick={() => {
                 setIsOpenBlockedUserModal(true);
               }}
@@ -2259,6 +2260,8 @@ export const Group = ({
                 }}
               />
             </CustomButton>
+            )}
+            
             </>
           )}
           {chatMode === "directs" && (
diff --git a/src/components/PasswordField/PasswordField.tsx b/src/components/PasswordField/PasswordField.tsx
index 18f9114..4aa0884 100644
--- a/src/components/PasswordField/PasswordField.tsx
+++ b/src/components/PasswordField/PasswordField.tsx
@@ -1,6 +1,7 @@
-import { Button, InputAdornment, TextField, TextFieldProps, styled } from "@mui/material";
+import { Button, ButtonBase, InputAdornment, TextField, TextFieldProps, styled } from "@mui/material";
 import { forwardRef, useState } from 'react'
-
+import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
+import VisibilityIcon from '@mui/icons-material/Visibility';
 export const CustomInput = styled(TextField)({
     width: "183px", // Adjust the width as needed
     borderRadius: "5px",
@@ -51,7 +52,11 @@ export const PasswordField = forwardRef<HTMLInputElement, TextFieldProps>( ({ ..
                         <InputAdornment position="end" data-testid="toggle-view-password-btn" onClick={() => {
                             setCanViewPassword((prevState) => !prevState)
                         }}>
-                            {canViewPassword ? <Button data-testid="plain-text-indicator" sx={{ minWidth: 0, p: 0 }}>👁️</Button> : <Button data-testid="password-text-indicator" sx={{ minWidth: 0, p: 0 }}>👁️‍🗨️</Button>}
+                             {canViewPassword ? <ButtonBase data-testid="plain-text-indicator" sx={{ minWidth: 0, p: 0 }}><VisibilityOffIcon sx={{
+                                color: 'white'
+                            }}/></ButtonBase> : <ButtonBase data-testid="password-text-indicator" sx={{ minWidth: 0, p: 0 }}><VisibilityIcon sx={{
+                                color: 'white'
+                            }} /></ButtonBase>}
                         </InputAdornment>
                     )
                 }}
diff --git a/src/components/WrapperUserAction.tsx b/src/components/WrapperUserAction.tsx
index 8bb9824..167c020 100644
--- a/src/components/WrapperUserAction.tsx
+++ b/src/components/WrapperUserAction.tsx
@@ -6,6 +6,7 @@ import { MyContext } from '../App';
 
 export const WrapperUserAction = ({ children, address, name, disabled }) => {
   const [anchorEl, setAnchorEl] = useState(null);
+  const {isRunningPublicNode} = useContext(MyContext)
 
   // Handle child element click to open Popover
   const handleChildClick = (event) => {
@@ -139,7 +140,10 @@ export const WrapperUserAction = ({ children, address, name, disabled }) => {
              >
               User lookup
              </Button>
-             <BlockUser handleClose={handleClose} address={address} name={name} />
+             {!isRunningPublicNode && (
+              <BlockUser handleClose={handleClose} address={address} name={name} />
+             )}
+             
 
 
         </Box>