diff --git a/src/app/menu/page.tsx b/src/app/menu/page.tsx
index 445b167..ab15c1d 100644
--- a/src/app/menu/page.tsx
+++ b/src/app/menu/page.tsx
@@ -1,146 +1,120 @@
 'use client';
 
-import { Fragment, useCallback, useMemo, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import SearchBox from "@/components/input/SearchBox";
 import CategoryItemRenderer from "@/components/listview/CategoryItemRenderer";
 import HorizontalScrollView from "@/components/listview/HorizontalScrollView";
 import Image from "next/image";
 import EqualizerIcon from "@/components/icons/EqualizerIcon";
 import TextAlignIcon from "@/components/icons/TextAlignIcon";
-import PlusIcon from "@/components/icons/PlusIcon";
-import MinusIcon from "@/components/icons/MinusIcon";
 import VerticalScrollView from "@/components/listview/VerticalScrollView";
 import MenuItemRenderer from "@/components/listview/MenuItemRenderer";
-import { useReceiptStore } from "@/zustand/receiptStore";
+import React from "react";
+import MenuItem from "@/components/listview/MenuItem";
 
-const categories = [
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  },
-  {
-    title: 'خوراک', icon: '',
-  }
-]
+const categories = new Array(13).fill({ title: "خوراک", icon: "" });
 
 const foods = [
   {
+    id: 1,
     category: 0,
-    price: '69.000',
-    name: 'کباب چوبی ژیوان )سیخ چوبی(',
-    contains: 'فیله گوساله / سس سفید / قارچ و سیب زمینی/ پنیر پارمزان'
+    price: "69.000",
+    name: "کباب چوبی ژیوان )سیخ چوبی(",
+    contains: "فیله گوساله / سس سفید / قارچ و سیب زمینی/ پنیر پارمزان"
   },
   {
+    id: 2,
     category: 1,
-    price: '49.000',
-    name: 'برگر گوشت گوساله',
-    contains: 'گوشت گوساله / پنیر چدار / کاهو / گوجه'
+    price: "49.000",
+    name: "برگر گوشت گوساله",
+    contains: "گوشت گوساله / پنیر چدار / کاهو / گوجه"
   },
   {
+    id: 3,
     category: 2,
-    price: '29.000',
-    name: 'ساندویچ مرغ',
-    contains: 'مرغ / کاهو / گوجه / سس مایونز'
+    price: "29.000",
+    name: "ساندویچ مرغ",
+    contains: "مرغ / کاهو / گوجه / سس مایونز"
   },
   {
+    id: 4,
     category: 0,
-    price: '89.000',
-    name: 'کباب ماهی',
-    contains: 'ماهی / سس لیمو / قارچ و سیب زمینی'
+    price: "89.000",
+    name: "کباب ماهی",
+    contains: "ماهی / سس لیمو / قارچ و سیب زمینی"
   },
   {
+    id: 5,
     category: 1,
-    price: '39.000',
-    name: 'سالاد فصل',
-    contains: 'کاهو / گوجه / خیار / پنیر فتا'
+    price: "39.000",
+    name: "سالاد فصل",
+    contains: "کاهو / گوجه / خیار / پنیر فتا"
   },
   {
+    id: 6,
     category: 3,
-    price: '59.000',
-    name: 'پاستا گوشت',
-    contains: 'گوشت گوساله / پاستا / سس گوجه'
+    price: "59.000",
+    name: "پاستا گوشت",
+    contains: "گوشت گوساله / پاستا / سس گوجه"
   },
   {
+    id: 7,
     category: 2,
-    price: '49.000',
-    name: 'ساندویچ تن ماهی',
-    contains: 'تن ماهی / کاهو / گوجه / سس مایونز'
+    price: "49.000",
+    name: "ساندویچ تن ماهی",
+    contains: "تن ماهی / کاهو / گوجه / سس مایونز"
   },
   {
+    id: 8,
     category: 0,
-    price: '79.000',
-    name: 'کباب گوشت گوسفندی',
-    contains: 'گوشت گوسفندی / سس سفید / قارچ و سیب زمینی'
+    price: "79.000",
+    name: "کباب گوشت گوسفندی",
+    contains: "گوشت گوسفندی / سس سفید / قارچ و سیب زمینی"
   },
   {
+    id: 9,
     category: 1,
-    price: '29.000',
-    name: 'برگر مرغ',
-    contains: 'مرغ / پنیر چدار / کاهو / گوجه'
+    price: "29.000",
+    name: "برگر مرغ",
+    contains: "مرغ / پنیر چدار / کاهو / گوجه"
   },
   {
+    id: 10,
     category: 3,
-    price: '69.000',
-    name: 'سالاد میگو',
-    contains: 'میگو / کاهو / گوجه / خیار'
+    price: "69.000",
+    name: "سالاد میگو",
+    contains: "میگو / کاهو / گوجه / خیار"
   },
   {
+    id: 11,
     category: 2,
-    price: '39.000',
-    name: 'ساندویچ شاورما',
-    contains: 'مرغ / کاهو / گوجه / سس تارتار'
+    price: "39.000",
+    name: "ساندویچ شاورما",
+    contains: "مرغ / کاهو / گوجه / سس تارتار"
   },
   {
+    id: 12,
     category: 0,
-    price: '99.000',
-    name: 'کباب گوشت بوقلمون',
-    contains: 'گوشت بوقلمون / سس سفید / قارچ و سیب زمینی'
+    price: "99.000",
+    name: "کباب گوشت بوقلمون",
+    contains: "گوشت بوقلمون / سس سفید / قارچ و سیب زمینی"
   },
   {
+    id: 13,
     category: 1,
-    price: '59.000',
-    name: 'برگر ماهی',
-    contains: 'ماهی / پنیر چدار / کاهو / گوجه'
+    price: "59.000",
+    name: "برگر ماهی",
+    contains: "ماهی / پنیر چدار / کاهو / گوجه"
   },
   {
+    id: 14,
     category: 3,
-    price: '49.000',
-    name: 'سالاد مرغ',
-    contains: 'مرغ / کاهو / گوجه / خیار'
-  },
+    price: "49.000",
+    name: "سالاد مرغ",
+    contains: "مرغ / کاهو / گوجه / خیار"
+  }
 ];
