diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 5015518..549626e 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -77,7 +77,7 @@ export default function AboutPage() {
         <HeroLogo
           logoText="Rreth Watami Tirana"
           description="Histori e pasionit për sushiin autentik dhe dedikimit në shërbimin premium në Tiranë"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy&_wi=2"
           imageAlt="Interiori i Watami Tirana"
           buttons={[
             {
@@ -93,7 +93,7 @@ export default function AboutPage() {
         <SplitAbout
           title="Hyrja në Botën e Watami"
           description="Watami Tirana lindi nga një ëndër e thjeshtë - të sjellë përvoja autentike të ngrënies japoneze në Tiranë, ku cilësia, freski dhe dedikimi janë në zemër të gjithçkaje që bëjmë."
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy&_wi=3"
           imageAlt="Chef në Watami Tirana"
           mediaAnimation="blur-reveal"
           textboxLayout="default"
diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx
index 1c466bd..3b89105 100644
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -93,7 +93,7 @@ export default function ContactPage() {
         <HeroLogo
           logoText="Kontakt & Rezervim"
           description="Rezervo tavolën tënde tani ose na kontakto për më shumë informacione - ne jemi këtu për të përgatitur përvojën më të mirë"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom&_wi=4"
           imageAlt="Kontakt"
           buttons={[
             {
@@ -110,7 +110,7 @@ export default function ContactPage() {
         <ContactSplitForm
           title="Rezervim & Pytje"
           description="Plotëso formën më poshtë për të rezervuar tavolën tënde ose për të bërë ndonjë pytje. Mund të na kontaktosh gjithashtu drejtpërdrejt nëpër telefon ose WhatsApp."
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy&_wi=5"
           imageAlt="Watami Tirana"
           mediaAnimation="blur-reveal"
           mediaPosition="right"
diff --git a/src/app/gallery/page.tsx b/src/app/gallery/page.tsx
index f1e2afe..8ad5831 100644
--- a/src/app/gallery/page.tsx
+++ b/src/app/gallery/page.tsx
@@ -51,28 +51,28 @@ export default function GalleryPage() {
       id: "gallery-1",
       name: "Sushi Premium",
       price: "Koleksion",
-      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=11",
       imageAlt: "Sushi Premium",
     },
     {
       id: "gallery-2",
       name: "Interiori Elegan",
       price: "Atmosferë",
-      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy",
+      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy&_wi=4",
       imageAlt: "Interiori Elegan",
     },
     {
       id: "gallery-3",
       name: "Pjata Nënshënjuese",
       price: "Pjatë",
-      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=12",
       imageAlt: "Pjata Nënshënjuese",
     },
     {
       id: "gallery-4",
       name: "Përgatitja e Chefir",
       price: "Përgatitje",
-      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+      imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=13",
       imageAlt: "Përgatitja e Chefir",
     },
     {
@@ -120,7 +120,7 @@ export default function GalleryPage() {
         <HeroLogo
           logoText="Galeria"
           description="Zbuloni bukurinë e pjatave tona, atmosferën e restorantit dhe përvojën e ngrënies"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom&_wi=3"
           imageAlt="Galeria e Watami"
           buttons={[
             {
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 0d09ce2..13a7053 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,24 +1,61 @@
 import type { Metadata } from "next";
 import { Halant } from "next/font/google";
 import { Inter } from "next/font/google";
+import { Figtree } from "next/font/google";
 import "./globals.css";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
-import { Figtree } from "next/font/google";
 
+const halant = Halant({
+  variable: "--font-halant",
+  subsets: ["latin"],
+  weight: ["300", "400", "500", "600", "700"],
+});
 
-
-export const metadata: Metadata = {
-  title: "Webild components 2",
-  description: "Generated by create next app",
-};
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
 
 const figtree = Figtree({
   variable: "--font-figtree",
   subsets: ["latin"],
 });
 
+export const metadata: Metadata = {
+  title: "Watami Tirana - Premium Sushi në Tiranë | 4.9★",
+  description: "Watami Tirana: restauranti i sushit me vlerësimin më të lartë në qytet. Peshk i freskët, përgatitje autentike japoneze, shërbim përjashtimor. Rezervo tavolën tënde tani!",
+  keywords: "sushi Tiranë,peshk i freskët,restauranti japonez Tiranë,sushi premium,dorëzim sushit,tabela e sushit",
+  metadataBase: new URL("https://watamitirana.al"),
+  alternates: {
+    canonical: "https://watamitirana.al",
+  },
+  openGraph: {
+    title: "Watami Tirana - Peshk i Freskët & Sushi Premium",
+    description: "Përvojë autentike e sushit japonez në Tiranë me peshk të freskët dhe përgatitje tradicionale",
+    url: "https://watamitirana.al",
+    siteName: "Watami Tirana",
+    type: "website",
+    images: [
+      {
+        url: "https://watamitirana.al/og-image.jpg",
+        alt: "Watami Tirana - Premium Sushi",
+      },
+    ],
+  },
+  twitter: {
+    card: "summary_large_image",
+    title: "Watami Tirana - Peshk i Freskët & Sushi Premium",
+    description: "Përvojë autentike e sushit japonez në Tiranë",
+    images: ["https://watamitirana.al/twitter-image.jpg"],
+  },
+  robots: {
+    index: true,
+    follow: true,
+  },
+};
+
 export default function RootLayout({
   children,
 }: Readonly<{
@@ -27,7 +64,9 @@ export default function RootLayout({
   return (
     <html lang="en" suppressHydrationWarning>
       <ServiceWrapper>
-        <body className={`${figtree.variable} antialiased`}>
+        <body
+          className={`${halant.variable} ${inter.variable} ${figtree.variable} antialiased`}
+        >
           <Tag />
           {children}
           <script
@@ -39,4 +78,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}
\ No newline at end of file
diff --git a/src/app/menu/page.tsx b/src/app/menu/page.tsx
index 6e5ce56..2cf0885 100644
--- a/src/app/menu/page.tsx
+++ b/src/app/menu/page.tsx
@@ -72,7 +72,7 @@ export default function MenuPage() {
         <HeroLogo
           logoText="Menyja Ynë"
           description="Zbuloni koleksionin e plotë të rolave sushit, sashimit, nigirit dhe specialiteteve japoneze"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=4"
           imageAlt="Meny e plotë e sushit"
           buttons={[
             { text: "Porosis Tani", href: "#" },
@@ -95,37 +95,37 @@ export default function MenuPage() {
               id: "roll-1",
               name: "Philadelphia Roll",
               price: "850 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=5",
             },
             {
               id: "roll-2",
               name: "California Roll",
               price: "750 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=6",
             },
             {
               id: "roll-3",
               name: "Dragon Roll",
               price: "950 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=7",
             },
             {
               id: "roll-4",
               name: "Spicy Tuna Roll",
               price: "800 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=8",
             },
             {
               id: "roll-5",
               name: "Ebi Tempura Roll",
               price: "900 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=9",
             },
             {
               id: "roll-6",
               name: "Rainbow Roll",
               price: "1050 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=10",
             },
           ]}
         />
diff --git a/src/app/page.tsx b/src/app/page.tsx
index c5426d7..bb61c97 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -87,7 +87,7 @@ export default function HomePage() {
         <HeroLogo
           logoText="Watami Tirana"
           description="Përvojë premium e sushit me peshk të freskët dhe përgatitje autentike japoneze në zemër të Tiranës"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom&_wi=1"
           imageAlt="Sushi platter premisioner me pesha të freskë"
           buttons={[
             { text: "Rezervo Tavolë", href: "/contact" },
@@ -132,19 +132,19 @@ export default function HomePage() {
               id: "special-1",
               name: "Philadelphia Roll",
               price: "850 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=1",
             },
             {
               id: "special-2",
               name: "Salmon Nigiri Set",
               price: "950 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=2",
             },
             {
               id: "special-3",
               name: "Sashimi Assortment",
               price: "1200 Lek",
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle",
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=rmwkle&_wi=3",
             },
           ]}
           buttons={[{ text: "Shiko Menun e Plotë", href: "/menu" }]}
@@ -155,7 +155,7 @@ export default function HomePage() {
         <SplitAbout
           title="Përvojë Autentike Japoneze"
           description="në Watami Tirana, ne në thellim për të sjellë kualitetin më të lartë të peshkut të freskët dhe përgatitjen tradicionale japoneze të sushit në Tiranë."
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=ewzroy&_wi=1"
           imageAlt="Interiori elegan i restorantit Watami Tirana"
           mediaAnimation="blur-reveal"
           textboxLayout="default"
@@ -284,7 +284,7 @@ export default function HomePage() {
         <ContactSplitForm
           title="Gati për Përvojën më të Mirë të Sushit në Tiranë?"
           description="Rezervo tavolën tënde tani ose porosis online. Shtimi i Watami në favoritë të shtëpi tuaj është vetëm një klik!"
-          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom"
+          imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=1gbcom&_wi=2"
           imageAlt="Sushi premium"
           mediaAnimation="blur-reveal"
           mediaPosition="right"