diff --git a/app/home/(user)/(dashboard)/booking/page.tsx b/app/home/(user)/(dashboard)/booking/page.tsx
index 680edfb..94e2b2f 100644
--- a/app/home/(user)/(dashboard)/booking/page.tsx
+++ b/app/home/(user)/(dashboard)/booking/page.tsx
@@ -28,9 +28,13 @@ function BookingPage() {
     return (
       <>
         <AppBreadcrumbs />
-        <h3 className="mt-8">
+        <HomeLayoutPageHeader
+          title={<Trans i18nKey={'booking:title'} />}
+          description={<Trans i18nKey={'booking:description'} />}
+        />
+        <h4 className="mt-8">
           <Trans i18nKey="booking:noCategories" />
-        </h3>
+        </h4>
       </>
     );
   }
diff --git a/app/home/(user)/(dashboard)/order-health-analysis/page.tsx b/app/home/(user)/(dashboard)/order-health-analysis/page.tsx
index a4a4478..432ca39 100644
--- a/app/home/(user)/(dashboard)/order-health-analysis/page.tsx
+++ b/app/home/(user)/(dashboard)/order-health-analysis/page.tsx
@@ -21,6 +21,9 @@ async function OrderHealthAnalysisPage() {
         description={<Trans i18nKey={'order-health-analysis:description'} />}
       />
       <PageBody>
+        <h4 className="mt-8">
+          <Trans i18nKey="booking:noCategories" />
+        </h4>
       </PageBody>
     </>
   );
diff --git a/app/home/(user)/(dashboard)/order/page.tsx b/app/home/(user)/(dashboard)/order/page.tsx
index 5bb1ae7..48faae3 100644
--- a/app/home/(user)/(dashboard)/order/page.tsx
+++ b/app/home/(user)/(dashboard)/order/page.tsx
@@ -61,6 +61,11 @@ async function OrdersPage() {
             </React.Fragment>
           )
         })}
+        {analysisOrders.length === 0 && (
+          <h5 className="mt-6">
+            <Trans i18nKey="orders:noOrders" />
+          </h5>
+        )}
       </PageBody>
     </>
   );