+
 const MenuIndex = () => {
   const [search, setSearch] = useState("");
   const [selectedCategory, setSelectedCategory] = useState(0);
@@ -153,51 +127,41 @@ const MenuIndex = () => {
     setSelectedCategory(id);
   }, []);
 
-  const incrementItem = useReceiptStore((state) => state.increment);
-  const decrementItem = useReceiptStore((state) => state.decrement);
-  const receiptItems = useReceiptStore((state) => state.items);
-
   const filteredReceiptItems = useMemo(() => {
-    return foods.filter((item) => item.category === selectedCategory);
-  }, [selectedCategory]);
+    const lowerSearch = search.toLowerCase();
+    return foods.filter(
+      (item) =>
+        item.category === selectedCategory &&
+        item.name.toLowerCase().includes(lowerSearch)
+    );
+  }, [selectedCategory, search]);
 
   return (
     <div className="flex flex-col gap-4 pt-4 items-center">
       <SearchBox value={search} onChange={updateSearch} />
-      <HorizontalScrollView
-        className="w-full noscrollbar py-4!"
-        itemRenderer={(child, index) => {
-          return (
-            <CategoryItemRenderer
-              className={`${index === selectedCategory && "bg-white!"}`}
-              onClick={() => updateCategory(index)}
-              key={index}
-            >
-              {child}
-            </CategoryItemRenderer>
-          );
-        }}
-      >
-        {categories.map((item, index) => {
-          return (
-            <div key={index}>
-              <Image
-                priority
-                src={"/assets/images/food-image.png"}
-                width={32}
-                height={32}
-                alt="category image"
-              />
-              <span className="text-xs text-black">{item.title}</span>
-            </div>
-          );
-        })}
+      <HorizontalScrollView className="w-full noscrollbar py-4!">
+        {categories.map((item, index) => (
+          <CategoryItemRenderer
+            key={index}
+            className={`${index === selectedCategory ? "bg-white!" : ""}`}
+            onClick={() => updateCategory(index)}
+          >
+            <Image
+              priority
+              src="/assets/images/food-image.png"
+              width={32}
+              height={32}
+              alt="category image"
+            />
+            <span className="text-xs text-black">{item.title}</span>
+          </CategoryItemRenderer>
+        ))}
       </HorizontalScrollView>
 
       <section className="w-full">
         <div className="flex justify-between items-center">
           <span className="text-base font-semibold">
-            {categories[selectedCategory].title}
+            {categories[selectedCategory]?.title}
           </span>
           <div className="inline-flex gap-2 justify-around items-center">
             <button className="rounded-xl h-8 bg-white ps-4 pe-2 py-1.5 inline-flex items-center justify-between gap-[7px]">
@@ -210,79 +174,12 @@ const MenuIndex = () => {
           </div>
         </div>
 
-        <VerticalScrollView
-          className="mt-5! overflow-y-auto h-full"
-          itemRenderer={(child, index) => {
-            return (
-              <MenuItemRenderer key={index}>{child}</MenuItemRenderer>
-            );
-          }}
-        >
-          {filteredReceiptItems
-            .filter((food) => food.category === selectedCategory)
-            .map((food, index) => {
-              const receiptItem = receiptItems.find(
-                (item) => item.id === index
-              );
-
-              return (
-                <Fragment key={index}>
-                  <Image
-                    className="rounded-xl w-28 h-28"
-                    src={"/assets/images/food-preview.png"}
-                    height={100}
-                    width={100}
-                    alt="Food image"
-                  />
-                  <div className="w-full h-full inline-flex flex-col justify-between">
-                    <div>
-                      <div className="text-sm2 font-semibold">
-                        {food.name}
-                      </div>
-                      <div className="text-[#7F7F7F] text-xs leading-5 font-normal mt-2">
-                        {food.contains}
-                      </div>
-                    </div>
-                    <div className="inline-flex justify-between w-full items-end">
-                      <span className="w-full" dir="ltr">
-                        {food.price} T
-                      </span>
-                      <div className="bg-background max-w-[115px] rounded-lg w-full h-8 inline-flex py-1 px-[5px] justify-between items-center gap-2">
-                        {(receiptItem?.quantity || 0) <= 0 ? (
-                          <button
-                            onClick={() => incrementItem(index)}
-                            className="inline-flex w-full justify-center items-center gap-2"
-                          >
-                            <PlusIcon />
-                            <div className="text-sm2 pt-0.5 font-semibold" style={{ verticalAlign: "end" }}>
-                              افزودن
-                            </div>
-                          </button>
-                        ) : (
-                          <>
-                            <button
-                              onClick={() => incrementItem(index)}
-                              className="bg-white rounded-sm p-2"
-                            >
-                              <PlusIcon />
-                            </button>
-                            <div className="text-sm2 pt-0.5 font-semibold" style={{ verticalAlign: "end" }}>
-                              {(receiptItem?.quantity || 0)}
-                            </div>
-                            <button
-                              onClick={() => decrementItem(index)}
-                              className="bg-white rounded-sm p-2"
-                            >
-                              <MinusIcon />
-                            </button>
-                          </>
-                        )}
-                      </div>
-                    </div>
-                  </div>
-                </Fragment>
-              );
-            })}
+        <VerticalScrollView className="mt-5! overflow-y-auto h-full">
+          {filteredReceiptItems.map((food) => (
+            <MenuItemRenderer key={food.id}>
+              <MenuItem food={food} />
+            </MenuItemRenderer>
+          ))}
         </VerticalScrollView>
       </section>
     </div>
diff --git a/src/components/listview/MenuItem.tsx b/src/components/listview/MenuItem.tsx
new file mode 100644
index 0000000..ce7b792
--- /dev/null
+++ b/src/components/listview/MenuItem.tsx
@@ -0,0 +1,76 @@
+// components/menu/MenuItem.tsx
+'use client'
+
+import { memo } from "react";
+import Image from "next/image";
+import PlusIcon from "@/components/icons/PlusIcon";
+import MinusIcon from "@/components/icons/MinusIcon";
+import { useReceiptStore } from "@/zustand/receiptStore";
+
+interface MenuItemProps {
+  food: {
+    id: number
+    name: string;
+    contains: string;
+    price: string;
+  };
+}
+
+const MenuItem = ({ food }: MenuItemProps) => {
+  const quantity = useReceiptStore(state => state.items[food.id]?.quantity || 0);
+
+  const increment = useReceiptStore(state => state.increment);
+  const decrement = useReceiptStore(state => state.decrement);
+
+  return (
+    <div className="flex gap-4 w-full">
+      <Image
+        className="rounded-xl w-28 h-28"
+        src={"/assets/images/food-preview.png"}
+        height={100}
+        width={100}
+        alt="Food image"
+      />
+      <div className="w-full h-full inline-flex flex-col justify-between">
+        <div>
+          <div className="text-sm2 font-semibold">{food.name}</div>
+          <div className="text-[#7F7F7F] text-xs leading-5 font-normal mt-2">
+            {food.contains}
+          </div>
+        </div>
+        <div className="inline-flex justify-between w-full items-end">
+          <span className="w-full" dir="ltr">{food.price} T</span>
+          <div className="bg-background max-w-[115px] rounded-lg w-full h-8 inline-flex py-1 px-[5px] justify-between items-center gap-2">
+            {quantity <= 0 ? (
+              <button
+                onClick={() => increment(food.id)}
+                className="inline-flex w-full justify-center items-center gap-2"
+              >
+                <PlusIcon />
+                <div className="text-sm2 pt-0.5 font-semibold">افزودن</div>
+              </button>
+            ) : (
+              <>
+                <button
+                  onClick={() => increment(food.id)}
+                  className="bg-white rounded-sm p-2"
+                >
+                  <PlusIcon />
+                </button>
+                <div className="text-sm2 pt-0.5 font-semibold">{quantity}</div>
+                <button
+                  onClick={() => decrement(food.id)}
+                  className="bg-white rounded-sm p-2"
+                >
+                  <MinusIcon />
+                </button>
+              </>
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default memo(MenuItem);
diff --git a/src/components/listview/MenuItemRenderer.tsx b/src/components/listview/MenuItemRenderer.tsx
index 670c229..e1c62e0 100644
--- a/src/components/listview/MenuItemRenderer.tsx
+++ b/src/components/listview/MenuItemRenderer.tsx
@@ -1,15 +1,23 @@
 import React from 'react';
 
 type Props = {
-    children: React.ReactNode;
+  children: React.ReactNode;
 } & React.HTMLAttributes<HTMLDivElement>;
 
-function MenuItemRenderer({ children, ...rest }: Props) {
-    return (
-        <div {...rest} className={`${rest.className} transition-all duration-200 ease-out w-full h-36 bg-white rounded-3xl px-4 pt-3.5 pb-3 flex justify-between gap-4`}>
-            {children}
-        </div>
-    );
+function MenuItemRendererComponent({ children, ...rest }: Props) {
+  return (
+    <div
+      {...rest}
+      className={`${rest.className} transition-all duration-200 ease-out w-full h-36 bg-white rounded-3xl px-4 pt-3.5 pb-3 flex justify-between gap-4`}
+    >
+      {children}
+    </div>
+  );
 }
 
+// Memoize with shallow comparison of props
+const MenuItemRenderer = React.memo(MenuItemRendererComponent, (prevProps, nextProps) => {
+  return prevProps.className === nextProps.className && prevProps.children === nextProps.children;
+});
+
 export default MenuItemRenderer;
diff --git a/src/zustand/receiptStore.ts b/src/zustand/receiptStore.ts
index 70d80e9..cef2629 100644
--- a/src/zustand/receiptStore.ts
+++ b/src/zustand/receiptStore.ts
@@ -1,52 +1,50 @@
-// zustand/userStore.ts
-import { create } from 'zustand'
-import { createJSONStorage, persist } from 'zustand/middleware'
+// zustand/receiptStore.ts
+import { create } from 'zustand';
+import { createJSONStorage, persist } from 'zustand/middleware';
 
-type ReceiptItem = {
-  id: number
-  quantity: number
-}
+type ReceiptItemMap = {
+  [id: number]: {
+    quantity: number;
+  };
+};
 
-type AuthStore = {
-  items: Array<ReceiptItem>
-  increment: (id: number) => void
-  decrement: (id: number) => void
-  clear: () => void
-}
+type ReceiptStore = {
+  items: ReceiptItemMap;
+  increment: (id: number) => void;
+  decrement: (id: number) => void;
+  clear: () => void;
+};
 
-export const useReceiptStore = create<AuthStore>()(
+export const useReceiptStore = create<ReceiptStore>()(
   persist(
     (set) => ({
-      items: [],
-      clear: () =>
-        set(() => ({
-          items: []
-        })),
+      items: {},
+      clear: () => set({ items: {} }),
       increment: (id) =>
         set((state) => {
-          if (state.items.find(x => x.id === id) === undefined) {
-            return ({
-              items: [...state.items, {id, quantity: 1}]
-            })
-          }
-          return ({
-            items: state.items.map((item) =>
-              item.id === id ? { ...item, quantity: item.quantity + 1 } : item
-            ),
-          })
+          const current = state.items[id]?.quantity || 0;
+          return {
+            items: {
+              ...state.items,
+              [id]: { quantity: current + 1 },
+            },
+          };
         }),
       decrement: (id) =>
-        set((state) => ({
-          items: state.items.map((item) =>
-            item.id === id && item.quantity > 0
-              ? { ...item, quantity: item.quantity - 1 }
-              : item
-          ),
-        })),
+        set((state) => {
+          const current = state.items[id]?.quantity || 0;
+          if (current <= 0) return {};
+          return {
+            items: {
+              ...state.items,
+              [id]: { quantity: current - 1 },
+            },
+          };
+        }),
     }),
     {
-      name: 'receipt-storage', // Key in localStorage
+      name: 'receipt-storage',
       storage: createJSONStorage(() => sessionStorage),
     }
   )
-)
+);