diff --git a/app/Http/Controllers/Settings/ProfileController.php b/app/Http/Controllers/Settings/ProfileController.php
index 59b41f04..98cffdf4 100644
--- a/app/Http/Controllers/Settings/ProfileController.php
+++ b/app/Http/Controllers/Settings/ProfileController.php
@@ -8,7 +8,6 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Redirect;
 use Inertia\Inertia;
 use Inertia\Response;
 
@@ -40,7 +39,7 @@ public function update(ProfileUpdateRequest $request): RedirectResponse
 
         $user?->save();
 
-        return Redirect::route('profile.edit');
+        return redirect()->route('profile.edit');
     }
 
     /**
diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php
index 4f21ee6e..456b5939 100644
--- a/app/Http/Middleware/HandleInertiaRequests.php
+++ b/app/Http/Middleware/HandleInertiaRequests.php
@@ -47,6 +47,13 @@ public function share(Request $request): array
                 'user' => $request->user(),
                 'isAdmin' => $request->user()?->hasRole('Admin'),
             ],
+            'flash' => [
+                'success' => fn () => $request->session()->get('flash_success'),
+                'info' => fn () => $request->session()->get('flash_info'),
+                'warn' => fn () => $request->session()->get('flash_warn'),
+                'error' => fn () => $request->session()->get('flash_error'),
+                'message' => fn () => $request->session()->get('flash_message'),
+            ],
         ];
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 7c3a45ec..3de593ef 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,7 +4,6 @@
 
 //use Illuminate\Contracts\Auth\MustVerifyEmail;
 use App\Models\Traits\Filterable;
-use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -12,7 +11,7 @@
 
 class User extends Authenticatable //implements MustVerifyEmail
 {
-    /** @use HasFactory<UserFactory> */
+    /** @use HasFactory<\Database\Factories\UserFactory> */
     use HasFactory;
     use Notifiable;
     use HasRoles;
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 8c67d0f5..43d9b948 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -47,7 +47,7 @@
                     ->setStatusCode($response->getStatusCode());
             } elseif ($response->getStatusCode() === 419) {
                 return back()->with([
-                    'message' => 'The page expired, please try again.',
+                    'flash_message' => 'The page expired, please try again.',
                 ]);
             }
 
