diff --git a/joi/src/core/Modal/index.tsx b/joi/src/core/Modal/index.tsx
index 736b2a6f6..7e31671ed 100644
--- a/joi/src/core/Modal/index.tsx
+++ b/joi/src/core/Modal/index.tsx
@@ -46,7 +46,7 @@ const Modal = ({
         <DialogPrimitive.Description>
           <VisuallyHidden></VisuallyHidden>
         </DialogPrimitive.Description>
-        <div className="modal__title">{title}</div>
+        {title && <div className="modal__title">{title}</div>}
         {content}
         {!hideClose && (
           <ModalClose asChild>
diff --git a/web/containers/Loader/Spinner.tsx b/web/containers/Loader/Spinner.tsx
index 5735bd5ff..2fb942d0a 100644
--- a/web/containers/Loader/Spinner.tsx
+++ b/web/containers/Loader/Spinner.tsx
@@ -1,11 +1,20 @@
 import React from 'react'
 
-const Spinner = () => {
+import { twMerge } from 'tailwind-merge'
+
+type Props = {
+  className?: string
+}
+
+const Spinner = ({ className }: Props) => {
   return (
     <div role="status">
       <svg
         aria-hidden="true"
-        className="inline h-4 w-4 animate-spin fill-[hsla(var(--primary-bg))] text-[hsla(var(--text-quaternary))]"
+        className={twMerge(
+          '"inline h-4 w-4 animate-spin fill-[hsla(var(--primary-bg))]',
+          className
+        )}
         viewBox="0 0 100 101"
         fill="none"
         xmlns="http://www.w3.org/2000/svg"
@@ -13,6 +22,7 @@ const Spinner = () => {
         <path
           d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
           fill="currentColor"
+          className="fill-[hsla(var(--text-quaternary))]"
         />
         <path
           d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
diff --git a/web/containers/WaitingCortexModal/index.tsx b/web/containers/WaitingCortexModal/index.tsx
index f186ac9d1..8b7161a28 100644
--- a/web/containers/WaitingCortexModal/index.tsx
+++ b/web/containers/WaitingCortexModal/index.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react'
 
-import { Modal } from '@janhq/joi'
+import { Button, Modal } from '@janhq/joi'
 import { useAtom, useAtomValue } from 'jotai'
 
 import useCortex from '@/hooks/useCortex'
@@ -8,22 +8,30 @@ import useCortex from '@/hooks/useCortex'
 import Spinner from '../Loader/Spinner'
 
 import { waitingForCortexAtom } from '@/helpers/atoms/App.atom'
-import { hostAtom } from '@/helpers/atoms/AppConfig.atom'
+import { hostAtom, janDataFolderPathAtom } from '@/helpers/atoms/AppConfig.atom'
 
 const WaitingForCortexModal: React.FC = () => {
   const host = useAtomValue(hostAtom)
   const [waitingForCortex, setWaitingForCortex] = useAtom(waitingForCortexAtom)
   const [timedOut, setTimedOut] = useState(false)
   const { isSystemAlive } = useCortex()
+  const [janDataFolderPath, setJanDataFolderPath] = useAtom(
+    janDataFolderPathAtom
+  )
 
   const checkSystemAlive = useCallback(async () => {
     setWaitingForCortex(!(await isSystemAlive()))
   }, [setWaitingForCortex, isSystemAlive])
 
+  const getAppDataFolder = useCallback(async () => {
+    return window.electronAPI?.appDataFolder().then(setJanDataFolderPath)
+  }, [setJanDataFolderPath])
+
   // Check health for the first time on mount
   useEffect(() => {
     checkSystemAlive()
-  }, [checkSystemAlive])
+    getAppDataFolder()
+  }, [checkSystemAlive, getAppDataFolder])
 
   useEffect(() => {
     setTimeout(() => {
@@ -35,29 +43,53 @@ const WaitingForCortexModal: React.FC = () => {
     <Modal
       hideClose
       open={waitingForCortex}
-      title={'Loading dependencies'}
+      className="w-auto"
       content={
-        <div className="flex gap-x-2">
-          <p className="mt-[2px] text-[hsla(var(--text-secondary))]">
-            Running API Server at{' '}
-            <a
-              href={`${host}/api`}
-              target="_blank"
-              className="text-[hsla(var(--app-link))] hover:underline"
+        <div className="inline-flex flex-col">
+          {timedOut ? (
+            <>
+              <h1 className="inline text-base font-bold">
+                {`Hmm, Jan's taking longer than usual to start up...`}
+              </h1>
+              <p className="mt-[2px] text-[hsla(var(--text-secondary))]">
+                API Server starting at{' '}
+                <a
+                  href={`${host}/api`}
+                  target="_blank"
+                  className="text-[hsla(var(--app-link))] hover:underline"
+                >
+                  {host}/api
+                </a>
+                <br />
+                <br />
+                <span>
+                  Check logs at{' '}
+                  <span
+                    onClick={() => window?.electronAPI?.openAppLog()}
+                    className="cursor-pointer text-[hsla(var(--app-link))]"
+                  >
+                    {janDataFolderPath}
+                  </span>{' '}
+                  if this persists or restart app.
+                </span>
+              </p>
+            </>
+          ) : (
+            <h1 className="inline text-base font-bold">
+              Jan is getting ready! This usually <br /> takes a few seconds...
+            </h1>
+          )}
+          <div className="mx-auto my-4 inline-block">
+            <Spinner className="h-8 w-8" />
+          </div>
+          {timedOut && (
+            <Button
+              className="ml-auto inline-flex"
+              onClick={() => window.core?.api?.relaunch()}
             >
-              {host}/api
-            </a>
-            , please wait for a moment...
-            <br /> <br />
-            {timedOut && (
-              <span>
-                The API server is taking longer than usual to start. If this
-                process continues to run for a minute, please check the log file
-                under the Jan Data Folder path or restart the application.
-              </span>
-            )}
-          </p>
-          <Spinner />
+              Restart App
+            </Button>
+          )}
         </div>
       }
     />
diff --git a/web/helpers/atoms/AppConfig.atom.ts b/web/helpers/atoms/AppConfig.atom.ts
index 9b8cba186..f0c0cc69d 100644
--- a/web/helpers/atoms/AppConfig.atom.ts
+++ b/web/helpers/atoms/AppConfig.atom.ts
@@ -30,4 +30,4 @@ export const didShowMigrationWarningAtom = atomWithStorage(
   }
 )
 
-export const hostAtom = atom('http://127.0.0.1:1338/v1')
+export const hostAtom = atom('http://127.0.0.1:1338')