diff --git a/apps/shinkai-visor/src/components/add-agent/add-agent.tsx b/apps/shinkai-visor/src/components/add-agent/add-agent.tsx
index 2a0fadd51..011978386 100644
--- a/apps/shinkai-visor/src/components/add-agent/add-agent.tsx
+++ b/apps/shinkai-visor/src/components/add-agent/add-agent.tsx
@@ -100,7 +100,10 @@ export const AddAgent = () => {
     });
   };
   return (
-    <div className="h-full p-1">
+    <div className="h-full flex flex-col">
+      <h1 className="font-semibold mb-2">
+        <FormattedMessage id="add-agent"></FormattedMessage>
+      </h1>
       <Form {...form}>
         <form
           className="h-full flex flex-col space-y-3 justify-between"
diff --git a/apps/shinkai-visor/src/components/agents/agents.tsx b/apps/shinkai-visor/src/components/agents/agents.tsx
index a80252b17..7f4c87104 100644
--- a/apps/shinkai-visor/src/components/agents/agents.tsx
+++ b/apps/shinkai-visor/src/components/agents/agents.tsx
@@ -1,33 +1,39 @@
-import { useAgents } from "@shinkai_network/shinkai-node-state/lib/queries/getAgents/useGetAgents";
-import { Fragment } from "react";
+import { useAgents } from '@shinkai_network/shinkai-node-state/lib/queries/getAgents/useGetAgents';
+import { Fragment } from 'react';
+import { FormattedMessage } from 'react-intl';
 
 import { useAuth } from '../../store/auth/auth';
+import { EmptyAgents } from '../empty-agents/empty-agents';
+import { Button } from '../ui/button';
 import { ScrollArea } from '../ui/scroll-area';
-import { Separator } from '../ui/separator';
 
 export const Agents = () => {
   const auth = useAuth((state) => state.auth);
   const { agents } = useAgents({
-    sender: auth?.shinkai_identity ?? "",
+    sender: auth?.shinkai_identity ?? '',
     senderSubidentity: `${auth?.profile}`,
-    shinkaiIdentity: auth?.shinkai_identity ?? "",
-    my_device_encryption_sk: auth?.profile_encryption_sk ?? "",
-    my_device_identity_sk: auth?.profile_identity_sk ?? "",
-    node_encryption_pk: auth?.node_encryption_pk ?? "",
-    profile_encryption_sk: auth?.profile_encryption_sk ?? "",
-    profile_identity_sk: auth?.profile_identity_sk ?? "",
+    shinkaiIdentity: auth?.shinkai_identity ?? '',
+    my_device_encryption_sk: auth?.profile_encryption_sk ?? '',
+    my_device_identity_sk: auth?.profile_identity_sk ?? '',
+    node_encryption_pk: auth?.node_encryption_pk ?? '',
+    profile_encryption_sk: auth?.profile_encryption_sk ?? '',
+    profile_identity_sk: auth?.profile_identity_sk ?? '',
   });
-  return (
-    <div className="[&>div>div]:!block h-full flex flex-col space-y-3 justify-between">
-      <ScrollArea>
+  return !agents?.length ? (
+    <div className="h-full flex flex-col justify-center">
+      <EmptyAgents></EmptyAgents>
+    </div>
+  ) : (
+    <div className="flex flex-col">
+      <h1 className="font-semibold mb-2">
+        <FormattedMessage id="agent.other"></FormattedMessage>
+      </h1>
+      <ScrollArea className="[&>div>div]:!block h-full flex flex-col space-y-3 justify-between">
         {agents?.map((agent) => (
           <Fragment key={agent.id}>
-            <p
-              className="w-full truncate overflow-hidden"
-            >
-              {agent.id}
-            </p>
-            <Separator className="my-2" />
+            <Button className="w-full" variant="tertiary">
+              <span className="w-full truncate text-start">{agent.id}</span>
+            </Button>
           </Fragment>
         ))}
       </ScrollArea>
diff --git a/apps/shinkai-visor/src/components/create-inbox/create-inbox.tsx b/apps/shinkai-visor/src/components/create-inbox/create-inbox.tsx
index 19149d9a8..3305a0ec2 100644
--- a/apps/shinkai-visor/src/components/create-inbox/create-inbox.tsx
+++ b/apps/shinkai-visor/src/components/create-inbox/create-inbox.tsx
@@ -1,16 +1,24 @@
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useCreateChat } from "@shinkai_network/shinkai-node-state/lib/mutations/createChat/useCreateChat";
+import { useCreateChat } from '@shinkai_network/shinkai-node-state/lib/mutations/createChat/useCreateChat';
 import { Loader2 } from 'lucide-react';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import { z } from 'zod';
 
 import { useAuth } from '../../store/auth/auth';
 import { Button } from '../ui/button';
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '../ui/form';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '../ui/form';
 import { Input } from '../ui/input';
+import { Textarea } from '../ui/textarea';
 
 const formSchema = z.object({
   receiverIdentity: z.string().nonempty(),
@@ -22,7 +30,7 @@ type FormSchemaType = z.infer<typeof formSchema>;
 export const CreateInbox = () => {
   const history = useHistory();
   const auth = useAuth((state) => state.auth);
-
+  const intl = useIntl();
   const form = useForm<FormSchemaType>({
     resolver: zodResolver(formSchema),
     defaultValues: {
@@ -32,19 +40,17 @@ export const CreateInbox = () => {
   });
   const { isLoading, mutateAsync: createChat } = useCreateChat({
     onSuccess: (data) => {
-      history.replace(
-        `/inboxes/${encodeURIComponent(data.inboxId)}`
-      );
+      history.replace(`/inboxes/${encodeURIComponent(data.inboxId)}`);
     },
   });
   const submit = (values: FormSchemaType) => {
     if (!auth) return;
-    const [receiver, ...rest] = values.receiverIdentity.split("/");
+    const [receiver, ...rest] = values.receiverIdentity.split('/');
     createChat({
       sender: auth.shinkai_identity,
       senderSubidentity: `${auth.profile}/device/${auth.registration_name}`,
       receiver,
-      receiverSubidentity: rest.join("/"),
+      receiverSubidentity: rest.join('/'),
       message: values.message,
       my_device_encryption_sk: auth.my_device_encryption_sk,
       my_device_identity_sk: auth.my_device_identity_sk,
@@ -61,53 +67,65 @@ export const CreateInbox = () => {
   }, [auth, form]);
 
   return (
-    <Form {...form}>
-      <form
-        className="p-1 h-full flex flex-col space-y-2 justify-between"
-        onSubmit={form.handleSubmit(submit)}
-      >
-        <div className="grow flex flex-col space-y-2">
-        <FormField
-            control={form.control}
-            name="receiverIdentity"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <FormattedMessage id="message-receiver" />
-                </FormLabel>
-                <FormControl>
-                  <Input {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-
-          <FormField
-            control={form.control}
-            name="message"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <FormattedMessage id="message.one" />
-                </FormLabel>
-                <FormControl>
-                  <Input {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        </div>
-        <Button
-          className="w-full"
-          disabled={!form.formState.isValid || isLoading}
-          type="submit"
+    <div className="h-full flex flex-col">
+      <h1 className="font-semibold mb-2">
+        <FormattedMessage id="create-inbox"></FormattedMessage>
+      </h1>
+      <Form {...form}>
+        <form
+          className="p-1 h-full flex flex-col space-y-2 justify-between"
+          onSubmit={form.handleSubmit(submit)}
         >
-          {isLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
-          <FormattedMessage id="create-inbox" />
-        </Button>
-      </form>
-    </Form>
+          <div className="grow flex flex-col space-y-2">
+            <FormField
+              control={form.control}
+              name="receiverIdentity"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    <FormattedMessage id="message-receiver" />
+                  </FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="message"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    <FormattedMessage id="message.one" />
+                  </FormLabel>
+                  <FormControl>
+                    <Textarea
+                      autoFocus
+                      className="resize-none border-white"
+                      placeholder={intl.formatMessage({
+                        id: 'tmwtd',
+                      })}
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+          <Button
+            className="w-full"
+            disabled={!form.formState.isValid || isLoading}
+            type="submit"
+          >
+            {isLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+            <FormattedMessage id="create-inbox" />
+          </Button>
+        </form>
+      </Form>
+    </div>
   );
 };
diff --git a/apps/shinkai-visor/src/components/create-job/create-job.tsx b/apps/shinkai-visor/src/components/create-job/create-job.tsx
index b50ddc61e..f43d733bf 100644
--- a/apps/shinkai-visor/src/components/create-job/create-job.tsx
+++ b/apps/shinkai-visor/src/components/create-job/create-job.tsx
@@ -5,7 +5,7 @@ import { useAgents } from '@shinkai_network/shinkai-node-state/lib/queries/getAg
 import { Loader2, Workflow } from 'lucide-react';
 import { useEffect } from 'react';
 import { useForm } from 'react-hook-form';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import { useHistory, useLocation } from 'react-router-dom';
 import { z } from 'zod';
 
@@ -41,6 +41,7 @@ type FormSchemaType = z.infer<typeof formSchema>;
 
 export const CreateJob = () => {
   const history = useHistory();
+  const intl = useIntl();
   const location = useLocation<{ files: File[] }>();
   const query = useQuery();
   const auth = useAuth((state) => state.auth);
@@ -99,89 +100,100 @@ export const CreateJob = () => {
   };
 
   return (
-    <Form {...form}>
-      <form
-        className="p-1 h-full flex flex-col space-y-2 justify-between"
-        onSubmit={form.handleSubmit(submit)}
-      >
-        <div className="grow flex flex-col space-y-3">
-          <FormField
-            control={form.control}
-            name="agent"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <FormattedMessage id="agent.one" />
-                </FormLabel>
-                <Select
-                  defaultValue={field.value}
-                  name={field.name}
-                  onValueChange={field.onChange}
-                  value={field.value}
-                >
-                  <FormControl>
-                    <SelectTrigger>
-                      <SelectValue />
-                    </SelectTrigger>
-                  </FormControl>
-                  <SelectPortal container={uiContainer?.rootElement}>
-                    <SelectContent>
-                      {agents?.map((agent) => (
-                        <SelectItem key={agent.id} value={agent.id}>
-                          {(agent.full_identity_name as any)?.subidentity_name}
-                        </SelectItem>
-                      ))}
-                    </SelectContent>
-                  </SelectPortal>
-                </Select>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
+    <div className="h-full flex flex-col">
+      <h1 className="font-semibold mb-2">
+        <FormattedMessage id="create-job"></FormattedMessage>
+      </h1>
+      <Form {...form}>
+        <form
+          className="p-1 h-full flex flex-col space-y-2 justify-between"
+          onSubmit={form.handleSubmit(submit)}
+        >
+          <div className="grow flex flex-col space-y-3">
+            <FormField
+              control={form.control}
+              name="agent"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    <FormattedMessage id="agent.one" />
+                  </FormLabel>
+                  <Select
+                    defaultValue={field.value}
+                    name={field.name}
+                    onValueChange={field.onChange}
+                    value={field.value}
+                  >
+                    <FormControl>
+                      <SelectTrigger>
+                        <SelectValue />
+                      </SelectTrigger>
+                    </FormControl>
+                    <SelectPortal container={uiContainer?.rootElement}>
+                      <SelectContent>
+                        {agents?.map((agent) => (
+                          <SelectItem key={agent.id} value={agent.id}>
+                            {
+                              (agent.full_identity_name as any)
+                                ?.subidentity_name
+                            }
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </SelectPortal>
+                  </Select>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
 
-          {query.has('context') && (
-            <blockquote className="max-h-28 p-4 mb-5 border-l-4 border-gray-300 bg-secondary-600 dark:border-gray-500 dark:bg-gray-800">
-              <p className="italic dark:text-white text-ellipsis overflow-hidden h-full">
-                {query.get('context')}
-              </p>
-            </blockquote>
-          )}
+            {query.has('context') && (
+              <blockquote className="max-h-28 p-4 mb-5 border-l-4 border-gray-300 bg-secondary-600 dark:border-gray-500 dark:bg-gray-800">
+                <p className="italic dark:text-white text-ellipsis overflow-hidden h-full">
+                  {query.get('context')}
+                </p>
+              </blockquote>
+            )}
 
-          {location.state?.files?.length && (
-            <blockquote className="max-h-28 p-4 mb-5 border-l-4 border-gray-300 bg-secondary-600 dark:border-gray-500 dark:bg-gray-800">
-              <FileList files={location.state?.files}></FileList>
-            </blockquote>
-          )}
+            {location.state?.files?.length && (
+              <blockquote className="max-h-28 p-4 mb-5 border-l-4 border-gray-300 bg-secondary-600 dark:border-gray-500 dark:bg-gray-800">
+                <FileList files={location.state?.files}></FileList>
+              </blockquote>
+            )}
 
-          <FormField
-            control={form.control}
-            name="content"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel>
-                  <FormattedMessage id="message.one" />
-                </FormLabel>
-                <FormControl>
-                  <Textarea
-                    className="resize-none border-white"
-                    placeholder="Eg: Give me the top 10 rock music in the 80s..."
-                    {...field}
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
+            <FormField
+              control={form.control}
+              name="content"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    <FormattedMessage id="message.one" />
+                  </FormLabel>
+                  <FormControl>
+                    <Textarea
+                      autoFocus
+                      className="resize-none border-white"
+                      placeholder={intl.formatMessage({
+                        id: 'tmwtd',
+                      })}
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </div>
+          <Button className="w-full" disabled={isLoading} type="submit">
+            {isLoading ? (
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+            ) : (
+              <Workflow className="mr-2 h-4 w-4"></Workflow>
             )}
-          />
-        </div>
-        <Button className="w-full" disabled={isLoading} type="submit">
-          {isLoading ? (
-            <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-          ) : (
-            <Workflow className="mr-2 h-4 w-4"></Workflow>
-          )}
-          <FormattedMessage id="create-job" />
-        </Button>
-      </form>
-    </Form>
+            <FormattedMessage id="create-job" />
+          </Button>
+        </form>
+      </Form>
+    </div>
   );
 };
diff --git a/apps/shinkai-visor/src/components/empty-agents/empty-agents.tsx b/apps/shinkai-visor/src/components/empty-agents/empty-agents.tsx
new file mode 100644
index 000000000..588681c38
--- /dev/null
+++ b/apps/shinkai-visor/src/components/empty-agents/empty-agents.tsx
@@ -0,0 +1,37 @@
+import { Bot } from "lucide-react";
+import { FormattedMessage } from "react-intl";
+import { useHistory } from "react-router-dom";
+
+import logo from '../../../src/assets/icons/shinkai-min.svg';
+import { srcUrlResolver } from "../../helpers/src-url-resolver";
+import { Button } from "../ui/button";
+
+export const EmptyAgents = () => {
+  const history = useHistory();
+  return (<div className="grow flex flex-col justify-center">
+  <div className="space-y-3 text-center mb-6">
+    <div className="grid place-content-center">
+      <img
+        alt="shinkai logo"
+        className="animate-spin-slow h-16 w-h-16"
+        data-cy="shinkai-logo"
+        src={srcUrlResolver(logo)}
+      />
+    </div>
+    <p className="text-lg font-semibold">
+      <FormattedMessage id="ask-to-shinkai-ai" />
+    </p>
+    <p className="text-sm text-center">
+      <FormattedMessage id="ask-to-shinkai-ai-example" />
+    </p>
+  </div>
+
+  <Button
+    className="w-full"
+    onClick={() => history.push('/agents/add')}
+  >
+    <Bot className="w-4 h-4 mr-2" />
+    <FormattedMessage id="add-agent" />
+  </Button>
+</div>);
+}
\ No newline at end of file
diff --git a/apps/shinkai-visor/src/components/file-list/file-list.tsx b/apps/shinkai-visor/src/components/file-list/file-list.tsx
index 9a0cf4b6f..31759ff9b 100644
--- a/apps/shinkai-visor/src/components/file-list/file-list.tsx
+++ b/apps/shinkai-visor/src/components/file-list/file-list.tsx
@@ -1,7 +1,6 @@
 import { ExternalLink, Paperclip } from 'lucide-react';
 
 import { getFileExt, getFileName } from '../../helpers/file-name-utils';
-import { Button } from '../ui/button';
 
 export const FileList = ({ files }: { files: File[] }) => {
   const openFile = (file: File): void => {
diff --git a/apps/shinkai-visor/src/components/inbox-input/inbox-input.tsx b/apps/shinkai-visor/src/components/inbox-input/inbox-input.tsx
index 22adf4730..ad706eda9 100644
--- a/apps/shinkai-visor/src/components/inbox-input/inbox-input.tsx
+++ b/apps/shinkai-visor/src/components/inbox-input/inbox-input.tsx
@@ -40,6 +40,10 @@ export const InboxInput = (props: InboxInputProps) => {
     if (value) {
       props.onSubmit(value);
       form.reset({ message: '' });
+      // TODO: Improve this. Workaround to set focus after submit form
+      setTimeout(() => {
+        form.setFocus('message');
+      }, 200);
     }
   };
   return (
@@ -61,6 +65,7 @@ export const InboxInput = (props: InboxInputProps) => {
                       id: 'tmwtd',
                     })}
                     {...field}
+                    autoFocus
                   />
                 </FormControl>
                 <FormMessage />
diff --git a/apps/shinkai-visor/src/components/inbox/inbox.tsx b/apps/shinkai-visor/src/components/inbox/inbox.tsx
index 9d92cf4cd..e2b9533ce 100644
--- a/apps/shinkai-visor/src/components/inbox/inbox.tsx
+++ b/apps/shinkai-visor/src/components/inbox/inbox.tsx
@@ -42,6 +42,7 @@ export const Inbox = () => {
     node_encryption_pk: auth?.node_encryption_pk ?? '',
     profile_encryption_sk: auth?.profile_encryption_sk ?? '',
     profile_identity_sk: auth?.profile_identity_sk ?? '',
+    refetchInterval: 5000,
   });
   const {
     mutateAsync: sendMessageToInbox,
@@ -126,10 +127,10 @@ export const Inbox = () => {
       const receiver = extractReceiverShinkaiName(decodedInboxId, sender);
       sendMessageToInbox({
         sender: auth.shinkai_identity,
-        sender_subidentity: auth.profile,
+        sender_subidentity: `${auth.profile}/device/${auth.registration_name}`,
         receiver,
         message: value,
-        inboxId: inboxId as string,
+        inboxId: decodedInboxId,
         my_device_encryption_sk: auth.my_device_encryption_sk,
         my_device_identity_sk: auth.my_device_identity_sk,
         node_encryption_pk: auth.node_encryption_pk,
@@ -160,17 +161,36 @@ export const Inbox = () => {
       >
         {isChatConversationSuccess && (
           <div className="py-2 text-center text-xs">
-            {isFetchingPreviousPage || hasPreviousPage ? (
+            {isFetchingPreviousPage && (
               <Loader2 className="flex animate-spin justify-center text-white" />
-            ) : (
+            )}
+            {!isFetchingPreviousPage && !hasPreviousPage && (
               <FormattedMessage id="all-messages-loaded"></FormattedMessage>
             )}
           </div>
         )}
         <div className="pb-4">
           {isChatConversationLoading &&
-            [1, 2, 3, 4].map((index) => (
-              <Skeleton className="h-10 w-full rounded-lg" key={index} />
+            [...Array(5).keys()].map((index) => (
+              <div
+                className={cn(
+                  'flex w-[95%] items-start gap-3',
+                  index % 2 === 0
+                    ? 'ml-0 mr-auto flex-row'
+                    : 'ml-auto mr-0 flex-row-reverse'
+                )}
+                key={`${index}`}
+              >
+                <Skeleton className="h-12 w-12 rounded-full" key={index} />
+                <Skeleton
+                  className={cn(
+                    'mt-1 rounded-lg px-2.5 py-3 w-full',
+                    index % 2 === 0
+                      ? 'rounded-tl-none border border-slate-800'
+                      : 'rounded-tr-none border-none'
+                  )}
+                />
+              </div>
             ))}
           {isChatConversationSuccess &&
             data?.pages?.map((group, index) => (
diff --git a/apps/shinkai-visor/src/components/inboxes/inboxes.tsx b/apps/shinkai-visor/src/components/inboxes/inboxes.tsx
index 0593c3a2d..727f5415f 100644
--- a/apps/shinkai-visor/src/components/inboxes/inboxes.tsx
+++ b/apps/shinkai-visor/src/components/inboxes/inboxes.tsx
@@ -2,14 +2,13 @@ import './inboxes.css';
 
 import { isJobInbox } from '@shinkai_network/shinkai-message-ts/utils';
 import { useGetInboxes } from '@shinkai_network/shinkai-node-state/lib/queries/getInboxes/useGetInboxes';
-import { Bot, MessageCircleIcon, Workflow } from 'lucide-react';
+import { MessageCircleIcon, Workflow } from 'lucide-react';
 import { Fragment } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 
-import logo from '../../../src/assets/icons/shinkai-min.svg';
-import { srcUrlResolver } from '../../helpers/src-url-resolver';
 import { useAuth } from '../../store/auth/auth';
+import { EmptyAgents } from '../empty-agents/empty-agents';
 import { Button } from '../ui/button';
 import { ScrollArea } from '../ui/scroll-area';
 
@@ -36,35 +35,12 @@ export const Inboxes = () => {
   return (
     <div className="h-full flex flex-col space-y-3 justify-between overflow-hidden">
       {!inboxIds?.length ? (
-        <div className="grow flex flex-col justify-center">
-          <div className="space-y-3 text-center mb-6">
-            <div className="grid place-content-center">
-              <img
-                alt="shinkai logo"
-                className="animate-spin-slow h-16 w-h-16"
-                data-cy="shinkai-logo"
-                src={srcUrlResolver(logo)}
-              />
-            </div>
-            <p className="text-lg font-semibold">
-              <FormattedMessage id="ask-to-shinkai-ai" />
-            </p>
-            <p className="text-sm text-center">
-              <FormattedMessage id="ask-to-shinkai-ai-example" />
-            </p>
-          </div>
-
-          <Button
-            className="w-full"
-            onClick={() => history.push('/agents/add')}
-          >
-            <Bot className="w-4 h-4 mr-2" />
-            <FormattedMessage id="add-agent" />
-          </Button>
-        </div>
+        <EmptyAgents></EmptyAgents>
       ) : (
         <div className="flex flex-col">
-          <h1 className="font-semibold mb-2">Inboxes</h1>
+          <h1 className="font-semibold mb-2">
+            <FormattedMessage id="inbox.other"></FormattedMessage>
+          </h1>
           <ScrollArea className="[&>div>div]:!block">
             {inboxIds?.map((inboxId) => (
               <Fragment key={inboxId}>
diff --git a/apps/shinkai-visor/src/components/nav-breadcrumb/nav-breadcrumb.css b/apps/shinkai-visor/src/components/nav-breadcrumb/nav-breadcrumb.css
deleted file mode 100644
index 25e9cfd2e..000000000
--- a/apps/shinkai-visor/src/components/nav-breadcrumb/nav-breadcrumb.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.breadcrumb-item {
-    max-width: 200px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
diff --git a/apps/shinkai-visor/src/components/nav-breadcrumb/nav-breadcrumb.tsx b/apps/shinkai-visor/src/components/nav-breadcrumb/nav-breadcrumb.tsx
deleted file mode 100644
index 3bcbbd268..000000000
--- a/apps/shinkai-visor/src/components/nav-breadcrumb/nav-breadcrumb.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import './nav-breadcrumb.css';
-
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { useIntl } from 'react-intl';
-import { useLocation } from 'react-router-dom';
-
-import { Separator } from '../ui/separator';
-
-type BreadcrumbItem = {
-  path: string;
-  title: string;
-};
-
-export const NavBreadcrumb = () => {
-  const location = useLocation();
-  const intl = useIntl();
-  const [breadcrumbItems, setItems] = useState<BreadcrumbItem[]>([]);
-  // TODO: Add i18n to this component
-  const pathToIntlDefinition = useMemo(() => new Map<string, string>([]), []);
-  const mapLocationToItems = useCallback(
-    (paths: string[]): BreadcrumbItem[] => {
-      const items = paths.map<BreadcrumbItem>((path) => {
-        const intlId = pathToIntlDefinition.get(path);
-        const title = pathToIntlDefinition.get(path)
-          ? intl.formatMessage({ id: intlId })
-          : decodeURIComponent(path);
-        return {
-          path: path,
-          title,
-        };
-      });
-      return items;
-    },
-    [intl, pathToIntlDefinition],
-  );
-  useEffect(() => {
-    const paths = location.pathname.split('/').filter((path) => path);
-    const items = mapLocationToItems(paths);
-    setItems(items);
-  }, [location, intl, pathToIntlDefinition, mapLocationToItems]);
-  return (
-    <div className="flex flex-row h-5 items-center space-x-2 text-sm">
-      {breadcrumbItems.map((breadcrumbItem) => (
-        <div className="flex flex-row h-4 space-x-2 items-center max-w-20" key={breadcrumbItem.path}>
-          <div className="text-ellipsis overflow-hidden whitespace-nowrap">{breadcrumbItem.title}</div>
-          <Separator orientation="vertical" />
-        </div>
-      ))}
-    </div>
-  );
-};
diff --git a/apps/shinkai-visor/src/components/nav/nav.tsx b/apps/shinkai-visor/src/components/nav/nav.tsx
index 92eaf7b75..48069667c 100644
--- a/apps/shinkai-visor/src/components/nav/nav.tsx
+++ b/apps/shinkai-visor/src/components/nav/nav.tsx
@@ -75,13 +75,11 @@ export default function NavBar() {
   return (
     <nav className="">
       <div className="flex items-center justify-between">
-        {!isRootPage && (
-          <div className="flex-none">
+          <div className={`flex-none ${isRootPage ? 'invisible' : ''}`}>
             <Button onClick={() => goBack()} size="icon" variant="ghost">
               <ArrowLeft className="h-4 w-4" />
             </Button>
           </div>
-        )}
         <img
           alt="shinkai-app-logo"
           className="h-5"
diff --git a/apps/shinkai-visor/src/components/popup-routing/popup-routing.css b/apps/shinkai-visor/src/components/popup-routing/popup-routing.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apps/shinkai-visor/src/components/popup-routing/popup-routing.tsx b/apps/shinkai-visor/src/components/popup-routing/popup-routing.tsx
deleted file mode 100644
index 967c08f68..000000000
--- a/apps/shinkai-visor/src/components/popup-routing/popup-routing.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { ApiConfig } from '@shinkai_network/shinkai-message-ts/api/api_config';
-import { AnimatePresence, motion } from 'framer-motion';
-import { useEffect } from 'react';
-import { Route, Switch, useHistory, useLocation } from 'react-router-dom';
-
-import { useGlobalPopupChromeMessage } from '../../hooks/use-global-popup-chrome-message';
-import { useAuth } from '../../store/auth/auth';
-import { AddAgent } from '../add-agent/add-agent';
-import { AddNode } from '../add-node/add-node';
-import { Agents } from '../agents/agents';
-import { CreateInbox } from '../create-inbox/create-inbox';
-import { CreateJob } from '../create-job/create-job';
-import { Inbox } from '../inbox/inbox';
-import { Inboxes } from '../inboxes/inboxes';
-import { NotFound } from '../not-found/not-found';
-import { SplashScreen } from '../splash-screen/splash-screen';
-import Welcome from '../welcome/welcome';
-import { WithNav } from '../with-nav/with-nav';
-
-export const PopupRouting = () => {
-  const history = useHistory();
-  const auth = useAuth((state) => state.auth);
-  const location = useLocation();
-  const [popupVisibility] = useGlobalPopupChromeMessage();
-  useEffect(() => {
-    const isAuthenticated = !!auth;
-    if (isAuthenticated) {
-      ApiConfig.getInstance().setEndpoint(auth.node_address);
-      history.replace('/inboxes');
-      return;
-    } else {
-      history.replace('/welcome');
-    }
-  }, [history, auth]);
-  return (
-    <AnimatePresence>
-      {popupVisibility && (
-        <motion.div
-          animate={{ opacity: 1 }}
-          className={`h-full w-full flex flex-col p-4 border-solid border-primary border-2 rounded-lg bg-background`}
-          exit={{ opacity: 0 }}
-          initial={{ opacity: 0 }}
-        >
-          <Switch key={location.pathname} location={location}>
-            <Route exact path="/">
-              <SplashScreen></SplashScreen>
-            </Route>
-            <Route path="/welcome">
-              <Welcome />
-            </Route>
-            <Route path="/nodes">
-              <Switch>
-                <Route path="/nodes/add">
-                  <AddNode></AddNode>
-                </Route>
-              </Switch>
-            </Route>
-            <WithNav>
-              <Route path="/inboxes">
-                <Switch>
-                  <Route path="/inboxes/create-inbox">
-                    <CreateInbox></CreateInbox>
-                  </Route>
-                  <Route path="/inboxes/create-job">
-                    <CreateJob></CreateJob>
-                  </Route>
-                  <Route path="/inboxes/:inboxId">
-                    <Inbox></Inbox>
-                  </Route>
-                  <Route path="/">
-                    <Inboxes></Inboxes>
-                  </Route>
-                </Switch>
-              </Route>
-
-              <Route path="/agents">
-                <Switch>
-                  <Route path="/agents/add">
-                    <AddAgent></AddAgent>
-                  </Route>
-                  <Route path="/">
-                    <Agents></Agents>
-                  </Route>
-                </Switch>
-              </Route>
-            </WithNav>
-            <Route path="*">
-              <NotFound></NotFound>
-            </Route>
-          </Switch>
-        </motion.div>
-      )}
-    </AnimatePresence>
-  );
-};
diff --git a/apps/shinkai-visor/src/components/ui/scroll-area.tsx b/apps/shinkai-visor/src/components/ui/scroll-area.tsx
index d5d54ba87..d1a7d4671 100644
--- a/apps/shinkai-visor/src/components/ui/scroll-area.tsx
+++ b/apps/shinkai-visor/src/components/ui/scroll-area.tsx
@@ -11,10 +11,9 @@ const ScrollArea = React.forwardRef<
 >(({ className, children, ...props }, ref) => (
   <ScrollAreaPrimitive.Root
     className={cn("relative overflow-hidden", className)}
-    ref={ref}
     {...props}
   >
-    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
+    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]" ref={ref}>
       {children}
     </ScrollAreaPrimitive.Viewport>
     <ScrollBar />
diff --git a/apps/shinkai-visor/src/components/with-nav/with-nav.tsx b/apps/shinkai-visor/src/components/with-nav/with-nav.tsx
index 4d4865b67..f9adb2430 100644
--- a/apps/shinkai-visor/src/components/with-nav/with-nav.tsx
+++ b/apps/shinkai-visor/src/components/with-nav/with-nav.tsx
@@ -1,13 +1,11 @@
 import { PropsWithChildren } from 'react';
 
 import NavBar from '../nav/nav';
-import { NavBreadcrumb } from '../nav-breadcrumb/nav-breadcrumb';
 
 export const WithNav = (props: PropsWithChildren) => {
   return (
     <div className="h-full w-full flex flex-col space-y-5">
       <NavBar />
-      {/* <NavBreadcrumb></NavBreadcrumb> */}
       <div className="grow overflow-auto">{props.children}</div>
     </div>
   );
diff --git a/apps/shinkai-visor/src/store/auth/auth.ts b/apps/shinkai-visor/src/store/auth/auth.ts
index 2d0f9d30a..1d0c02f62 100644
--- a/apps/shinkai-visor/src/store/auth/auth.ts
+++ b/apps/shinkai-visor/src/store/auth/auth.ts
@@ -1,5 +1,5 @@
 import { create } from "zustand";
-import { createJSONStorage, devtools, persist } from "zustand/middleware";
+import { devtools, persist } from "zustand/middleware";
 
 import { ChromeStorage } from "../persistor/chrome-storage";
 
diff --git a/libs/shinkai-node-state/src/lib/queries/getChatConversation/types.ts b/libs/shinkai-node-state/src/lib/queries/getChatConversation/types.ts
index 6bd82b22b..5453880c4 100644
--- a/libs/shinkai-node-state/src/lib/queries/getChatConversation/types.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getChatConversation/types.ts
@@ -6,4 +6,5 @@ export type GetChatConversationInput = JobCredentialsPayload & {
   lastKey?: string;
   shinkaiIdentity: string;
   profile: string;
+  refetchInterval?: number;
 };
diff --git a/libs/shinkai-node-state/src/lib/queries/getChatConversation/useGetChatConversationWithPagination.ts b/libs/shinkai-node-state/src/lib/queries/getChatConversation/useGetChatConversationWithPagination.ts
index 591c4e6c4..1585e4b9a 100644
--- a/libs/shinkai-node-state/src/lib/queries/getChatConversation/useGetChatConversationWithPagination.ts
+++ b/libs/shinkai-node-state/src/lib/queries/getChatConversation/useGetChatConversationWithPagination.ts
@@ -16,11 +16,9 @@ export const useGetChatConversationWithPagination = (input: GetChatConversationI
         count: CONVERSATION_PAGINATION_LIMIT,
       }),
     getPreviousPageParam: (_, allPages) => {
-      // const firstMessage = firstPage?.[0];
-      // const timeKey = firstMessage?.external_metadata?.scheduled_time;
-      // return timeKey ?? false;
       return allPages[0]?.length > CONVERSATION_PAGINATION_LIMIT - 2;
     },
+    refetchInterval: () => input.refetchInterval || false,
   });
   return response;
 };