diff --git a/src/components/Header.js b/src/components/Header.js
index 1081677..4180d92 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -32,13 +32,6 @@ const Header = ({ username, scrollToProduct, scrollToCourse, setShowedModal, han
         >
           {username ? 'MY PRODUCTS' : 'PRODUCTS'}
         </a>
-        <a
-          className={`${styles.navLink} ${hoveredNav === 4 ? styles.navLinkHover : ''}`}
-          onMouseEnter={() => setHoveredNav(4)}
-          onMouseLeave={() => setHoveredNav(null)}
-        >
-          USER
-        </a>
       </nav>
 
       {/* Burger Menu Button */}
@@ -51,7 +44,7 @@ const Header = ({ username, scrollToProduct, scrollToCourse, setShowedModal, han
         <div className={styles.mobileMenu}>
           {username ? (
             <>
-              <div className={styles.username}>Halo, {username}</div>
+              <div className={styles.username}>{username}</div>
 
               <button className={styles.logoutButton} onClick={() => {
                  navigate('/products');
@@ -84,7 +77,7 @@ const Header = ({ username, scrollToProduct, scrollToCourse, setShowedModal, han
       <div className={styles.authButtons}>
         {username && (
           <div className={styles.loggedInContainer}>
-            <span className={styles.username}>Halo, {username}</span>
+            <span className={styles.username}>{username}</span>
             <button className={styles.logoutButton} onClick={handleLogout}>Logout</button>
           </div>
         )}
diff --git a/src/components/pages/ProductsPage.js b/src/components/pages/ProductsPage.js
index 22504e2..533ac2f 100644
--- a/src/components/pages/ProductsPage.js
+++ b/src/components/pages/ProductsPage.js
@@ -66,26 +66,36 @@ const CoursePage = ({ subscriptions }) => {
         })
             .then(res => res.json())
             .then(data => {
-                const enrichedData = Object.values(groupedSubs).map(group => {
-                    const productData = data.find(p => p.id == group.product_id);
+                const enrichedData = Object.values(groupedSubs)
+    .filter(group => data.some(p => p.id === group.product_id)) // ✅ hanya produk yang ada di metadata
+    .map(group => {
+        const productData = data.find(p => p.id == group.product_id);
+
+        // Cek fallback image dari parent jika image kosong dan sub_product_of ada
+        let image = productData?.image || '';
+        if (!image && productData?.sub_product_of) {
+            const parent = data.find(p => p.id === productData.sub_product_of);
+            image = parent?.image || '';
+        }
+
+        return {
+            id: group.product_id,
+            name: group.product_name,
+            type: productData?.type || 'product',
+            image: image,
+            description: productData?.description || '',
+            price: productData?.price || 0,
+            currency: productData?.currency || 'IDR',
+            duration: productData?.duration || {},
+            sub_product_of: productData?.sub_product_of || null,
+            is_visible: productData?.is_visible ?? true,
+            unit_type: productData?.unit_type || group.unit_type,
+            quantity: group.quantity,
+            end_date: group.end_date,
+            children: []
+        };
+    });
 
-                    return {
-                        id: group.product_id,
-                        name: group.product_name,
-                        type: productData?.type || 'product',
-                        image: productData?.image || '',
-                        description: productData?.description || '',
-                        price: productData?.price || 0,
-                        currency: productData?.currency || 'IDR',
-                        duration: productData?.duration || {},
-                        sub_product_of: productData?.sub_product_of || null,
-                        is_visible: productData?.is_visible ?? true,
-                        unit_type: productData?.unit_type || group.unit_type,
-                        quantity: group.quantity, // Bisa diganti dengan jumlah token kalau diperlukan
-                        end_date: group.end_date,
-                        children: [] // Kosong, bisa diisi jika ada sub-product
-                    };
-                });
                 console.log(enrichedData)
                 setProducts(enrichedData);
                 console.log('Enriched Data:', enrichedData);