diff --git a/.gitignore b/.gitignore
index 183c555631..b480462709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .DS_Store
+.envrc
+.vscode
 node_modules
 /build
 /.svelte-kit
@@ -14,4 +16,135 @@ node_modules/
 dist/
 .vercel
 
-*.swp
\ No newline at end of file
+*.swp
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+.env.production
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+
+### Node Patch ###
+# Serverless Webpack directories
+.webpack/
+
+# Optional stylelint cache
+.stylelintcache
+
+# SvelteKit build / generate output
+.svelte-kit
+
+
diff --git a/src/lib/components/status.svelte b/src/lib/components/status.svelte
index ca140ceb97..00ed3353e5 100644
--- a/src/lib/components/status.svelte
+++ b/src/lib/components/status.svelte
@@ -18,5 +18,5 @@
     {#if status}
         <span class="status-icon" />
     {/if}
-    <span class="text"><slot /></span>
+    <span class="text" data-private><slot /></span>
 </div>
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index dbaff62060..54422dd826 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -133,9 +133,9 @@
                 <button class="user-profile-button" on:click={() => (showDropdown = !showDropdown)}>
                     <AvatarInitials size={40} name={$user.name} />
                     <span class="user-profile-info is-only-desktop">
-                        <span class="name">{$user.name}</span>
+                        <span class="name" data-private>{$user.name}</span>
                         {#if $organization}
-                            <span class="title">{$organization.name}</span>
+                            <span class="title" data-private>{$organization.name}</span>
                         {/if}
                     </span>
                     <span
diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte
index 670c6f2647..9fc3f66a3d 100644
--- a/src/routes/console/account/+page.svelte
+++ b/src/routes/console/account/+page.svelte
@@ -167,7 +167,7 @@
                     <AvatarInitials size={48} name={$user.name} />
                 </svelte:fragment>
                 <svelte:fragment slot="title">
-                    <h6 class="u-bold u-trim-1">{$user.name}</h6>
+                    <h6 class="u-bold u-trim-1" data-private>{$user.name}</h6>
                 </svelte:fragment>
             </BoxAvatar>
         </svelte:fragment>
diff --git a/src/routes/console/account/sessions/+page.svelte b/src/routes/console/account/sessions/+page.svelte
index 399792e04e..9268f0506b 100644
--- a/src/routes/console/account/sessions/+page.svelte
+++ b/src/routes/console/account/sessions/+page.svelte
@@ -48,7 +48,7 @@
         <Heading tag="h2" size="5">Sessions</Heading>
 
         <Button secondary on:click={logoutAll}>
-            <span class="text">Logout all sessions</span>
+            <span class="text">Sign out all sessions</span>
         </Button>
     </div>
 
@@ -100,7 +100,7 @@
                         </TableCellText>
                         <TableCellText title="IP">{session.ip}</TableCellText>
                         <TableCell title="Client">
-                            <Button secondary on:click={() => logout(session)}>Logout</Button>
+                            <Button secondary on:click={() => logout(session)}>Sign out</Button>
                         </TableCell>
                     </TableRow>
                 {/each}
diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte
index 427084cc0d..a4a43379cb 100644
--- a/src/routes/console/organization-[organization]/deleteOrganization.svelte
+++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte
@@ -43,7 +43,7 @@
     icon="exclamation"
     state="warning"
     headerDivider={false}>
-    <p>
+    <p data-private>
         Are you sure you want to delete <b>{$organization.name}</b>? All projects ({$organization.total})
         and data associated with this organization will be deleted. This action is irreversible.
     </p>
diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte
index 0be63cf089..461d90d05d 100644
--- a/src/routes/console/organization-[organization]/settings/+page.svelte
+++ b/src/routes/console/organization-[organization]/settings/+page.svelte
@@ -76,7 +76,7 @@
                         <AvatarGroup {avatars} total={$members.total} />
                     </svelte:fragment>
                     <svelte:fragment slot="title">
-                        <h6 class="u-bold u-trim-1">{$organization.name}</h6>
+                        <h6 class="u-bold u-trim-1" data-private>{$organization.name}</h6>
                     </svelte:fragment>
                     <p>{$organization.total} members</p>
                 </BoxAvatar>
diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
index 80fe968c8b..6c155ae4ec 100644
--- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
+++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte
@@ -139,7 +139,8 @@
                     <Button
                         secondary
                         on:click={() => (showVerifcationDropdown = !showVerifcationDropdown)}>
-                        {$user.emailVerification ? 'Unverify' : 'Verify'} account
+                        {$user.emailVerification && $user.phoneVerification ? 'Unverify' : 'Verify'}
+                        account
                     </Button>
                     <svelte:fragment slot="list">
                         <DropListItem icon="mail" on:click={() => updateVerificationEmail()}>
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
index 7da08c27d9..bbf1c1b6e0 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
+++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
@@ -85,7 +85,7 @@
 <Container>
     {@const accessedAt = $key.accessedAt ? toLocaleDate($key.accessedAt) : 'never'}
     <CardGrid>
-        <div>
+        <div data-private>
             <Heading tag="h6" size="7">{$key.name}</Heading>
         </div>
         <svelte:fragment slot="aside">
@@ -157,7 +157,7 @@
             <Box>
                 <div class="u-flex u-gap-16">
                     <div class="u-cross-child-center u-line-height-1-5">
-                        <h6 class="u-bold">{$key.name}</h6>
+                        <h6 class="u-bold" data-private>{$key.name}</h6>
                         <p>Last accessed: {accessedAt}</p>
                     </div>
                 </div>
diff --git a/src/routes/console/project-[project]/settings/deleteProject.svelte b/src/routes/console/project-[project]/settings/deleteProject.svelte
index c0476e7641..065e9eed8e 100644
--- a/src/routes/console/project-[project]/settings/deleteProject.svelte
+++ b/src/routes/console/project-[project]/settings/deleteProject.svelte
@@ -43,7 +43,7 @@
     <svelte:fragment slot="aside">
         <BoxAvatar>
             <svelte:fragment slot="title">
-                <h6 class="u-bold u-trim-1">{$project.name}</h6>
+                <h6 class="u-bold u-trim-1" data-private>{$project.name}</h6>
             </svelte:fragment>
             <p>Last update: {toLocaleDateTime($project.$updatedAt)}</p>
         </BoxAvatar>
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
index f27ae87580..390b42db6b 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/step1.svelte
@@ -142,7 +142,7 @@
                     }))} />
             </FormList>
             <p class="u-text-center u-margin-block-start-24">
-                <button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>Sign Out</button>
+                <button class="u-bold" on:click|preventDefault={deauthorizeGoogle}>Sign out</button>
             </p>
         {/if}
     {:else if $provider.provider === 'supabase'}