diff --git a/resources/js/components/DeleteUserModal.vue b/resources/js/components/DeleteUserModal.vue
index f8fdf0cc..e802b77a 100644
--- a/resources/js/components/DeleteUserModal.vue
+++ b/resources/js/components/DeleteUserModal.vue
@@ -79,7 +79,7 @@ const deleteUser = () => {
             />
             <Button
                 :loading="form.processing"
-                label="Delete Account"
+                label="Delete account"
                 severity="danger"
                 @click="deleteUser"
             />
diff --git a/resources/js/components/FlashMessages.vue b/resources/js/components/FlashMessages.vue
new file mode 100644
index 00000000..af8df86e
--- /dev/null
+++ b/resources/js/components/FlashMessages.vue
@@ -0,0 +1,63 @@
+<script setup>
+import { Check, Info, TriangleAlert, CircleAlert, Megaphone } from 'lucide-vue-next';
+</script>
+
+<template>
+    <div class="m-0">
+        <Message
+            v-if="$page.props.flash.success"
+            class="mb-6"
+            severity="success"
+            closable
+        >
+            <template #icon>
+                <Check />
+            </template>
+            {{ $page.props.flash.success }}
+        </Message>
+        <Message
+            v-if="$page.props.flash.info"
+            class="mb-6"
+            severity="info"
+            closable
+        >
+            <template #icon>
+                <Info />
+            </template>
+            {{ $page.props.flash.info }}
+        </Message>
+        <Message
+            v-if="$page.props.flash.warn"
+            class="mb-6"
+            severity="warn"
+            closable
+        >
+            <template #icon>
+                <TriangleAlert />
+            </template>
+            {{ $page.props.flash.warn }}
+        </Message>
+        <Message
+            v-if="$page.props.flash.error"
+            class="mb-6"
+            severity="error"
+            closable
+        >
+            <template #icon>
+                <CircleAlert />
+            </template>
+            {{ $page.props.flash.error }}
+        </Message>
+        <Message
+            v-if="$page.props.flash.message"
+            class="mb-6"
+            severity="secondary"
+            closable
+        >
+            <template #icon>
+                <Megaphone />
+            </template>
+            {{ $page.props.flash.message }}
+        </Message>
+    </div>
+</template>
diff --git a/resources/js/composables/useAppLayout.ts b/resources/js/composables/useAppLayout.ts
index 0accaf73..eacce671 100644
--- a/resources/js/composables/useAppLayout.ts
+++ b/resources/js/composables/useAppLayout.ts
@@ -92,7 +92,7 @@ export function useAppLayout() {
             separator: true
         },
         {
-            label: 'Log Out',
+            label: 'Log out',
             lucideIcon: LogOut,
             command: () => logout(),
         },
diff --git a/resources/js/layouts/GuestAuthLayout.vue b/resources/js/layouts/GuestAuthLayout.vue
index 9d247134..29f7a49c 100644
--- a/resources/js/layouts/GuestAuthLayout.vue
+++ b/resources/js/layouts/GuestAuthLayout.vue
@@ -4,23 +4,50 @@ import ApplicationLogo from '@/components/ApplicationLogo.vue';
 
 <template>
     <Container>
-        <div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0">
+        <div class="min-h-screen flex flex-col justify-center items-center pt-6 sm:pt-0">
             <div>
                 <InertiaLink href="/">
-                    <ApplicationLogo class="w-15 h-15 fill-current text-surface-900 dark:text-surface-0" />
+                    <ApplicationLogo class="w-12 h-12 fill-current text-surface-900 dark:text-surface-0" />
                 </InertiaLink>
             </div>
             <div
                 v-if="$slots.message"
-                class="w-full sm:max-w-md mt-6 px-4 sm:px-0"
+                class="w-full sm:max-w-lg mt-6 px-4 sm:px-0"
             >
                 <slot name="message" />
             </div>
-            <div class="w-full sm:max-w-md mt-6">
-                <Card>
+            <div class="w-full sm:max-w-lg mt-6">
+                <Card
+                    pt:caption:class="space-y-2"
+                    pt:body:class="p-6 sm:p-8 space-y-6"
+                >
+                    <template
+                        v-if="$slots.header"
+                        #header
+                    >
+                        <slot name="header" />
+                    </template>
+                    <template
+                        v-if="$slots.title"
+                        #title
+                    >
+                        <slot name="title" />
+                    </template>
+                    <template
+                        v-if="$slots.subtitle"
+                        #subtitle
+                    >
+                        <slot name="subtitle" />
+                    </template>
                     <template #content>
                         <slot />
                     </template>
+                    <template
+                        v-if="$slots.footer"
+                        #footer
+                    >
+                        <slot name="footer" />
+                    </template>
                 </Card>
             </div>
         </div>
diff --git a/resources/js/layouts/app/HeaderLayout.vue b/resources/js/layouts/app/HeaderLayout.vue
index b80882f3..10d265bc 100644
--- a/resources/js/layouts/app/HeaderLayout.vue
+++ b/resources/js/layouts/app/HeaderLayout.vue
@@ -5,6 +5,7 @@ import { useAppLayout } from '@/composables/useAppLayout';
 import { ChevronsUpDown, ChevronDown, Menu as MenuIcon } from 'lucide-vue-next';
 import ApplicationLogo from '@/components/ApplicationLogo.vue';
 import ClientOnly from '@/components/ClientOnly.vue';
+import FlashMessages from '@/components/FlashMessages.vue';
 import Menu from '@/components/primevue/menu/Menu.vue';
 import Menubar from '@/components/primevue/menu/Menubar.vue';
 import PanelMenu from '@/components/primevue/menu/PanelMenu.vue';
@@ -153,6 +154,9 @@ const toggleMobileUserMenu = (event) => {
 
             <main>
                 <Container vertical>
+                    <!-- Session-based Flash Messages -->
+                    <FlashMessages />
+
                     <!-- Breadcrumbs -->
                     <Breadcrumb
                         v-if="props.breadcrumbs.length"
diff --git a/resources/js/layouts/app/SidebarLayout.vue b/resources/js/layouts/app/SidebarLayout.vue
index 440bb083..31013912 100644
--- a/resources/js/layouts/app/SidebarLayout.vue
+++ b/resources/js/layouts/app/SidebarLayout.vue
@@ -5,6 +5,7 @@ import { ChevronsUpDown, Menu as MenuIcon } from 'lucide-vue-next';
 import { useAppLayout } from '@/composables/useAppLayout';
 import ApplicationLogo from '@/components/ApplicationLogo.vue';
 import ClientOnly from '@/components/ClientOnly.vue';
+import FlashMessages from '@/components/FlashMessages.vue';
 import Menu from '@/components/primevue/menu/Menu.vue';
 import PanelMenu from '@/components/primevue/menu/PanelMenu.vue';
 import Breadcrumb from '@/components/primevue/menu/Breadcrumb.vue';
@@ -163,6 +164,9 @@ const toggleMobileUserMenu = (event) => {
                     vertical
                     fluid
                 >
+                    <!-- Session-based Flash Messages -->
+                    <FlashMessages />
+
                     <!-- Breadcrumbs -->
                     <Breadcrumb
                         v-if="props.breadcrumbs.length"
diff --git a/resources/js/pages/Welcome.vue b/resources/js/pages/Welcome.vue
index 55d4a0b0..4f86f07a 100644
--- a/resources/js/pages/Welcome.vue
+++ b/resources/js/pages/Welcome.vue
@@ -19,104 +19,106 @@ const page = usePage();
 <template>
     <InertiaHead title="Welcome" />
 
-    <div class="min-h-full">
-        <div class="h-screen flex items-center justify-center">
-            <Card pt:body:class="p-4 py-6 sm:p-12">
-                <template #content>
-                    <div class="text-center md:text-left">
-                        <span class="block text-6xl font-bold text-red-500 dark:text-red-400 mb-1">Laravel,</span>
-                        <div class="text-6xl font-bold text-indigo-500 dark:text-indigo-400 mb-1">
-                            Inertia.js,
-                        </div>
-                        <div class="text-6xl text-green-500 dark:text-green-400 text-emerald font-bold mb-4">
-                            & PrimeVue
-                        </div>
-                        <p class="mt-0 mb-4 text-muted-color leading-normal">
-                            A starter kit using
-                            <Button
-                                class="p-0 no-underline"
-                                variant="link"
-                                as="a"
-                                label="Laravel"
-                                href="https://laravel.com/docs/master"
-                                target="_blank"
-                                rel="noopener"
-                            />,
-                            <Button
-                                class="p-0 no-underline"
-                                variant="link"
-                                as="a"
-                                label="Inertia.js"
-                                href="https://inertiajs.com/"
-                                target="_blank"
-                                rel="noopener"
-                            />, and
-                            <Button
-                                class="p-0 no-underline"
-                                variant="link"
-                                as="a"
-                                label="PrimeVue"
-                                href="https://primevue.org/"
-                                target="_blank"
-                                rel="noopener"
-                            />.
-                        </p>
-                        <template v-if="page.props.auth.user">
-                            <InertiaLink :href="route('dashboard')">
-                                <Button
-                                    label="Dashboard"
-                                    class="mr-4"
-                                >
-                                    <template #icon>
-                                        <LayoutGrid />
-                                    </template>
-                                </Button>
-                            </InertiaLink>
-                            <InertiaLink :href="route('profile.edit')">
+    <Container fluid>
+        <div class="min-h-full">
+            <div class="h-screen flex items-center justify-center">
+                <Card pt:body:class="p-4 py-6 sm:p-12">
+                    <template #content>
+                        <div class="text-center md:text-left">
+                            <span class="block text-6xl font-bold text-red-500 dark:text-red-400 mb-1">Laravel,</span>
+                            <div class="text-6xl font-bold text-indigo-500 dark:text-indigo-400 mb-1">
+                                Inertia.js,
+                            </div>
+                            <div class="text-6xl text-green-500 dark:text-green-400 text-emerald font-bold mb-4">
+                                & PrimeVue
+                            </div>
+                            <p class="mt-0 mb-4 text-muted-color leading-normal">
+                                A starter kit using
                                 <Button
-                                    outlined
-                                    label="Profile Settings"
-                                    class="mr-4"
-                                >
-                                    <template #icon>
-                                        <Settings />
-                                    </template>
-                                </Button>
-                            </InertiaLink>
-                        </template>
-                        <template v-else>
-                            <InertiaLink :href="route('login')">
+                                    class="p-0 no-underline"
+                                    variant="link"
+                                    as="a"
+                                    label="Laravel"
+                                    href="https://laravel.com/docs/master"
+                                    target="_blank"
+                                    rel="noopener"
+                                />,
                                 <Button
-                                    label="Login"
-                                    class="mr-4"
-                                >
-                                    <template #icon>
-                                        <LogIn />
-                                    </template>
-                                </Button>
-                            </InertiaLink>
-                            <InertiaLink :href="route('register')">
+                                    class="p-0 no-underline"
+                                    variant="link"
+                                    as="a"
+                                    label="Inertia.js"
+                                    href="https://inertiajs.com/"
+                                    target="_blank"
+                                    rel="noopener"
+                                />, and
                                 <Button
-                                    outlined
-                                    label="Register"
-                                    class="mr-4"
-                                >
-                                    <template #icon>
-                                        <UserPlus />
-                                    </template>
-                                </Button>
-                            </InertiaLink>
-                        </template>
-                        <div class="mt-6">
-                            <p class="m-0 text-sm text-muted-color">
-                                Laravel v{{ laravelVersion }} (PHP v{{
-                                    phpVersion
-                                }})
+                                    class="p-0 no-underline"
+                                    variant="link"
+                                    as="a"
+                                    label="PrimeVue"
+                                    href="https://primevue.org/"
+                                    target="_blank"
+                                    rel="noopener"
+                                />.
                             </p>
+                            <template v-if="page.props.auth.user">
+                                <InertiaLink :href="route('dashboard')">
+                                    <Button
+                                        label="Dashboard"
+                                        class="mr-4"
+                                    >
+                                        <template #icon>
+                                            <LayoutGrid />
+                                        </template>
+                                    </Button>
+                                </InertiaLink>
+                                <InertiaLink :href="route('profile.edit')">
+                                    <Button
+                                        outlined
+                                        label="Profile Settings"
+                                        class="mr-4"
+                                    >
+                                        <template #icon>
+                                            <Settings />
+                                        </template>
+                                    </Button>
+                                </InertiaLink>
+                            </template>
+                            <template v-else>
+                                <InertiaLink :href="route('login')">
+                                    <Button
+                                        label="Login"
+                                        class="mr-4"
+                                    >
+                                        <template #icon>
+                                            <LogIn />
+                                        </template>
+                                    </Button>
+                                </InertiaLink>
+                                <InertiaLink :href="route('register')">
+                                    <Button
+                                        outlined
+                                        label="Register"
+                                        class="mr-4"
+                                    >
+                                        <template #icon>
+                                            <UserPlus />
+                                        </template>
+                                    </Button>
+                                </InertiaLink>
+                            </template>
+                            <div class="mt-6">
+                                <p class="m-0 text-sm text-muted-color">
+                                    Laravel v{{ laravelVersion }} (PHP v{{
+                                        phpVersion
+                                    }})
+                                </p>
+                            </div>
                         </div>
-                    </div>
-                </template>
-            </Card>
+                    </template>
+                </Card>
+            </div>
         </div>
-    </div>
+    </Container>
 </template>
diff --git a/resources/js/pages/auth/ConfirmPassword.vue b/resources/js/pages/auth/ConfirmPassword.vue
index 76c661c7..5e239410 100644
--- a/resources/js/pages/auth/ConfirmPassword.vue
+++ b/resources/js/pages/auth/ConfirmPassword.vue
@@ -19,19 +19,20 @@ const submit = () => {
     <GuestAuthLayout>
         <InertiaHead title="Confirm password" />
 
-        <form @submit.prevent="submit">
-            <div class="space-y-6">
-                <PageTitleSection class="text-center">
-                    <template #title>
-                        Confirm your password
-                    </template>
-                    <template #subTitle>
-                        <div class="text-sm">
-                            This is a secure area of the application. Please confirm your password before continuing.
-                        </div>
-                    </template>
-                </PageTitleSection>
+        <template #title>
+            <div class="text-center">
+                Confirm your password
+            </div>
+        </template>
 
+        <template #subtitle>
+            <div class="text-center">
+                This is a secure area of the application. Please confirm your password before continuing.
+            </div>
+        </template>
+
+        <form @submit.prevent="submit">
+            <div class="space-y-6 sm:space-y-8">
                 <div class="flex flex-col gap-2">
                     <label for="password">Password</label>
                     <Password
@@ -58,7 +59,7 @@ const submit = () => {
                     <Button
                         :loading="form.processing"
                         type="submit"
-                        label="Confirm Password"
+                        label="Confirm password"
                     />
                 </div>
             </div>
diff --git a/resources/js/pages/auth/ForgotPassword.vue b/resources/js/pages/auth/ForgotPassword.vue
index 94118483..c482c11c 100644
--- a/resources/js/pages/auth/ForgotPassword.vue
+++ b/resources/js/pages/auth/ForgotPassword.vue
@@ -41,18 +41,24 @@ onMounted(() => {
             </Message>
         </template>
 
-        <div class="mb-6 text-sm text-muted-color">
-            Forgot your password? No problem. Just let us know your email
-            address and we will email you a password reset link that will allow
-            you to choose a new one.
-        </div>
+        <template #title>
+            <div class="text-center">
+                Forgot password
+            </div>
+        </template>
+
+        <template #subtitle>
+            <div class="text-center">
+                Enter your email address to receive a password reset link
+            </div>
+        </template>
 
         <form
-            class="space-y-6"
+            class="space-y-6 sm:space-y-8"
             @submit.prevent="submit"
         >
             <div class="flex flex-col gap-2">
-                <label for="email">Email</label>
+                <label for="email">Email address</label>
                 <InputText
                     id="email"
                     ref="email-input"
@@ -73,13 +79,25 @@ onMounted(() => {
                 </Message>
             </div>
 
-            <div class="flex justify-end items-center">
+            <div>
                 <Button
                     :loading="forgotPasswordForm.processing"
                     type="submit"
-                    label="Email Password Reset Link"
+                    label="Email password reset link"
+                    fluid
                 />
             </div>
+
+            <div class="text-center">
+                <span class="text-muted-color mr-1">Or, return to</span>
+                <InertiaLink :href="route('login')">
+                    <Button
+                        class="p-0"
+                        variant="link"
+                        label="log in"
+                    />
+                </InertiaLink>
+            </div>
         </form>
     </GuestAuthLayout>
 </template>
diff --git a/resources/js/pages/auth/Login.vue b/resources/js/pages/auth/Login.vue
index 176db7ae..7e6c67ee 100644
--- a/resources/js/pages/auth/Login.vue
+++ b/resources/js/pages/auth/Login.vue
@@ -48,12 +48,24 @@ onMounted(() => {
             </Message>
         </template>
 
+        <template #title>
+            <div class="text-center">
+                Log in to your account
+            </div>
+        </template>
+
+        <template #subtitle>
+            <div class="text-center">
+                Enter your email and password below to log in
+            </div>
+        </template>
+
         <form
-            class="space-y-6"
+            class="space-y-6 sm:space-y-8"
             @submit.prevent="submit"
         >
             <div class="flex flex-col gap-2">
-                <label for="email">Email</label>
+                <label for="email">Email address</label>
                 <InputText
                     id="email"
                     ref="email-input"
@@ -75,7 +87,19 @@ onMounted(() => {
             </div>
 
             <div class="flex flex-col gap-2">
-                <label for="password">Password</label>
+                <div class="flex items-center justify-between">
+                    <label for="password">Password</label>
+                    <InertiaLink
+                        v-if="canResetPassword"
+                        :href="route('password.request')"
+                    >
+                        <Button
+                            class="p-0"
+                            variant="link"
+                            label="Forgot your password?"
+                        />
+                    </InertiaLink>
+                </div>
                 <Password
                     v-model="loginForm.password"
                     :invalid="Boolean(loginForm.errors?.password)"
@@ -110,22 +134,27 @@ onMounted(() => {
                 </div>
             </div>
 
-            <div class="flex justify-end items-center gap-4 pt-2">
+            <div>
+                <Button
+                    :loading="loginForm.processing"
+                    type="submit"
+                    label="Log in"
+                    fluid
+                />
+            </div>
+
+            <div class="text-center">
+                <span class="text-muted-color mr-1">Don't have an account?</span>
                 <InertiaLink
                     v-if="canResetPassword"
-                    :href="route('password.request')"
+                    :href="route('register')"
                 >
                     <Button
                         class="p-0"
                         variant="link"
-                        label="Forgot your password?"
+                        label="Sign up"
                     />
                 </InertiaLink>
-                <Button
-                    :loading="loginForm.processing"
-                    type="submit"
-                    label="Log In"
-                />
             </div>
         </form>
     </GuestAuthLayout>
diff --git a/resources/js/pages/auth/Register.vue b/resources/js/pages/auth/Register.vue
index ee72eb1a..ad722575 100644
--- a/resources/js/pages/auth/Register.vue
+++ b/resources/js/pages/auth/Register.vue
@@ -27,8 +27,20 @@ onMounted(() => {
     <GuestAuthLayout>
         <InertiaHead title="Register" />
 
+        <template #title>
+            <div class="text-center">
+                Create an account
+            </div>
+        </template>
+
+        <template #subtitle>
+            <div class="text-center">
+                Enter your details below to create your account
+            </div>
+        </template>
+
         <form
-            class="space-y-6"
+            class="space-y-6 sm:space-y-8"
             @submit.prevent="submit"
         >
             <div class="flex flex-col gap-2">
@@ -54,7 +66,7 @@ onMounted(() => {
             </div>
 
             <div class="flex flex-col gap-2">
-                <label for="email">Email</label>
+                <label for="email">Email address</label>
                 <InputText
                     id="email"
                     v-model="registerForm.email"
@@ -117,19 +129,24 @@ onMounted(() => {
                 </Message>
             </div>
 
-            <div class="flex justify-end items-center gap-4 pt-2">
+            <div>
+                <Button
+                    type="submit"
+                    :loading="registerForm.processing"
+                    label="Create account"
+                    fluid
+                />
+            </div>
+
+            <div class="text-center">
+                <span class="text-muted-color mr-1">Already have an account?</span>
                 <InertiaLink :href="route('login')">
                     <Button
                         class="p-0"
                         variant="link"
-                        label="Already registered?"
+                        label="Log in"
                     />
                 </InertiaLink>
-                <Button
-                    type="submit"
-                    :loading="registerForm.processing"
-                    label="Register"
-                />
             </div>
         </form>
     </GuestAuthLayout>
diff --git a/resources/js/pages/auth/ResetPassword.vue b/resources/js/pages/auth/ResetPassword.vue
index 5cd5b583..864597db 100644
--- a/resources/js/pages/auth/ResetPassword.vue
+++ b/resources/js/pages/auth/ResetPassword.vue
@@ -38,12 +38,24 @@ onMounted(() => {
     <GuestAuthLayout>
         <InertiaHead title="Reset Password" />
 
+        <template #title>
+            <div class="text-center">
+                Reset password
+            </div>
+        </template>
+
+        <template #subtitle>
+            <div class="text-center">
+                Please enter your new password below
+            </div>
+        </template>
+
         <form
-            class="space-y-6"
+            class="space-y-6 sm:space-y-8"
             @submit.prevent="submit"
         >
             <div class="flex flex-col gap-2">
-                <label for="email">Email</label>
+                <label for="email">Email address</label>
                 <InputText
                     id="email"
                     ref="email-input"
@@ -107,11 +119,12 @@ onMounted(() => {
                 </Message>
             </div>
 
-            <div class="flex justify-end items-center pt-2">
+            <div>
                 <Button
                     :loading="resetPwForm.processing"
                     type="submit"
-                    label="Reset Password"
+                    label="Reset password"
+                    fluid
                 />
             </div>
         </form>
diff --git a/resources/js/pages/auth/VerifyEmail.vue b/resources/js/pages/auth/VerifyEmail.vue
index 9b47c700..76977f52 100644
--- a/resources/js/pages/auth/VerifyEmail.vue
+++ b/resources/js/pages/auth/VerifyEmail.vue
@@ -27,6 +27,18 @@ const verificationLinkSent = computed(
     <GuestAuthLayout>
         <InertiaHead title="Email Verification" />
 
+        <template #title>
+            <div class="text-center">
+                Verify email
+            </div>
+        </template>
+
+        <template #subtitle>
+            <div class="text-center">
+                Please verify your email address by clicking on the link we just emailed to you.
+            </div>
+        </template>
+
         <template
             v-if="verificationLinkSent"
             #message
@@ -41,26 +53,24 @@ const verificationLinkSent = computed(
             </Message>
         </template>
 
-        <div class="mb-6 text-sm text-muted-color">
-            Thanks for signing up! Before getting started, could you verify your
-            email address by clicking on the link we just emailed to you? If you
-            didn't receive the email, we will gladly send you another.
-        </div>
-
-        <div class="mt-6 flex justify-between items-center">
+        <div class="space-y-6 sm:space-y-8">
             <form @submit.prevent="submit">
                 <Button
                     :loading="sendVerificationForm.processing"
                     type="submit"
-                    label="Resend Verification Email"
+                    label="Resend verification email"
+                    fluid
                 />
             </form>
-            <Button
-                :loading="logoutForm.processing"
-                variant="link"
-                label="Log Out"
-                @click="logout"
-            />
+            <div class="text-center">
+                <Button
+                    :loading="logoutForm.processing"
+                    class="p-0"
+                    variant="link"
+                    label="Log out"
+                    @click="logout"
+                />
+            </div>
         </div>
     </GuestAuthLayout>
 </template>
diff --git a/resources/js/pages/settings/Password.vue b/resources/js/pages/settings/Password.vue
index 59b6bfd6..3f572d6a 100644
--- a/resources/js/pages/settings/Password.vue
+++ b/resources/js/pages/settings/Password.vue
@@ -124,7 +124,7 @@ const updatePassword = () => {
                             </Message>
                         </div>
                         <div class="flex flex-col gap-2">
-                            <label for="password-confirmation">Confirm Password</label>
+                            <label for="password-confirmation">Confirm New Password</label>
                             <Password
                                 v-model="updatePasswordForm.password_confirmation"
                                 :invalid="Boolean(updatePasswordForm.errors?.password_confirmation)"
@@ -147,7 +147,7 @@ const updatePassword = () => {
                         <Button
                             :loading="updatePasswordForm.processing"
                             type="submit"
-                            label="Save"
+                            label="Save password"
                         />
                     </form>
                 </template>
diff --git a/resources/js/pages/settings/Profile.vue b/resources/js/pages/settings/Profile.vue
index 57552fb7..f43dc715 100644
--- a/resources/js/pages/settings/Profile.vue
+++ b/resources/js/pages/settings/Profile.vue
@@ -89,7 +89,7 @@ const updateProfileInformation = () => {
                                 </Message>
                             </div>
                             <div class="flex flex-col gap-2">
-                                <label for="email">Email</label>
+                                <label for="email">Email address</label>
                                 <InputText
                                     id="email"
                                     v-model="updateProfileForm.email"
@@ -118,15 +118,15 @@ const updateProfileInformation = () => {
                                         label="Click here to re-send the verification email."
                                         @click="sendEmailVerification"
                                     />
+                                    <Message
+                                        v-if="status === 'verification-link-sent'"
+                                        severity="success"
+                                        :closable="false"
+                                        class="shadow-sm mt-4"
+                                    >
+                                        A new verification link has been sent to your email address.
+                                    </Message>
                                 </p>
-                                <Message
-                                    v-if="status === 'verification-link-sent'"
-                                    severity="success"
-                                    :closable="false"
-                                    class="shadow-sm mt-4"
-                                >
-                                    A new verification link has been sent to your email address.
-                                </Message>
                             </div>
                             <Button
                                 :loading="updateProfileForm.processing"
@@ -163,7 +163,7 @@ const updateProfileInformation = () => {
                                 </div>
                                 <div>
                                     <Button
-                                        label="Delete Account"
+                                        label="Delete account"
                                         severity="danger"
                                         @click="deleteUserModalOpen = true"
                                     />
diff --git a/tests/Feature/Auth/EmailVerificationTest.php b/tests/Feature/Auth/EmailVerificationTest.php
index caf94a47..da066799 100644
--- a/tests/Feature/Auth/EmailVerificationTest.php
+++ b/tests/Feature/Auth/EmailVerificationTest.php
@@ -4,9 +4,11 @@
 
 use App\Models\User;
 use Illuminate\Auth\Events\Verified;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\URL;
+use ReflectionClass;
 use Tests\TestCase;
 
 class EmailVerificationTest extends TestCase
@@ -25,8 +27,9 @@ public function test_email_verification_screen_can_be_rendered(): void
     public function test_email_can_be_verified(): void
     {
         $user = User::factory()->unverified()->create();
-        if (!($user instanceof MustVerifyEmail)) {
-            $this->markTestSkipped('Email verification is not enabled, skipping test.');
+        $userRef = new ReflectionClass(User::class);
+        if (!$userRef->implementsInterface(MustVerifyEmail::class)) {
+            $this->markTestSkipped('User email verification is not enabled, skipping test.');
         }
 
         Event::fake();
diff --git a/tests/Feature/Auth/PasswordConfirmationTest.php b/tests/Feature/Auth/PasswordConfirmationTest.php
index d2072ffd..ff85721e 100644
--- a/tests/Feature/Auth/PasswordConfirmationTest.php
+++ b/tests/Feature/Auth/PasswordConfirmationTest.php
@@ -10,7 +10,7 @@ class PasswordConfirmationTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_confirm_password_screen_can_be_rendered()
+    public function test_confirm_password_screen_can_be_rendered(): void
     {
         $user = User::factory()->create();
 
@@ -19,7 +19,7 @@ public function test_confirm_password_screen_can_be_rendered()
         $response->assertStatus(200);
     }
 
-    public function test_password_can_be_confirmed()
+    public function test_password_can_be_confirmed(): void
     {
         $user = User::factory()->create();
 
@@ -31,7 +31,7 @@ public function test_password_can_be_confirmed()
         $response->assertSessionHasNoErrors();
     }
 
-    public function test_password_is_not_confirmed_with_invalid_password()
+    public function test_password_is_not_confirmed_with_invalid_password(): void
     {
         $user = User::factory()->create();