diff --git a/app/home/(user)/_components/dashboard-cards.tsx b/app/home/(user)/_components/dashboard-cards.tsx
index a39e470..3127331 100644
--- a/app/home/(user)/_components/dashboard-cards.tsx
+++ b/app/home/(user)/_components/dashboard-cards.tsx
@@ -8,7 +8,7 @@ import { Trans } from '@kit/ui/trans';
 
 export default function DashboardCards() {
   return (
-    <div className="flex gap-4 lg:px-4">
+    <div className="flex gap-4">
       <Card
         variant="gradient-success"
         className="xs:w-1/2 sm:w-auto flex w-full flex-col justify-between"
diff --git a/packages/features/accounts/src/components/personal-account-settings/mfa/multi-factor-auth-setup-dialog.tsx b/packages/features/accounts/src/components/personal-account-settings/mfa/multi-factor-auth-setup-dialog.tsx
index 6c302ff..56ef8d7 100644
--- a/packages/features/accounts/src/components/personal-account-settings/mfa/multi-factor-auth-setup-dialog.tsx
+++ b/packages/features/accounts/src/components/personal-account-settings/mfa/multi-factor-auth-setup-dialog.tsx
@@ -331,7 +331,7 @@ function FactorQrCode({
   return (
     <div
       className={
-        'dark:bg-secondary flex flex-col space-y-4 rounded-lg border p-4'
+        'dark:bg-secondary flex flex-col space-y-2 rounded-lg border p-4'
       }
     >
       <p>
diff --git a/packages/supabase/src/hooks/use-user.ts b/packages/supabase/src/hooks/use-user.ts
index 0986775..9a9cdd9 100644
--- a/packages/supabase/src/hooks/use-user.ts
+++ b/packages/supabase/src/hooks/use-user.ts
@@ -28,8 +28,8 @@ export function useUser(initialData?: User | null) {
     queryFn,
     queryKey,
     initialData,
-    refetchInterval: false,
-    refetchOnMount: false,
-    refetchOnWindowFocus: false,
+    refetchInterval: 2_000,
+    refetchOnMount: true,
+    refetchOnWindowFocus: true,
   });
 }
diff --git a/packages/ui/src/makerkit/app-breadcrumbs.tsx b/packages/ui/src/makerkit/app-breadcrumbs.tsx
index 31296b2..dc38b90 100644
--- a/packages/ui/src/makerkit/app-breadcrumbs.tsx
+++ b/packages/ui/src/makerkit/app-breadcrumbs.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { Fragment } from 'react';
+import clsx from 'clsx';
 
 import { usePathname } from 'next/navigation';
 
@@ -52,9 +53,13 @@ export function AppBreadcrumbs(props: {
               />
             );
 
+          const isLast = index === visiblePaths.length - 1;
+
           return (
             <Fragment key={index}>
-              <BreadcrumbItem className={'capitalize lg:text-xs'}>
+              <BreadcrumbItem className={clsx('lg:text-xs', {
+                'font-bold text-black': isLast,
+              })}>
                 <If
                   condition={index < visiblePaths.length - 1}
                   fallback={label}
@@ -64,6 +69,7 @@ export function AppBreadcrumbs(props: {
                       '/' +
                       splitPath.slice(0, splitPath.indexOf(path) + 1).join('/')
                     }
+                    className='text-muted-foreground'
                   >
                     {label}
                   </BreadcrumbLink>
@@ -77,7 +83,7 @@ export function AppBreadcrumbs(props: {
                 </>
               )}
 
-              <If condition={index !== visiblePaths.length - 1}>
+              <If condition={!isLast}>
                 <BreadcrumbSeparator />
               </If>
             </Fragment>
diff --git a/packages/ui/src/makerkit/page.tsx b/packages/ui/src/makerkit/page.tsx
index b4ee923..aaf48ad 100644
--- a/packages/ui/src/makerkit/page.tsx
+++ b/packages/ui/src/makerkit/page.tsx
@@ -106,7 +106,7 @@ export function PageBody(
   }>,
 ) {
   const className = cn(
-    'flex w-full flex-1 flex-col space-y-6 lg:px-4',
+    'flex w-full flex-1 flex-col space-y-6',
     props.className,
   );
 
@@ -158,7 +158,7 @@ export function PageHeader({
   return (
     <div
       className={cn(
-        'flex items-center justify-between py-5 lg:px-4',
+        'flex items-center justify-between py-5',
         className,
       )}
     >
diff --git a/public/locales/en/orders.json b/public/locales/en/orders.json
index f846b0a..7aa958c 100644
--- a/public/locales/en/orders.json
+++ b/public/locales/en/orders.json
@@ -1,6 +1,7 @@
 {
   "title": "Orders",
   "description": "View your orders",
+  "noOrders": "No orders found",
   "table": {
     "analysisPackage": "Analysis package",
     "otherOrders": "Order",
diff --git a/public/locales/et/orders.json b/public/locales/et/orders.json
index 4811a2e..822c6b1 100644
--- a/public/locales/et/orders.json
+++ b/public/locales/et/orders.json
@@ -1,6 +1,7 @@
 {
   "title": "Tellimused",
   "description": "Vaata oma tellimusi",
+  "noOrders": "Tellimusi ei leitud",
   "table": {
     "analysisPackage": "Analüüsi pakett",
     "otherOrders": "Tellimus",
diff --git a/public/locales/ru/orders.json b/public/locales/ru/orders.json
index c42a230..6669aff 100644
--- a/public/locales/ru/orders.json
+++ b/public/locales/ru/orders.json
@@ -1,6 +1,7 @@
 {
   "title": "Заказы",
   "description": "Просмотрите ваши заказы",
+  "noOrders": "Заказы не найдены",
   "table": {
     "analysisPackage": "Пакет анализов",
     "otherOrders": "Заказ",