diff --git a/app/home/(user)/(dashboard)/analysis-results/[id]/page.tsx b/app/home/(user)/(dashboard)/analysis-results/[id]/page.tsx
index 7422d32..c69d0b6 100644
--- a/app/home/(user)/(dashboard)/analysis-results/[id]/page.tsx
+++ b/app/home/(user)/(dashboard)/analysis-results/[id]/page.tsx
@@ -1,4 +1,5 @@
 import Link from 'next/link';
+import { redirect } from 'next/navigation';
 
 import { ButtonTooltip } from '@kit/shared/components/ui/button-tooltip';
 import { pathsConfig } from '@kit/shared/config';
@@ -30,7 +31,7 @@ export default async function AnalysisResultsPage({
   ]);
 
   if (!account?.id) {
-    return null;
+    return redirect("/");
   }
 
   await createPageViewLog({
@@ -39,7 +40,16 @@ export default async function AnalysisResultsPage({
   });
 
   if (!analysisResponse) {
-    return null;
+    return (
+      <>
+        <PageHeader
+          title={<Trans i18nKey="analysis-results:pageTitle" />}
+          description={<Trans i18nKey="analysis-results:descriptionEmpty" />}
+        />
+        <PageBody className="gap-4">
+        </PageBody>
+      </>
+    );
   }
 
   return (
diff --git a/app/home/(user)/_components/cart/index.tsx b/app/home/(user)/_components/cart/index.tsx
index 4ab083e..afd4639 100644
--- a/app/home/(user)/_components/cart/index.tsx
+++ b/app/home/(user)/_components/cart/index.tsx
@@ -81,7 +81,7 @@ export default function Cart({
           <div className="flex justify-end gap-x-4 px-6 pt-4">
             <div className="mr-[36px]">
               <p className="ml-0 font-bold text-sm text-muted-foreground">
-                <Trans i18nKey="cart:subtotal" />
+                <Trans i18nKey="cart:order.subtotal" />
               </p>
             </div>
             <div className="mr-[116px]">
@@ -97,7 +97,7 @@ export default function Cart({
           <div className="flex justify-end gap-x-4 px-6 py-2">
             <div className="mr-[36px]">
               <p className="ml-0 font-bold text-sm text-muted-foreground">
-                <Trans i18nKey="cart:promotionsTotal" />
+                <Trans i18nKey="cart:order.promotionsTotal" />
               </p>
             </div>
             <div className="mr-[116px]">
@@ -113,7 +113,7 @@ export default function Cart({
           <div className="flex justify-end gap-x-4 px-6">
             <div className="mr-[36px]">
               <p className="ml-0 font-bold text-sm">
-                <Trans i18nKey="cart:total" />
+                <Trans i18nKey="cart:order.total" />
               </p>
             </div>
             <div className="mr-[116px]">
diff --git a/app/home/(user)/_components/order-analyses-cards.tsx b/app/home/(user)/_components/order-analyses-cards.tsx
index 2e1064d..bd7f8a7 100644
--- a/app/home/(user)/_components/order-analyses-cards.tsx
+++ b/app/home/(user)/_components/order-analyses-cards.tsx
@@ -57,7 +57,7 @@ export default function OrderAnalysesCards({
   }
 
   return (
-    <div className="grid 2xs:grid-cols-3 gap-6 mt-4">
+    <div className="grid xs:grid-cols-3 gap-6 mt-4">
       {analyses.map(({
         title,
         variant,
diff --git a/app/home/(user)/_components/order/cart-totals.tsx b/app/home/(user)/_components/order/cart-totals.tsx
index 2df2237..fb7b030 100644
--- a/app/home/(user)/_components/order/cart-totals.tsx
+++ b/app/home/(user)/_components/order/cart-totals.tsx
@@ -24,7 +24,7 @@ export default function CartTotals({ medusaOrder }: {
       <div className="flex flex-col gap-y-2 txt-medium text-ui-fg-subtle ">
         <div className="flex items-center justify-between">
           <span className="flex gap-x-1 items-center">
-            <Trans i18nKey="cart:orderConfirmed.subtotal" />
+            <Trans i18nKey="cart:order.subtotal" />
           </span>
           <span data-testid="cart-subtotal" data-value={subtotal || 0}>
             {formatCurrency({ value: subtotal ?? 0, currencyCode: currency_code, locale: language })}
@@ -32,7 +32,7 @@ export default function CartTotals({ medusaOrder }: {
         </div>
         {!!discount_total && (
           <div className="flex items-center justify-between">
-            <span><Trans i18nKey="cart:orderConfirmed.discount" /></span>
+            <span><Trans i18nKey="cart:order.promotionsTotal" /></span>
             <span
               className="text-ui-fg-interactive"
               data-testid="cart-discount"
@@ -43,17 +43,17 @@ export default function CartTotals({ medusaOrder }: {
             </span>
           </div>
         )}
-        <div className="flex justify-between">
+        {/* <div className="flex justify-between">
           <span className="flex gap-x-1 items-center ">
             <Trans i18nKey="cart:orderConfirmed.taxes" />
           </span>
           <span data-testid="cart-taxes" data-value={tax_total || 0}>
             {formatCurrency({ value: tax_total ?? 0, currencyCode: currency_code, locale: language })}
           </span>
-        </div>
+        </div> */}
         {!!gift_card_total && (
           <div className="flex items-center justify-between">
-            <span><Trans i18nKey="cart:orderConfirmed.giftCard" /></span>
+            <span><Trans i18nKey="cart:order.giftCard" /></span>
             <span
               className="text-ui-fg-interactive"
               data-testid="cart-gift-card-amount"
@@ -67,7 +67,7 @@ export default function CartTotals({ medusaOrder }: {
       </div>
       <div className="h-px w-full border-b border-gray-200 my-4" />
       <div className="flex items-center justify-between text-ui-fg-base mb-2 txt-medium ">
-        <span className="font-bold"><Trans i18nKey="cart:orderConfirmed.total" /></span>
+        <span className="font-bold"><Trans i18nKey="cart:order.total" /></span>
         <span
           className="txt-xlarge-plus"
           data-testid="cart-total"
diff --git a/app/home/(user)/_components/order/order-details.tsx b/app/home/(user)/_components/order/order-details.tsx
index b750c85..1188566 100644
--- a/app/home/(user)/_components/order/order-details.tsx
+++ b/app/home/(user)/_components/order/order-details.tsx
@@ -7,15 +7,23 @@ export default function OrderDetails({ order }: {
 }) {
   return (
     <div className="flex flex-col gap-y-2">
-      <span>
-        <Trans i18nKey="cart:orderConfirmed.orderDate" />:{" "}
+      <div>
+        <span className="font-bold">
+          <Trans i18nKey="cart:orderConfirmed.orderNumber" />:{" "}
+        </span>
+        <span>
+          {order.medusa_order_id}
+        </span>
+      </div>
+
+      <div>
+        <span className="font-bold">
+          <Trans i18nKey="cart:orderConfirmed.orderDate" />:{" "}
+        </span>
         <span>
           {formatDate(order.created_at, 'dd.MM.yyyy HH:mm')}
         </span>
-      </span>
-      <span className="text-ui-fg-interactive">
-        <Trans i18nKey="cart:orderConfirmed.orderNumber" />: <span data-testid="order-id">{order.medusa_order_id}</span>
-      </span>
+      </div>
     </div>
   )
 }
diff --git a/packages/features/auth/src/server/api.ts b/packages/features/auth/src/server/api.ts
index 223e82c..8462006 100644
--- a/packages/features/auth/src/server/api.ts
+++ b/packages/features/auth/src/server/api.ts
@@ -9,8 +9,8 @@ export interface AccountSubmitData {
   email: string;
   phone?: string;
   city?: string;
-  weight: number | null;
-  height: number | null;
+  weight?: number | null | undefined;
+  height?: number | null | undefined;
   userConsent: boolean;
 }
 
diff --git a/packages/ui/src/makerkit/page.tsx b/packages/ui/src/makerkit/page.tsx
index 7a4ee42..6ca7573 100644
--- a/packages/ui/src/makerkit/page.tsx
+++ b/packages/ui/src/makerkit/page.tsx
@@ -119,8 +119,8 @@ export function PageNavigation(props: React.PropsWithChildren) {
 
 export function PageDescription(props: React.PropsWithChildren) {
   return (
-    <div className={'flex h-6 items-center'}>
-      <div className={'text-muted-foreground text-sm leading-none font-normal'}>
+    <div className={'flex items-center'}>
+      <div className={'text-muted-foreground text-sm font-normal leading-6'}>
         {props.children}
       </div>
     </div>
@@ -168,7 +168,7 @@ export function PageHeader({
         </If>
 
         <If condition={displaySidebarTrigger || description}>
-          <div className="flex items-center gap-x-2.5">
+          <div className="flex items-center gap-3">
             {displaySidebarTrigger ? (
               <SidebarTrigger className="text-muted-foreground hover:text-secondary-foreground hidden h-4.5 w-4.5 cursor-pointer lg:inline-flex" />
             ) : null}
diff --git a/public/locales/en/cart.json b/public/locales/en/cart.json
index a78a8cb..223d3f1 100644
--- a/public/locales/en/cart.json
+++ b/public/locales/en/cart.json
@@ -3,9 +3,6 @@
   "description": "View your cart",
   "emptyCartMessage": "Your cart is empty",
   "emptyCartMessageDescription": "Add items to your cart to continue.",
-  "subtotal": "Subtotal",
-  "total": "Total",
-  "promotionsTotal": "Promotions total",
   "table": {
     "item": "Item",
     "quantity": "Quantity",
@@ -58,7 +55,11 @@
     }
   },
   "order": {
-    "title": "Order"
+    "title": "Order",
+    "promotionsTotal": "Promotions total",
+    "subtotal": "Subtotal",
+    "total": "Total",
+    "giftCard": "Gift card"
   },
   "orderConfirmed": {
     "title": "Order confirmed",
diff --git a/public/locales/et/cart.json b/public/locales/et/cart.json
index e5e7376..36b69d0 100644
--- a/public/locales/et/cart.json
+++ b/public/locales/et/cart.json
@@ -3,9 +3,6 @@
   "description": "Vaata oma ostukorvi",
   "emptyCartMessage": "Sinu ostukorv on tühi",
   "emptyCartMessageDescription": "Lisa tooteid ostukorvi, et jätkata.",
-  "subtotal": "Vahesumma",
-  "total": "Summa",
-  "promotionsTotal": "Soodustuse summa",
   "table": {
     "item": "Toode",
     "quantity": "Kogus",
@@ -58,7 +55,11 @@
     }
   },
   "order": {
-    "title": "Tellimus"
+    "title": "Tellimus",
+    "promotionsTotal": "Soodustuse summa",
+    "subtotal": "Vahesumma",
+    "total": "Summa",
+    "giftCard": "Kinkekaart"
   },
   "orderConfirmed": {
     "title": "Tellimus on edukalt esitatud",
diff --git a/public/locales/ru/cart.json b/public/locales/ru/cart.json
index bac0c63..289ff31 100644
--- a/public/locales/ru/cart.json
+++ b/public/locales/ru/cart.json
@@ -3,9 +3,6 @@
   "description": "Просмотрите свою корзину",
   "emptyCartMessage": "Ваша корзина пуста",
   "emptyCartMessageDescription": "Добавьте товары в корзину, чтобы продолжить.",
-  "subtotal": "Промежуточный итог",
-  "total": "Сумма",
-  "promotionsTotal": "Скидка",
   "table": {
     "item": "Товар",
     "quantity": "Количество",
@@ -58,7 +55,11 @@
     }
   },
   "order": {
-    "title": "Заказ"
+    "title": "Заказ",
+    "promotionsTotal": "Скидка",
+    "subtotal": "Промежуточный итог",
+    "total": "Сумма",
+    "giftCard": "Подарочная карта"
   },
   "orderConfirmed": {
     "title": "Заказ успешно оформлен",