diff --git a/app/home/(user)/(dashboard)/booking/[handle]/page.tsx b/app/home/(user)/(dashboard)/booking/[handle]/page.tsx
index 9036447..ebce187 100644
--- a/app/home/(user)/(dashboard)/booking/[handle]/page.tsx
+++ b/app/home/(user)/(dashboard)/booking/[handle]/page.tsx
@@ -1,13 +1,13 @@
-import { use } from 'react';
+import { HomeLayoutPageHeader } from '@/app/home/(user)/_components/home-page-header';
+import { loadCategory } from '@/app/home/(user)/_lib/server/load-category';
 
+import { AppBreadcrumbs } from '@kit/ui/makerkit/app-breadcrumbs';
 import { PageBody } from '@kit/ui/page';
 import { Trans } from '@kit/ui/trans';
 
 import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
 import { withI18n } from '~/lib/i18n/with-i18n';
 
-import { HomeLayoutPageHeader } from '../../../_components/home-page-header';
-
 export const generateMetadata = async () => {
   const i18n = await createI18nServerInstance();
   const title = i18n.t('booking:title');
@@ -17,9 +17,17 @@ export const generateMetadata = async () => {
   };
 };
 
-function BookingHandlePage() {
+async function BookingHandlePage({ params }: { params: { handle: string } }) {
+  const handle = await params.handle;
+  const { category } = await loadCategory({ handle });
+
   return (
     <>
+      <AppBreadcrumbs
+        values={{
+          [handle]: category?.name || handle,
+        }}
+      />
       <HomeLayoutPageHeader
         title={<Trans i18nKey={'booking:title'} />}
         description={<Trans i18nKey={'booking:description'} />}
diff --git a/app/home/(user)/(dashboard)/booking/page.tsx b/app/home/(user)/(dashboard)/booking/page.tsx
index 14b1c1a..680edfb 100644
--- a/app/home/(user)/(dashboard)/booking/page.tsx
+++ b/app/home/(user)/(dashboard)/booking/page.tsx
@@ -1,5 +1,6 @@
 import { use } from 'react';
 
+import { AppBreadcrumbs } from '@kit/ui/makerkit/app-breadcrumbs';
 import { PageBody } from '@kit/ui/page';
 import { Trans } from '@kit/ui/trans';
 
@@ -22,15 +23,27 @@ export const generateMetadata = async () => {
 
 function BookingPage() {
   const { heroCategories, ttoCategories } = use(loadTtoServices());
-  console.log('ttoCategories', heroCategories, ttoCategories);
+
+  if (!heroCategories.length && !ttoCategories.length) {
+    return (
+      <>
+        <AppBreadcrumbs />
+        <h3 className="mt-8">
+          <Trans i18nKey="booking:noCategories" />
+        </h3>
+      </>
+    );
+  }
+
   return (
     <>
+      <AppBreadcrumbs />
       <HomeLayoutPageHeader
         title={<Trans i18nKey={'booking:title'} />}
         description={<Trans i18nKey={'booking:description'} />}
       />
 
-      <PageBody>
+      <PageBody className="space-y-2">
         <OrderCards heroCategories={heroCategories} />
         <ServiceCategories categories={ttoCategories} />
       </PageBody>
diff --git a/app/home/(user)/_components/order-cards.tsx b/app/home/(user)/_components/order-cards.tsx
index b179d18..0c936ce 100644
--- a/app/home/(user)/_components/order-cards.tsx
+++ b/app/home/(user)/_components/order-cards.tsx
@@ -24,7 +24,7 @@ export default function OrderCards({
   heroCategories: ServiceCategory[];
 }) {
   return (
-    <div className="mt-4 grid grid-cols-3 gap-6">
+    <div className="xs:grid-cols-3 mt-4 grid grid-cols-1 gap-2">
       {heroCategories.map(({ name, description, color, handle }) => (
         <Card
           key={name}
diff --git a/app/home/(user)/_components/service-categories.tsx b/app/home/(user)/_components/service-categories.tsx
index 148f109..9ef3e25 100644
--- a/app/home/(user)/_components/service-categories.tsx
+++ b/app/home/(user)/_components/service-categories.tsx
@@ -23,7 +23,7 @@ const ServiceCategories = ({
   categories: ServiceCategory[];
 }) => {
   return (
-    <div className="grid grid-cols-1 gap-6 sm:grid-cols-2 md:grid-cols-3">
+    <div className="grid grid-cols-1 gap-2 sm:grid-cols-2 md:grid-cols-3">
       {categories.map((category, index) => (
         <Card
           key={index}
diff --git a/app/home/(user)/_lib/server/load-analyses.ts b/app/home/(user)/_lib/server/load-analyses.ts
index db22011..12eebbf 100644
--- a/app/home/(user)/_lib/server/load-analyses.ts
+++ b/app/home/(user)/_lib/server/load-analyses.ts
@@ -42,7 +42,7 @@ async function analysesLoader() {
   const serviceCategories = productCategories.filter(
     ({ parent_category }) => parent_category?.handle === 'tto-categories',
   );
-  console.log('serviceCategories', serviceCategories);
+
   return {
     analyses:
       category?.products?.map<OrderAnalysisCard>(
diff --git a/app/home/(user)/_lib/server/load-category.ts b/app/home/(user)/_lib/server/load-category.ts
new file mode 100644
index 0000000..2c0479c
--- /dev/null
+++ b/app/home/(user)/_lib/server/load-category.ts
@@ -0,0 +1,31 @@
+import { cache } from 'react';
+
+import { getProductCategories } from '@lib/data';
+
+import { ServiceCategory } from '../../_components/service-categories';
+
+async function categoryLoader({
+  handle,
+}: {
+  handle: string;
+}): Promise<{ category: ServiceCategory | null }> {
+  const response = await getProductCategories({
+    handle,
+    fields: '*products, is_active, metadata',
+  });
+
+  const category = response.product_categories[0];
+
+  return {
+    category: {
+      color:
+        typeof category?.metadata?.color === 'string'
+          ? category?.metadata?.color
+          : 'primary',
+      description: category?.description || '',
+      handle: category?.handle || '',
+      name: category?.name || '',
+    },
+  };
+}
+export const loadCategory = cache(categoryLoader);
diff --git a/app/home/(user)/_lib/server/load-tto-services.ts b/app/home/(user)/_lib/server/load-tto-services.ts
index a8b4e1b..3bbc4e5 100644
--- a/app/home/(user)/_lib/server/load-tto-services.ts
+++ b/app/home/(user)/_lib/server/load-tto-services.ts
@@ -8,7 +8,7 @@ async function ttoServicesLoader() {
   const response = await getProductCategories({
     fields: '*products, is_active, metadata',
   });
-  console.log('response.product_categories', response.product_categories);
+
   const heroCategories = response.product_categories?.filter(
     ({ parent_category, is_active, metadata }) =>
       parent_category?.handle === 'tto-categories' &&
diff --git a/public/locales/et/booking.json b/public/locales/et/booking.json
index 17554de..3410d59 100644
--- a/public/locales/et/booking.json
+++ b/public/locales/et/booking.json
@@ -1,8 +1,9 @@
 {
-    "title": "Vali teenus",
-    "description": "Vali sobiv teenus või pakett vastavalt oma tervisemurele või -eesmärgile.",
-    "analysisPackages": {
-        "title": "Analüüside paketid",
-        "description": "Tutvu personaalsete analüüsi pakettidega ja telli"
-    }
-}
\ No newline at end of file
+  "title": "Vali teenus",
+  "description": "Vali sobiv teenus või pakett vastavalt oma tervisemurele või -eesmärgile.",
+  "analysisPackages": {
+    "title": "Analüüside paketid",
+    "description": "Tutvu personaalsete analüüsi pakettidega ja telli"
+  },
+  "noCategories": "Teenuste loetelu ei leitud, proovi hiljem uuesti"
+}
diff --git a/public/locales/et/common.json b/public/locales/et/common.json
index 8239aaf..70e6ec6 100644
--- a/public/locales/et/common.json
+++ b/public/locales/et/common.json
@@ -80,7 +80,8 @@
     "dashboard": "Ülevaade",
     "settings": "Settings",
     "profile": "Profile",
-    "application": "Application"
+    "application": "Application",
+    "pickTime": "Vali aeg"
   },
   "roles": {
     "owner": {