diff --git a/backend/controllers/category.js b/backend/controllers/category.js
index 90cbd94..4764dbf 100644
--- a/backend/controllers/category.js
+++ b/backend/controllers/category.js
@@ -7,7 +7,7 @@ exports.getAllCategoriesWithPagination = async (req, res) => {
   try {
     const [data, _] = await db.execute(
       "SELECT * FROM Category C ORDER BY C.CategoryID ASC LIMIT ? OFFSET ?",
-      [limit.toString(), offset.toString()]
+      [limit.toString(), offset.toString()],
     );
 
     const [result] = await db.execute("SELECT COUNT(*) AS count FROM Category");
@@ -24,7 +24,7 @@ exports.addCategory = async (req, res) => {
   try {
     const [result] = await db.execute(
       "INSERT INTO Category (Name) VALUES (?)",
-      [name]
+      [name],
     );
     res.json({ message: "Adding new category successfully!" });
   } catch (error) {
@@ -38,10 +38,33 @@ exports.removeCategory = async (req, res) => {
   try {
     const [result] = await db.execute(
       `DELETE FROM Category WHERE CategoryID = ?`,
-      [id]
+      [id],
     );
     res.json({ message: "Delete category successfully!" });
   } catch (error) {
     res.json({ error: "Cannot remove category from database!" });
   }
 };
+
+exports.getAllCategory = async (req, res) => {
+  try {
+    const [data, fields] = await db.execute(`SELECT * FROM Category`);
+
+    const formattedData = {};
+    data.forEach((row) => {
+      formattedData[row.CategoryID] = row.Name;
+    });
+
+    res.json({
+      success: true,
+      message: "Categories fetched successfully",
+      data: formattedData,
+    });
+  } catch (error) {
+    console.error("Error fetching categories:", error);
+    return res.status(500).json({
+      success: false,
+      error: "Database error occurred",
+    });
+  }
+};
diff --git a/backend/controllers/product.js b/backend/controllers/product.js
index a606fa2..44185a5 100644
--- a/backend/controllers/product.js
+++ b/backend/controllers/product.js
@@ -6,7 +6,7 @@ exports.addProduct = async (req, res) => {
   try {
     const [result] = await db.execute(
       `INSERT INTO Product (Name, Price, StockQuantity, UserID, Description, CategoryID) VALUES (?, ?, ?, ?, ?, ?)`,
-      [name, price, qty, userID, description, category]
+      [name, price, qty, userID, description, category],
     );
 
     const productID = result.insertId;
@@ -15,7 +15,7 @@ exports.addProduct = async (req, res) => {
         db.execute(`INSERT INTO Image_URL (URL, ProductID) VALUES (?, ?)`, [
           imagePath,
           productID,
-        ])
+        ]),
       );
 
       await Promise.all(imageInsertPromises); //perallel
@@ -32,14 +32,52 @@ exports.addProduct = async (req, res) => {
   }
 };
 
+exports.removeProduct = async (req, res) => {
+  const { userID, productID } = req.body;
+  console.log(userID);
+
+  try {
+    // First delete images
+    await db.execute(`DELETE FROM Image_URL WHERE ProductID = ?`, [productID]);
+    await db.execute(`DELETE FROM History WHERE ProductID = ?`, [productID]);
+    await db.execute(`DELETE FROM Favorites WHERE ProductID = ?`, [productID]);
+    await db.execute(`DELETE FROM Product_Category WHERE ProductID = ?`, [
+      productID,
+    ]);
+    await db.execute(`DELETE FROM Product_Category WHERE ProductID = ?`, [
+      productID,
+    ]);
+    await db.execute(`DELETE FROM Transaction WHERE ProductID = ?`, [
+      productID,
+    ]);
+    await db.execute(
+      `DELETE FROM Recommendation WHERE RecommendedProductID = ?`,
+      [productID],
+    );
+
+    // Then delete the product
+    await db.execute(`DELETE FROM Product WHERE UserID = ? AND ProductID = ?`, [
+      userID,
+      productID,
+    ]);
+
+    res.json({
+      success: true,
+      message: "Product removed successfully",
+    });
+  } catch (error) {
+    console.error("Error removing product:", error);
+    return res.json({ error: "Could not remove product" });
+  }
+};
+
 exports.addFavorite = async (req, res) => {
   const { userID, productID } = req.body;
   console.log(userID);
   try {
-    // Use parameterized query to prevent SQL injection
     const [result] = await db.execute(
       `INSERT INTO Favorites (UserID, ProductID) VALUES (?, ?)`,
-      [userID, productID]
+      [userID, productID],
     );
 
     res.json({
@@ -59,7 +97,7 @@ exports.removeFavorite = async (req, res) => {
     // Use parameterized query to prevent SQL injection
     const [result] = await db.execute(
       `DELETE FROM Favorites WHERE UserID = ? AND ProductID = ?`,
-      [userID, productID]
+      [userID, productID],
     );
 
     res.json({
@@ -72,6 +110,103 @@ exports.removeFavorite = async (req, res) => {
   }
 };
 
+exports.updateProduct = async (req, res) => {
+  const { productId } = req.params;
+  const { name, description, price, category, images } = req.body;
+
+  console.log(productId);
+
+  const connection = await db.getConnection();
+  try {
+    await connection.beginTransaction();
+
+    // Step 1: Check if the product exists
+    const [checkProduct] = await connection.execute(
+      "SELECT * FROM Product WHERE ProductID = ?",
+      [productId],
+    );
+    if (checkProduct.length === 0) {
+      await connection.rollback();
+      return res.status(404).json({ error: "Product not found" });
+    }
+
+    // Step 2: Update the product
+    await connection.execute(
+      `
+      UPDATE Product
+      SET Name = ?, Description = ?, Price = ?, CategoryID = ?
+      WHERE ProductID = ?
+      `,
+      [name, description, price, category, productId],
+    );
+
+    // Step 3: Delete existing images
+    await connection.execute(`DELETE FROM Image_URL WHERE ProductID = ?`, [
+      productId,
+    ]);
+
+    // Step 4: Insert new image URLs
+    for (const imageUrl of images) {
+      await connection.execute(
+        `INSERT INTO Image_URL (ProductID, URL) VALUES (?, ?)`,
+        [productId, imageUrl],
+      );
+    }
+
+    await connection.commit();
+    res.json({ success: true, message: "Product updated successfully" });
+  } catch (error) {
+    await connection.rollback();
+    console.error("Update product error:", error);
+    res.status(500).json({ error: "Failed to update product" });
+  } finally {
+    connection.release();
+  }
+};
+
+exports.myProduct = async (req, res) => {
+  const { userID } = req.body;
+
+  try {
+    const [result] = await db.execute(
+      `
+      SELECT
+      p.ProductID,
+      p.Name,
+      p.Description,
+      p.Price,
+      p.CategoryID,
+      p.UserID,
+      p.Date,
+      u.Name AS SellerName,
+      MIN(i.URL) AS image_url
+  FROM Product p
+  JOIN User u ON p.UserID = u.UserID
+  LEFT JOIN Image_URL i ON p.ProductID = i.ProductID
+  WHERE p.UserID = ?
+  GROUP BY
+      p.ProductID,
+      p.Name,
+      p.Description,
+      p.Price,
+      p.CategoryID,
+      p.UserID,
+      p.Date,
+      u.Name;
+      `,
+      [userID],
+    );
+
+    res.json({
+      success: true,
+      data: result,
+    });
+  } catch (error) {
+    console.error("Error retrieving favorites:", error);
+    res.status(500).json({ error: "Could not retrieve favorite products" });
+  }
+};
+
 exports.getFavorites = async (req, res) => {
   const { userID } = req.body;
 
@@ -103,7 +238,7 @@ exports.getFavorites = async (req, res) => {
       p.Date,
       u.Name;
       `,
-      [userID]
+      [userID],
     );
 
     res.json({
@@ -168,7 +303,7 @@ exports.getProductById = async (req, res) => {
       JOIN User U ON p.UserID = U.UserID
       WHERE p.ProductID = ?
     `,
-      [id]
+      [id],
     );
 
     // Log raw data for debugging
@@ -242,11 +377,11 @@ exports.getProductWithPagination = async (req, res) => {
       ORDER BY P.ProductID ASC
       LIMIT ? OFFSET ?
     `,
-      [limit.toString(), offset.toString()]
+      [limit.toString(), offset.toString()],
     );
 
     const [result] = await db.execute(
-      `SELECT COUNT(*) AS totalProd FROM Product`
+      `SELECT COUNT(*) AS totalProd FROM Product`,
     );
     const { totalProd } = result[0];
 
@@ -262,40 +397,10 @@ exports.removeProduct = async (req, res) => {
   try {
     const [result] = await db.execute(
       `DELETE FROM Product WHERE ProductID = ?`,
-      [id]
+      [id],
     );
     res.json({ message: "Delete product successfully!" });
   } catch (error) {
     res.json({ error: "Cannot remove product from database!" });
   }
 };
-
-// db_con.query(
-//   "SELECT ProductID FROM product WHERE ProductID = ?",
-//   [productID],
-//   (err, results) => {
-//     if (err) {
-//       console.error("Error checking product:", err);
-//       return res.json({ error: "Database error" });
-//     }
-
-//     if (results.length === 0) {
-//       return res.json({ error: "Product does not exist" });
-//     }
-//   },
-// );
-
-// db_con.query(
-//   "INSERT INTO Favorites (UserID, ProductID) VALUES (?, ?)",
-//   [userID, productID],
-//   (err, result) => {
-//     if (err) {
-//       console.error("Error adding favorite product:", err);
-//       return res.json({ error: "Could not add favorite product" });
-//     }
-//     res.json({
-//       success: true,
-//       message: "Product added to favorites successfully",
-//     });
-//   },
-// );
diff --git a/backend/index.js b/backend/index.js
index 796860f..b06f1fc 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -46,6 +46,7 @@ app.use("/api/history", history);
 app.use("/api/review", review);
 app.use("/api/category", categoryRouter);
 app.use("/api/transaction", transactionRouter);
+app.use("/api/category", categoryRouter);
 
 // Set up a scheduler to run cleanup every hour
 clean_up_time = 30 * 60 * 1000;
diff --git a/backend/routes/category.js b/backend/routes/category.js
index 9a04a08..49ebdcf 100644
--- a/backend/routes/category.js
+++ b/backend/routes/category.js
@@ -3,6 +3,7 @@ const {
   getAllCategoriesWithPagination,
   addCategory,
   removeCategory,
+  getAllCategory,
 } = require("../controllers/category");
 
 const router = express.Router();
@@ -10,5 +11,6 @@ const router = express.Router();
 router.get("/getCategories", getAllCategoriesWithPagination);
 router.post("/addCategory", addCategory);
 router.delete("/:id", removeCategory);
+router.get("/", getAllCategory);
 
 module.exports = router;
diff --git a/backend/routes/product.js b/backend/routes/product.js
index 4b59e25..09000cd 100644
--- a/backend/routes/product.js
+++ b/backend/routes/product.js
@@ -9,6 +9,8 @@ const {
   addProduct,
   removeProduct,
   getProductWithPagination,
+  myProduct,
+  updateProduct,
 } = require("../controllers/product");
 const router = express.Router();
 
@@ -22,6 +24,8 @@ router.post("/addFavorite", addFavorite);
 router.post("/getFavorites", getFavorites);
 router.post("/delFavorite", removeFavorite);
 
+router.post("/delProduct", removeProduct);
+router.post("/myProduct", myProduct);
 router.post("/addProduct", addProduct);
 router.get("/getProduct", getAllProducts);
 
@@ -32,4 +36,6 @@ router.get("/getProductWithPagination", getProductWithPagination);
 
 router.get("/:id", getProductById); // Simplified route
 
+router.put("/update/:productId", updateProduct);
+
 module.exports = router;
diff --git a/backend/utils/database.js b/backend/utils/database.js
index 643b1f9..ffc5ef3 100644
--- a/backend/utils/database.js
+++ b/backend/utils/database.js
@@ -7,4 +7,8 @@ const pool = mysql.createPool({
   password: "12345678",
 });
 
+// const pool = mysql.createPool(
+//   "singlestore://mann-619d0:<mann-619d0 Password>@svc-3482219c-a389-4079-b18b-d50662524e8a-shared-dml.aws-virginia-6.svc.singlestore.com:3333/db_mann_48ba9?ssl={}",
+// );
+
 module.exports = pool.promise();
diff --git a/frontend/public/20191227_012601_0000.png b/frontend/public/20191227_012601_0000.png
deleted file mode 100644
index e4b0445..0000000
Binary files a/frontend/public/20191227_012601_0000.png and /dev/null differ
diff --git a/frontend/public/Pictures/Acoustic-Guitar.jpg b/frontend/public/Uploads/Acoustic-Guitar.jpg
similarity index 100%
rename from frontend/public/Pictures/Acoustic-Guitar.jpg
rename to frontend/public/Uploads/Acoustic-Guitar.jpg
diff --git a/frontend/public/Pictures/Backpack.jpg b/frontend/public/Uploads/Backpack.jpg
similarity index 100%
rename from frontend/public/Pictures/Backpack.jpg
rename to frontend/public/Uploads/Backpack.jpg
diff --git a/frontend/public/Pictures/Basketball.jpg b/frontend/public/Uploads/Basketball.jpg
similarity index 100%
rename from frontend/public/Pictures/Basketball.jpg
rename to frontend/public/Uploads/Basketball.jpg
diff --git a/frontend/public/Pictures/Bluetooth-Speaker.jpg b/frontend/public/Uploads/Bluetooth-Speaker.jpg
similarity index 100%
rename from frontend/public/Pictures/Bluetooth-Speaker.jpg
rename to frontend/public/Uploads/Bluetooth-Speaker.jpg
diff --git a/frontend/public/Pictures/CS-Textbook.jpg b/frontend/public/Uploads/CS-Textbook.jpg
similarity index 100%
rename from frontend/public/Pictures/CS-Textbook.jpg
rename to frontend/public/Uploads/CS-Textbook.jpg
diff --git a/frontend/public/Pictures/Calculator.jpg b/frontend/public/Uploads/Calculator.jpg
similarity index 100%
rename from frontend/public/Pictures/Calculator.jpg
rename to frontend/public/Uploads/Calculator.jpg
diff --git a/frontend/public/Pictures/Calculus-Textbook.jpg b/frontend/public/Uploads/Calculus-Textbook.jpg
similarity index 100%
rename from frontend/public/Pictures/Calculus-Textbook.jpg
rename to frontend/public/Uploads/Calculus-Textbook.jpg
diff --git a/frontend/public/Pictures/Calculus-Textbook2.jpg b/frontend/public/Uploads/Calculus-Textbook2.jpg
similarity index 100%
rename from frontend/public/Pictures/Calculus-Textbook2.jpg
rename to frontend/public/Uploads/Calculus-Textbook2.jpg
diff --git a/frontend/public/Pictures/Calculus-Textbook3.jpg b/frontend/public/Uploads/Calculus-Textbook3.jpg
similarity index 100%
rename from frontend/public/Pictures/Calculus-Textbook3.jpg
rename to frontend/public/Uploads/Calculus-Textbook3.jpg
diff --git a/frontend/public/Pictures/Controller.jpg b/frontend/public/Uploads/Controller.jpg
similarity index 100%
rename from frontend/public/Pictures/Controller.jpg
rename to frontend/public/Uploads/Controller.jpg
diff --git a/frontend/public/Pictures/Dell1.jpg b/frontend/public/Uploads/Dell1.jpg
similarity index 100%
rename from frontend/public/Pictures/Dell1.jpg
rename to frontend/public/Uploads/Dell1.jpg
diff --git a/frontend/public/Pictures/Dell2.jpg b/frontend/public/Uploads/Dell2.jpg
similarity index 100%
rename from frontend/public/Pictures/Dell2.jpg
rename to frontend/public/Uploads/Dell2.jpg
diff --git a/frontend/public/Pictures/Dell3.jpg b/frontend/public/Uploads/Dell3.jpg
similarity index 100%
rename from frontend/public/Pictures/Dell3.jpg
rename to frontend/public/Uploads/Dell3.jpg
diff --git a/frontend/public/Pictures/Desk-Lamp.jpg b/frontend/public/Uploads/Desk-Lamp.jpg
similarity index 100%
rename from frontend/public/Pictures/Desk-Lamp.jpg
rename to frontend/public/Uploads/Desk-Lamp.jpg
diff --git a/frontend/public/Pictures/Dorm-Desk.jpg b/frontend/public/Uploads/Dorm-Desk.jpg
similarity index 100%
rename from frontend/public/Pictures/Dorm-Desk.jpg
rename to frontend/public/Uploads/Dorm-Desk.jpg
diff --git a/frontend/public/Pictures/HP-Calculator.jpg b/frontend/public/Uploads/HP-Calculator.jpg
similarity index 100%
rename from frontend/public/Pictures/HP-Calculator.jpg
rename to frontend/public/Uploads/HP-Calculator.jpg
diff --git a/frontend/public/Pictures/HP-Laptop1.jpg b/frontend/public/Uploads/HP-Laptop1.jpg
similarity index 100%
rename from frontend/public/Pictures/HP-Laptop1.jpg
rename to frontend/public/Uploads/HP-Laptop1.jpg
diff --git a/frontend/public/Pictures/HP-Laptop2.jpg b/frontend/public/Uploads/HP-Laptop2.jpg
similarity index 100%
rename from frontend/public/Pictures/HP-Laptop2.jpg
rename to frontend/public/Uploads/HP-Laptop2.jpg
diff --git a/frontend/public/Pictures/Lab-Coat.jpg b/frontend/public/Uploads/Lab-Coat.jpg
similarity index 100%
rename from frontend/public/Pictures/Lab-Coat.jpg
rename to frontend/public/Uploads/Lab-Coat.jpg
diff --git a/frontend/public/Pictures/Mini-Fridge.jpg b/frontend/public/Uploads/Mini-Fridge.jpg
similarity index 100%
rename from frontend/public/Pictures/Mini-Fridge.jpg
rename to frontend/public/Uploads/Mini-Fridge.jpg
diff --git a/frontend/public/Pictures/Mountain-Bike.jpg b/frontend/public/Uploads/Mountain-Bike.jpg
similarity index 100%
rename from frontend/public/Pictures/Mountain-Bike.jpg
rename to frontend/public/Uploads/Mountain-Bike.jpg
diff --git a/frontend/public/Pictures/Physics-Textbook.jpg b/frontend/public/Uploads/Physics-Textbook.jpg
similarity index 100%
rename from frontend/public/Pictures/Physics-Textbook.jpg
rename to frontend/public/Uploads/Physics-Textbook.jpg
diff --git a/frontend/public/Pictures/University-Hoodie.jpg b/frontend/public/Uploads/University-Hoodie.jpg
similarity index 100%
rename from frontend/public/Pictures/University-Hoodie.jpg
rename to frontend/public/Uploads/University-Hoodie.jpg
diff --git a/frontend/public/Pictures/Winter-Jacket.jpg b/frontend/public/Uploads/Winter-Jacket.jpg
similarity index 100%
rename from frontend/public/Pictures/Winter-Jacket.jpg
rename to frontend/public/Uploads/Winter-Jacket.jpg
diff --git a/frontend/public/Pictures/Wireless-Mouse.jpg b/frontend/public/Uploads/Wireless-Mouse.jpg
similarity index 100%
rename from frontend/public/Pictures/Wireless-Mouse.jpg
rename to frontend/public/Uploads/Wireless-Mouse.jpg
diff --git a/frontend/public/Pictures/Yoga-Mat.jpg b/frontend/public/Uploads/Yoga-Mat.jpg
similarity index 100%
rename from frontend/public/Pictures/Yoga-Mat.jpg
rename to frontend/public/Uploads/Yoga-Mat.jpg
diff --git a/frontend/public/market.png b/frontend/public/market.png
deleted file mode 100644
index 9bfc35c..0000000
Binary files a/frontend/public/market.png and /dev/null differ
diff --git a/frontend/public/university-of-calgary-logo.png b/frontend/public/university-of-calgary-logo.png
deleted file mode 100644
index 875b098..0000000
Binary files a/frontend/public/university-of-calgary-logo.png and /dev/null differ
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index ac28ad5..38d0009 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -37,7 +37,10 @@ function App() {
   const [error, setError] = useState("");
   const [isLoading, setIsLoading] = useState(false);
 
-  const [userId, setUserId] = useState(null);
+  // Product recommendation states
+  const [isGeneratingRecommendations, setIsGeneratingRecommendations] =
+    useState(false);
+  const [recommendations, setRecommendations] = useState([]);
 
   // New verification states
   const [verificationStep, setVerificationStep] = useState("initial"); // 'initial', 'code-sent', 'verifying'
@@ -60,8 +63,69 @@ function App() {
   }, []);
 
   useEffect(() => {
-    sendSessionDataToServer();
-  }, []);
+    if (isAuthenticated && user) {
+      sendSessionDataToServer();
+    }
+  }, [isAuthenticated, user]);
+
+  // Generate product recommendations when user logs in
+  useEffect(() => {
+    if (isAuthenticated && user) {
+      generateProductRecommendations();
+    }
+  }, [isAuthenticated, user]);
+
+  // Generate product recommendations
+  const generateProductRecommendations = async () => {
+    try {
+      setIsGeneratingRecommendations(true);
+
+      // Add a short delay to simulate calculation time
+      await new Promise((resolve) => setTimeout(resolve, 500));
+
+      console.log("Generating product recommendations for user:", user.ID);
+
+      // Make API call to get recommendations
+      const response = await fetch(
+        "http://localhost:3030/api/recommendations/generate",
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            userId: user.ID,
+          }),
+        },
+      );
+
+      if (!response.ok) {
+        throw new Error("Failed to generate recommendations");
+      }
+
+      const result = await response.json();
+
+      if (result.success) {
+        console.log(
+          "Recommendations generated successfully:",
+          result.recommendations,
+        );
+        setRecommendations(result.recommendations);
+
+        // Store recommendations in session storage for access across the app
+        sessionStorage.setItem(
+          "userRecommendations",
+          JSON.stringify(result.recommendations),
+        );
+      } else {
+        console.error("Error generating recommendations:", result.message);
+      }
+    } catch (err) {
+      console.error("Error generating product recommendations:", err);
+    } finally {
+      setIsGeneratingRecommendations(false);
+    }
+  };
 
   const [isAdmin, setIsAdmin] = useState(false);
   const [showAdminDashboard, setShowAdminDashboard] = useState(false);
@@ -103,7 +167,7 @@ function App() {
             email: userData.email,
             // Add any other required fields
           }),
-        }
+        },
       );
 
       if (!response.ok) {
@@ -152,7 +216,7 @@ function App() {
             email: tempUserData.email,
             code: code,
           }),
-        }
+        },
       );
 
       if (!response.ok) {
@@ -196,7 +260,7 @@ function App() {
             "Content-Type": "application/json",
           },
           body: JSON.stringify(userData),
-        }
+        },
       );
 
       if (!response.ok) {
@@ -209,6 +273,7 @@ function App() {
       if (result.success) {
         // Create user object from API response
         const newUser = {
+          ID: result.userID || result.ID,
           name: result.name || userData.name,
           email: result.email || userData.email,
           UCID: result.UCID || userData.ucid,
@@ -223,13 +288,17 @@ function App() {
         sessionStorage.setItem("user", JSON.stringify(newUser));
 
         // After successful signup, send session data to server
-        sendSessionDataToServer(); // Call it after signup
+        sendSessionDataToServer();
 
         // Reset verification steps
         setVerificationStep("initial");
         setTempUserData(null);
 
         console.log("Signup completed successfully");
+
+        // Generate recommendations for the new user
+        generateProductRecommendations();
+
         return true;
       } else {
         setError(result.message || "Failed to complete signup");
@@ -302,7 +371,7 @@ function App() {
               email: formValues.email,
               password: formValues.password,
             }),
-          }
+          },
         );
 
         if (!response.ok) {
@@ -328,9 +397,11 @@ function App() {
           sessionStorage.setItem("isAuthenticated", "true");
           sessionStorage.setItem("user", JSON.stringify(userObj));
 
-          sessionStorage.getItem("user");
-
           console.log("Login successful for:", userData.email);
+
+          // Start generating recommendations with a slight delay
+          // This will happen in the useEffect, but we set a loading state to show to the user
+          setIsGeneratingRecommendations(true);
         } else {
           // Show error message for invalid credentials
           setError("Invalid email or password");
@@ -364,11 +435,12 @@ function App() {
     setUser(null);
     setVerificationStep("initial");
     setTempUserData(null);
+    setRecommendations([]);
 
     // Clear localStorage
-    //
     sessionStorage.removeItem("user");
     sessionStorage.removeItem("isAuthenticated");
+    sessionStorage.removeItem("userRecommendations");
 
     console.log("User logged out");
   };
@@ -396,8 +468,6 @@ function App() {
     try {
       // Retrieve data from sessionStorage
       const user = JSON.parse(sessionStorage.getItem("user"));
-      // const isAuthenticated =
-      //   sessionStorage.getItem("isAuthenticated") === "true";
 
       if (!user || !isAuthenticated) {
         console.log("User is not authenticated");
@@ -411,8 +481,6 @@ function App() {
         isAuthenticated,
       };
 
-      console.log("Sending user data to the server:", requestData);
-
       // Send data to Python server (replace with your actual server URL)
       const response = await fetch("http://0.0.0.0:5000/api/user/session", {
         method: "POST",
@@ -434,6 +502,13 @@ function App() {
     }
   };
 
+  // Loading overlay component
+  const LoadingOverlay = () => (
+    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+      <div className="animate-spin rounded-full h-12 w-12 border-4 border-green-500 border-t-transparent"></div>
+    </div>
+  );
+
   // Login component
   const LoginComponent = () => (
     <div className="flex h-screen bg-white">
@@ -607,8 +682,8 @@ function App() {
                     {isLoading
                       ? "Please wait..."
                       : isSignUp
-                      ? "Create Account"
-                      : "Sign In"}
+                        ? "Create Account"
+                        : "Sign In"}
                   </button>
                 </div>
               </form>
@@ -725,6 +800,9 @@ function App() {
   return (
     <Router>
       <div className="min-h-screen bg-gray-50">
+        {/* Show loading overlay when generating recommendations */}
+        {isGeneratingRecommendations && <LoadingOverlay />}
+
         {/* Only show navbar when authenticated */}
         {isAuthenticated && (
           <Navbar
@@ -746,7 +824,7 @@ function App() {
             element={
               <ProtectedRoute>
                 <div className="container mx-auto px-4 py-6">
-                  <Home />
+                  <Home recommendations={recommendations} />
                 </div>
               </ProtectedRoute>
             }
diff --git a/frontend/src/components/ProductForm.jsx b/frontend/src/components/ProductForm.jsx
deleted file mode 100644
index 32ed01b..0000000
--- a/frontend/src/components/ProductForm.jsx
+++ /dev/null
@@ -1,410 +0,0 @@
-import React, { useState } from "react";
-import { X, ChevronLeft, Plus, Trash2, Check } from "lucide-react";
-
-const ProductForm = ({
-  editingProduct,
-  setEditingProduct,
-  onSave,
-  onCancel,
-}) => {
-  const [selectedCategory, setSelectedCategory] = useState("");
-  const storedUser = JSON.parse(sessionStorage.getItem("user"));
-
-  const categories = [
-    "Electronics",
-    "Clothing",
-    "Home & Garden",
-    "Toys & Games",
-    "Books",
-    "Sports & Outdoors",
-    "Automotive",
-    "Beauty & Personal Care",
-    "Health & Wellness",
-    "Jewelry",
-    "Art & Collectibles",
-    "Food & Beverages",
-    "Office Supplies",
-    "Pet Supplies",
-    "Music & Instruments",
-    "Other",
-  ];
-
-  // Map category names to their respective IDs
-  const categoryMapping = {
-    Electronics: 1,
-    Clothing: 2,
-    "Home & Garden": 3,
-    "Toys & Games": 4,
-    Books: 5,
-    "Sports & Outdoors": 6,
-    Automotive: 7,
-    "Beauty & Personal Care": 8,
-    "Health & Wellness": 9,
-    Jewelry: 10,
-    "Art & Collectibles": 11,
-    "Food & Beverages": 12,
-    "Office Supplies": 13,
-    "Pet Supplies": 14,
-    "Music & Instruments": 15,
-    Other: 16,
-  };
-
-  const handleSave = async () => {
-    // Check if the user has selected at least one category
-    if (!(editingProduct.categories || []).length) {
-      alert("Please select at least one category");
-      return;
-    }
-
-    try {
-      // First, upload images if there are any
-      const imagePaths = [];
-
-      // If we have files to upload, we'd handle the image upload here
-      // This is a placeholder for where you'd implement image uploads
-      // For now, we'll simulate the API expecting paths:
-      if (editingProduct.images && editingProduct.images.length > 0) {
-        // Simulating image paths for demo purposes
-        // In a real implementation, you would upload these files first
-        // and then use the returned paths
-        editingProduct.images.forEach((file, index) => {
-          const simulatedPath = `/public/uploads/${file.name}`;
-          imagePaths.push(simulatedPath);
-        });
-      }
-
-      // Get the category ID from the first selected category
-      const categoryName = (editingProduct.categories || [])[0];
-      const categoryID = categoryMapping[categoryName] || 3; // Default to 3 if not found
-
-      // Prepare payload according to API expectations
-      const payload = {
-        name: editingProduct.name || "",
-        price: parseFloat(editingProduct.price) || 0,
-        qty: 1, // Hardcoded as per your requirement
-        userID: storedUser.ID,
-        description: editingProduct.description || "",
-        category: categoryID,
-        images: imagePaths,
-      };
-
-      console.log("Sending payload:", payload);
-
-      const response = await fetch(
-        "http://localhost:3030/api/product/addProduct",
-        {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify(payload),
-        },
-      );
-
-      if (!response.ok) {
-        const errorData = await response.text();
-        throw new Error(`Failed to add product: ${errorData}`);
-      }
-
-      const data = await response.json();
-      console.log("Product added:", data);
-      if (onSave) onSave(data);
-    } catch (error) {
-      console.error("Error saving product:", error);
-      alert(`Error saving product: ${error.message}`);
-    }
-  };
-
-  const addCategory = () => {
-    if (
-      selectedCategory &&
-      !(editingProduct.categories || []).includes(selectedCategory)
-    ) {
-      setEditingProduct((prev) => ({
-        ...prev,
-        categories: [...(prev.categories || []), selectedCategory],
-      }));
-      setSelectedCategory("");
-    }
-  };
-
-  const removeCategory = (categoryToRemove) => {
-    setEditingProduct((prev) => ({
-      ...prev,
-      categories: (prev.categories || []).filter(
-        (cat) => cat !== categoryToRemove,
-      ),
-    }));
-  };
-
-  const toggleSoldStatus = () => {
-    setEditingProduct((prev) => ({
-      ...prev,
-      isSold: !prev.isSold,
-    }));
-  };
-
-  return (
-    <div className="bg-white border border-gray-200 shadow-md p-6">
-      {/* Back Button */}
-      <button
-        onClick={onCancel}
-        className="mb-4 text-emerald-600 hover:text-emerald-800 flex items-center gap-1"
-      >
-        <ChevronLeft size={16} />
-        <span>Back to Listings</span>
-      </button>
-
-      <h3 className="text-xl font-bold text-gray-800 mb-6 border-b border-gray-200 pb-3">
-        {editingProduct?.id ? "Edit Your Product" : "List a New Product"}
-      </h3>
-
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-        {/* Product Name */}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1">
-            Product Name
-          </label>
-          <input
-            type="text"
-            value={editingProduct.name || ""}
-            onChange={(e) =>
-              setEditingProduct({ ...editingProduct, name: e.target.value })
-            }
-            className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
-          />
-        </div>
-
-        {/* Price */}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1">
-            Price ($)
-          </label>
-          <input
-            type="number"
-            value={editingProduct.price || ""}
-            onChange={(e) =>
-              setEditingProduct({
-                ...editingProduct,
-                price: e.target.value,
-              })
-            }
-            className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
-          />
-        </div>
-
-        {/* Sold Status */}
-        <div className="md:col-span-2">
-          <div className="flex items-center mt-2">
-            <input
-              type="checkbox"
-              id="soldStatus"
-              checked={editingProduct.isSold || false}
-              onChange={toggleSoldStatus}
-              className="w-4 h-4 text-emerald-600 rounded focus:ring-emerald-500"
-            />
-            <label htmlFor="soldStatus" className="ml-2 text-sm text-gray-700">
-              Mark as {editingProduct.isSold ? "Available" : "Sold"}
-            </label>
-            {editingProduct.isSold && (
-              <span className="ml-2 inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-red-100 text-red-800">
-                Sold
-              </span>
-            )}
-          </div>
-        </div>
-
-        {/* Categories */}
-        <div className="md:col-span-2">
-          <label className="block text-sm font-medium text-gray-700 mb-1">
-            Categories
-          </label>
-          <div className="flex gap-2">
-            <select
-              value={selectedCategory}
-              onChange={(e) => setSelectedCategory(e.target.value)}
-              className="flex-1 px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
-            >
-              <option value="" disabled>
-                Select a category
-              </option>
-              {categories
-                .filter(
-                  (cat) => !(editingProduct.categories || []).includes(cat),
-                )
-                .map((category) => (
-                  <option key={category} value={category}>
-                    {category}
-                  </option>
-                ))}
-            </select>
-            <button
-              type="button"
-              onClick={addCategory}
-              disabled={!selectedCategory}
-              className="px-3 py-2 bg-emerald-600 text-white hover:bg-emerald-700 disabled:bg-gray-300 disabled:cursor-not-allowed flex items-center gap-1"
-            >
-              <Plus size={16} />
-              <span>Add</span>
-            </button>
-          </div>
-
-          {/* Selected Categories */}
-          {(editingProduct.categories || []).length > 0 ? (
-            <div className="mt-2 flex flex-wrap gap-2">
-              {(editingProduct.categories || []).map((category) => (
-                <span
-                  key={category}
-                  className="inline-flex items-center px-2 py-1 bg-emerald-100 text-emerald-800"
-                >
-                  {category}
-                  <button
-                    type="button"
-                    onClick={() => removeCategory(category)}
-                    className="ml-1 text-emerald-600 hover:text-emerald-800"
-                  >
-                    <X size={14} />
-                  </button>
-                </span>
-              ))}
-            </div>
-          ) : (
-            <p className="text-xs text-gray-500 mt-1">
-              Please select at least one category
-            </p>
-          )}
-        </div>
-
-        {/* Description */}
-        <div className="md:col-span-2">
-          <label className="block text-sm font-medium text-gray-700 mb-1">
-            Description
-          </label>
-          <textarea
-            value={editingProduct.description || ""}
-            onChange={(e) =>
-              setEditingProduct({
-                ...editingProduct,
-                description: e.target.value,
-              })
-            }
-            rows="4"
-            className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
-            placeholder="Describe your product in detail..."
-          ></textarea>
-        </div>
-
-        {/* Image Upload */}
-        <div className="md:col-span-2">
-          <label className="block text-sm font-medium text-gray-700 mb-1">
-            Product Images <span className="text-gray-500">(Max 5)</span>
-          </label>
-
-          <input
-            type="file"
-            accept="image/*"
-            multiple
-            onChange={(e) => {
-              const files = Array.from(e.target.files).slice(0, 5);
-              setEditingProduct((prev) => ({
-                ...prev,
-                images: [...(prev.images || []), ...files].slice(0, 5),
-              }));
-            }}
-            className="hidden"
-            id="image-upload"
-          />
-          <label
-            htmlFor="image-upload"
-            className="block w-full p-3 border border-gray-300 bg-gray-50 text-center cursor-pointer hover:bg-gray-100"
-          >
-            <span className="text-emerald-600 font-medium">
-              Click to upload images
-            </span>
-          </label>
-
-          {/* Image previews */}
-          {(editingProduct.images || []).length > 0 && (
-            <div className="mt-3">
-              <div className="flex justify-between items-center mb-2">
-                <p className="text-sm text-gray-600">
-                  {editingProduct.images.length}{" "}
-                  {editingProduct.images.length === 1 ? "image" : "images"}{" "}
-                  selected
-                </p>
-                <button
-                  onClick={() =>
-                    setEditingProduct((prev) => ({ ...prev, images: [] }))
-                  }
-                  className="text-sm text-red-600 hover:text-red-800 flex items-center gap-1"
-                >
-                  <Trash2 size={14} />
-                  <span>Clear all</span>
-                </button>
-              </div>
-              <div className="flex flex-wrap gap-2">
-                {editingProduct.images.map((img, idx) => (
-                  <div
-                    key={idx}
-                    className="relative w-20 h-20 border border-gray-200 overflow-hidden"
-                  >
-                    <img
-                      src={URL.createObjectURL(img)}
-                      alt={`Product ${idx + 1}`}
-                      className="w-full h-full object-cover"
-                    />
-                    <button
-                      onClick={() => {
-                        const updated = [...editingProduct.images];
-                        updated.splice(idx, 1);
-                        setEditingProduct((prev) => ({
-                          ...prev,
-                          images: updated,
-                        }));
-                      }}
-                      className="absolute top-0 right-0 bg-white bg-opacity-80 w-6 h-6 flex items-center justify-center text-gray-700 hover:text-red-600"
-                    >
-                      <X size={14} />
-                    </button>
-                  </div>
-                ))}
-              </div>
-            </div>
-          )}
-        </div>
-      </div>
-
-      {/* Actions */}
-      <div className="mt-6 flex justify-between border-t border-gray-200 pt-4">
-        <button
-          onClick={toggleSoldStatus}
-          className={`flex items-center gap-1 px-4 py-2 rounded-md transition-colors ${
-            editingProduct.isSold
-              ? "bg-green-100 text-green-700 hover:bg-green-200"
-              : "bg-red-100 text-red-700 hover:bg-red-200"
-          }`}
-        >
-          <Check size={16} />
-          <span>Mark as {editingProduct.isSold ? "Available" : "Sold"}</span>
-        </button>
-
-        <div className="flex gap-3">
-          <button
-            onClick={onCancel}
-            className="bg-gray-100 text-gray-700 px-4 py-2 hover:bg-gray-200 rounded-md"
-          >
-            Cancel
-          </button>
-          <button
-            onClick={handleSave}
-            className="bg-emerald-600 text-white px-6 py-2 hover:bg-emerald-700 rounded-md"
-          >
-            {editingProduct.id ? "Update Product" : "Add Product"}
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default ProductForm;
diff --git a/frontend/src/index.css b/frontend/src/index.css
index e065eb9..9fd180c 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -1,4 +1,4 @@
 @import "tailwindcss";
 @tailwind base;
 @tailwind components;
-@tailwind utilities;
\ No newline at end of file
+@tailwind utilities;
diff --git a/frontend/src/pages/Home.jsx b/frontend/src/pages/Home.jsx
index 22dc205..594148a 100644
--- a/frontend/src/pages/Home.jsx
+++ b/frontend/src/pages/Home.jsx
@@ -1,12 +1,6 @@
-import { useState, useEffect } from "react";
 import { Link, useNavigate } from "react-router-dom";
-import {
-  Tag,
-  ChevronLeft,
-  ChevronRight,
-  Bookmark,
-  BookmarkCheck,
-} from "lucide-react";
+import { useState, useEffect, useRef } from "react";
+import { Tag, ChevronLeft, ChevronRight, Bookmark, Loader } from "lucide-react";
 
 import FloatingAlert from "../components/FloatingAlert"; // adjust path if needed
 
@@ -14,38 +8,50 @@ const Home = () => {
   const navigate = useNavigate();
   const [listings, setListings] = useState([]);
   const [recommended, setRecommended] = useState([]);
-  const [history, sethistory] = useState([]);
+  const [history, setHistory] = useState([]);
   const [error, setError] = useState(null);
   const [showAlert, setShowAlert] = useState(false);
+  const [isLoading, setIsLoading] = useState({
+    recommendations: true,
+    listings: true,
+    history: true,
+  });
+  const recommendationsFetched = useRef(false);
+  const historyFetched = useRef(false);
 
   //After user data storing the session.
   const storedUser = JSON.parse(sessionStorage.getItem("user"));
 
   const toggleFavorite = async (id) => {
-    const response = await fetch(
-      "http://localhost:3030/api/product/addFavorite",
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
+    try {
+      const response = await fetch(
+        "http://localhost:3030/api/product/addFavorite",
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            userID: storedUser.ID,
+            productID: id,
+          }),
         },
-        body: JSON.stringify({
-          userID: storedUser.ID,
-          productID: id,
-        }),
-      },
-    );
-    const data = await response.json();
-    if (data.success) {
-      setShowAlert(true);
+      );
+      const data = await response.json();
+      if (data.success) {
+        setShowAlert(true);
+        // Close alert after 3 seconds
+        setTimeout(() => setShowAlert(false), 3000);
+      }
+      console.log(`Add Product -> Favorites: ${id}`);
+    } catch (error) {
+      console.error("Error adding favorite:", error);
     }
-    console.log(`Add Product -> History: ${id}`);
   };
 
   const addHistory = async (id) => {
-    const response = await fetch(
-      "http://localhost:3030/api/history/addHistory",
-      {
+    try {
+      await fetch("http://localhost:3030/api/history/addHistory", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
@@ -54,23 +60,23 @@ const Home = () => {
           userID: storedUser.ID,
           productID: id,
         }),
-      },
-    );
+      });
+    } catch (error) {
+      console.error("Error adding to history:", error);
+    }
   };
 
-  function reloadPage() {
-    var doctTimestamp = new Date(performance.timing.domLoading).getTime();
-    var now = Date.now();
-    var tenSec = 10 * 1000;
-    if (now > doctTimestamp + tenSec) {
-      location.reload();
-    }
-  }
-  reloadPage();
-
+  // Fetch recommended products
   useEffect(() => {
-    const fetchrecomProducts = async () => {
+    const fetchRecommendedProducts = async () => {
+      // Skip if already fetched or no user data
+      if (recommendationsFetched.current || !storedUser || !storedUser.ID)
+        return;
+
+      setIsLoading((prev) => ({ ...prev, recommendations: true }));
       try {
+        recommendationsFetched.current = true; // Mark as fetched before the API call
+
         const response = await fetch(
           "http://localhost:3030/api/engine/recommended",
           {
@@ -83,36 +89,42 @@ const Home = () => {
             }),
           },
         );
-        if (!response.ok) throw new Error("Failed to fetch products");
+        if (!response.ok) throw new Error("Failed to fetch recommendations");
 
         const data = await response.json();
         if (data.success) {
           setRecommended(
             data.data.map((product) => ({
               id: product.ProductID,
-              title: product.ProductName, // Use the alias from SQL
+              title: product.ProductName,
               price: product.Price,
-              category: product.Category, // Ensure this gets the category name
-              image: product.ProductImage, // Use the alias for image URL
-              seller: product.SellerName, // Fetch seller name properly
-              datePosted: product.DateUploaded, // Use the actual date
-              isFavorite: false, // Default state
+              category: product.Category,
+              image: product.ProductImage,
+              seller: product.SellerName,
+              datePosted: product.DateUploaded,
+              isFavorite: false,
             })),
           );
-          reloadPage();
         } else {
-          throw new Error(data.message || "Error fetching products");
+          throw new Error(data.message || "Error fetching recommendations");
         }
       } catch (error) {
-        console.error("Error fetching products:", error);
+        console.error("Error fetching recommendations:", error);
         setError(error.message);
+        // Reset the flag if there's an error so it can try again
+        recommendationsFetched.current = false;
+      } finally {
+        setIsLoading((prev) => ({ ...prev, recommendations: false }));
       }
     };
-    fetchrecomProducts();
-  }, []);
 
+    fetchRecommendedProducts();
+  }, [storedUser]); // Keep dependency
+
+  // Fetch all products
   useEffect(() => {
     const fetchProducts = async () => {
+      setIsLoading((prev) => ({ ...prev, listings: true }));
       try {
         const response = await fetch(
           "http://localhost:3030/api/product/getProduct",
@@ -120,18 +132,17 @@ const Home = () => {
         if (!response.ok) throw new Error("Failed to fetch products");
 
         const data = await response.json();
-
         if (data.success) {
           setListings(
             data.data.map((product) => ({
               id: product.ProductID,
-              title: product.ProductName, // Use the alias from SQL
+              title: product.ProductName,
               price: product.Price,
-              category: product.Category, // Ensure this gets the category name
-              image: product.ProductImage, // Use the alias for image URL
-              seller: product.SellerName, // Fetch seller name properly
-              datePosted: product.DateUploaded, // Use the actual date
-              isFavorite: false, // Default state
+              category: product.Category,
+              image: product.ProductImage,
+              seller: product.SellerName,
+              datePosted: product.DateUploaded,
+              isFavorite: false,
             })),
           );
         } else {
@@ -140,15 +151,24 @@ const Home = () => {
       } catch (error) {
         console.error("Error fetching products:", error);
         setError(error.message);
+      } finally {
+        setIsLoading((prev) => ({ ...prev, listings: false }));
       }
     };
+
     fetchProducts();
   }, []);
 
+  // Fetch user history
   useEffect(() => {
-    const fetchrecomProducts = async () => {
-      // Get the user's data from localStorage
+    const fetchUserHistory = async () => {
+      // Skip if already fetched or no user data
+      if (historyFetched.current || !storedUser || !storedUser.ID) return;
+
+      setIsLoading((prev) => ({ ...prev, history: true }));
       try {
+        historyFetched.current = true; // Mark as fetched before the API call
+
         const response = await fetch(
           "http://localhost:3030/api/history/getHistory",
           {
@@ -161,52 +181,168 @@ const Home = () => {
             }),
           },
         );
-        if (!response.ok) throw new Error("Failed to fetch products");
+        if (!response.ok) throw new Error("Failed to fetch history");
 
         const data = await response.json();
         if (data.success) {
-          sethistory(
+          setHistory(
             data.data.map((product) => ({
               id: product.ProductID,
-              title: product.ProductName, // Use the alias from SQL
+              title: product.ProductName,
               price: product.Price,
-              category: product.Category, // Ensure this gets the category name
-              image: product.ProductImage, // Use the alias for image URL
-              seller: product.SellerName, // Fetch seller name properly
-              datePosted: product.DateUploaded, // Use the actual date
+              category: product.Category,
+              image: product.ProductImage,
+              seller: product.SellerName,
+              datePosted: product.DateUploaded,
             })),
           );
         } else {
-          throw new Error(data.message || "Error fetching products");
+          throw new Error(data.message || "Error fetching history");
         }
       } catch (error) {
-        console.error("Error fetching products:", error);
+        console.error("Error fetching history:", error);
         setError(error.message);
+        // Reset the flag if there's an error so it can try again
+        historyFetched.current = false;
+      } finally {
+        setIsLoading((prev) => ({ ...prev, history: false }));
       }
     };
-    fetchrecomProducts();
-  }, []);
+
+    fetchUserHistory();
+  }, [storedUser]); // Keep dependency
 
   const handleSelling = () => {
     navigate("/selling");
   };
 
+  // Loading indicator component
+  const LoadingSection = () => (
+    <div className="flex justify-center items-center h-48">
+      <Loader className="animate-spin text-emerald-600 h-8 w-8" />
+    </div>
+  );
+
+  // Product card component to reduce duplication
+  const ProductCard = ({ product, addToHistory = false }) => (
+    <Link
+      key={product.id}
+      to={`/product/${product.id}`}
+      onClick={addToHistory ? () => addHistory(product.id) : undefined}
+      className="bg-white border border-gray-200 hover:shadow-md transition-shadow w-70 flex-shrink-0 relative"
+    >
+      <div className="relative">
+        <img
+          src={product.image}
+          alt={product.title}
+          className="w-full h-48 object-cover"
+        />
+        <button
+          onClick={(e) => {
+            e.stopPropagation();
+            e.preventDefault();
+            toggleFavorite(product.id);
+          }}
+          className="absolute top-0 right-0 p-2 rounded-bl-md bg-emerald-600 hover:bg-emerald-500 transition shadow-sm"
+        >
+          <Bookmark className="text-white w-5 h-5" />
+        </button>
+      </div>
+
+      <div className="p-4">
+        <h3 className="text-lg font-medium text-gray-800 leading-tight">
+          {product.title}
+        </h3>
+        <span className="font-semibold text-emerald-600 block mt-1">
+          ${product.price}
+        </span>
+
+        <div className="flex items-center text-sm text-gray-500 mt-2">
+          <Tag className="h-4 w-4 mr-1" />
+          <span>{product.category}</span>
+        </div>
+
+        <div className="flex justify-between items-center pt-2 border-t border-gray-100 mt-3">
+          <span className="text-xs text-gray-500">{product.datePosted}</span>
+          <span className="text-sm font-medium text-gray-700">
+            {product.seller}
+          </span>
+        </div>
+      </div>
+    </Link>
+  );
+
+  // Scrollable product list component to reduce duplication
+  const ScrollableProductList = ({
+    containerId,
+    products,
+    children,
+    isLoading,
+    addToHistory = false,
+  }) => (
+    <div className="relative py-4">
+      {children}
+
+      <div className="relative">
+        <button
+          onClick={() =>
+            document
+              .getElementById(containerId)
+              .scrollBy({ left: -400, behavior: "smooth" })
+          }
+          className="absolute left-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
+        >
+          <ChevronLeft size={24} />
+        </button>
+
+        <div
+          id={containerId}
+          className="overflow-x-auto whitespace-nowrap flex space-x-6 scroll-smooth scrollbar-hide px-10 pl-0 rounded min-h-[250px]"
+        >
+          {isLoading ? (
+            <LoadingSection />
+          ) : products.length > 0 ? (
+            products.map((product) => (
+              <ProductCard
+                key={product.id}
+                product={product}
+                addToHistory={addToHistory}
+              />
+            ))
+          ) : (
+            <div className="flex justify-center items-center w-full h-48 text-gray-500">
+              No products available
+            </div>
+          )}
+        </div>
+
+        <button
+          onClick={() =>
+            document
+              .getElementById(containerId)
+              .scrollBy({ left: 400, behavior: "smooth" })
+          }
+          className="absolute right-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
+        >
+          <ChevronRight size={24} />
+        </button>
+      </div>
+    </div>
+  );
+
   return (
     <div className="flex flex-col min-h-screen">
       <div className="flex-grow">
         {/* Hero Section with School Background */}
         <div className="relative py-12 px-4 mb-8 shadow-sm">
-          {/* Background Image - Positioned at bottom */}
           <div className="absolute inset-0 z-0 overflow-hidden bg-black bg-opacity-100">
             <img
               src="../public/Ucalgary.png"
               alt="University of Calgary"
-              className="w-full h-full object-cover object-bottom opacity-50"
+              className="w-full h-full object-cover object-bottom opacity-45"
             />
-            {/* Dark overlay for better text readability */}
           </div>
 
-          {/* Content */}
           <div className="max-w-2xl mx-auto text-center relative z-1">
             <h1 className="text-3xl font-bold text-white mb-4">
               Buy and Sell on Campus
@@ -217,297 +353,60 @@ const Home = () => {
             </p>
             <button
               onClick={handleSelling}
-              className="bg-emerald-500 hover:bg-emerald-600 text-white font-medium py-2 px-6 focus:outline-none focus:ring-2 focus:ring-emerald-400 transition-colors"
+              className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2 px-6 focus:outline-none focus:ring-2 focus:ring-emerald-400 transition-colors"
             >
               Post an Item
             </button>
           </div>
         </div>
 
-        {/* Recent Listings */}
+        {/* Floating Alert */}
         {showAlert && (
           <FloatingAlert
             message="Product added to favorites!"
             onClose={() => setShowAlert(false)}
           />
         )}
-        <div className="relative py-4">
+
+        {/* Recommendations Section */}
+        <ScrollableProductList
+          containerId="RecomContainer"
+          products={recommended}
+          isLoading={isLoading.recommendations}
+          addToHistory={true}
+        >
           <h2 className="text-xl font-semibold text-gray-800 mb-4">
-            Recommendation
+            Recommended For You
           </h2>
+        </ScrollableProductList>
 
-          <div className="relative">
-            {/* Left Button - Overlaid on products */}
-            <button
-              onClick={() =>
-                document
-                  .getElementById("RecomContainer")
-                  .scrollBy({ left: -400, behavior: "smooth" })
-              }
-              className="absolute left-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
-            >
-              <ChevronLeft size={24} />{" "}
-            </button>
-
-            {/* Scrollable Listings Container */}
-            <div
-              id="RecomContainer"
-              className="overflow-x-auto whitespace-nowrap flex space-x-6 scroll-smooth scrollbar-hide px-10 pl-0 rounded"
-            >
-              {recommended.map((recommended) => (
-                <Link
-                  key={recommended.id}
-                  to={`/product/${recommended.id}`}
-                  onClick={() => addHistory(recommended.id)}
-                  className="bg-white border border-gray-200 hover:shadow-md transition-shadow w-70 flex-shrink-0 relative"
-                >
-                  <div className="relative">
-                    <img
-                      src={recommended.image}
-                      alt={recommended.title}
-                      className="w-full h-48 object-cover"
-                    />
-                    <button
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        e.preventDefault();
-                        toggleFavorite(recommended.id);
-                      }}
-                      className="absolute top-0 right-0 p-2 rounded-bl-md bg-emerald-600 hover:bg-emerald-500 transition shadow-sm"
-                    >
-                      <Bookmark className="text-white w-5 h-5" />
-                    </button>
-                  </div>
-
-                  <div className="p-4">
-                    <h3 className="text-lg font-medium text-gray-800 leading-tight">
-                      {recommended.title}
-                    </h3>
-                    <span className="font-semibold text-emerald-600 block mt-1">
-                      ${recommended.price}
-                    </span>
-
-                    <div className="flex items-center text-sm text-gray-500 mt-2">
-                      <Tag className="h-4 w-4 mr-1" />
-                      <span>{recommended.category}</span>
-                    </div>
-
-                    <div className="flex justify-between items-center pt-2 border-t border-gray-100 mt-3">
-                      <span className="text-xs text-gray-500">
-                        {recommended.datePosted}
-                      </span>
-                      <span className="text-sm font-medium text-gray-700">
-                        {recommended.seller}
-                      </span>
-                    </div>
-                  </div>
-                </Link>
-              ))}
-            </div>
-
-            {/* Right Button - Overlaid on products */}
-            <button
-              onClick={() =>
-                document
-                  .getElementById("RecomContainer")
-                  .scrollBy({ left: 400, behavior: "smooth" })
-              }
-              className="absolute right-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
-            >
-              <ChevronRight size={24} />{" "}
-            </button>
-          </div>
-        </div>
-
-        {/* Recent Listings */}
-        {showAlert && (
-          <FloatingAlert
-            message="Product added to favorites!"
-            onClose={() => setShowAlert(false)}
-          />
-        )}
-        <div className="relative py-4">
+        {/* Recent Listings Section */}
+        <ScrollableProductList
+          containerId="listingsContainer"
+          products={listings}
+          isLoading={isLoading.listings}
+          addToHistory={true}
+        >
           <h2 className="text-xl font-semibold text-gray-800 mb-4">
             Recent Listings
           </h2>
-
-          <div className="relative">
-            {/* Left Button - Overlaid on products */}
-            <button
-              onClick={() =>
-                document
-                  .getElementById("listingsContainer")
-                  .scrollBy({ left: -400, behavior: "smooth" })
-              }
-              className="absolute left-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
-            >
-              <ChevronLeft size={24} />{" "}
-            </button>
-
-            {/* Scrollable Listings Container */}
-            <div
-              id="listingsContainer"
-              className="overflow-x-auto whitespace-nowrap flex space-x-6 scroll-smooth scrollbar-hide px-10 pl-0"
-            >
-              {listings.map((listing) => (
-                <Link
-                  key={listing.id}
-                  to={`/product/${listing.id}`}
-                  className="bg-white border border-gray-200 hover:shadow-md transition-shadow w-70 flex-shrink-0 relative"
-                >
-                  <div className="relative">
-                    <img
-                      src={listing.image}
-                      alt={listing.title}
-                      onClick={() => addHistory(listing.id)}
-                      className="w-full h-48 object-cover"
-                    />
-                    <button
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        e.preventDefault();
-                        toggleFavorite(listing.id);
-                      }}
-                      className="absolute top-0 right-0 p-2 rounded-bl-md bg-emerald-600 hover:bg-emerald-500 transition shadow-sm"
-                    >
-                      <Bookmark className="text-white w-5 h-5" />
-                    </button>
-                  </div>
-
-                  <div className="p-4">
-                    <h3 className="text-lg font-medium text-gray-800 leading-tight">
-                      {listing.title}
-                    </h3>
-                    <span className="font-semibold text-emerald-600 block mt-1">
-                      ${listing.price}
-                    </span>
-
-                    <div className="flex items-center text-sm text-gray-500 mt-2">
-                      <Tag className="h-4 w-4 mr-1" />
-                      <span>{listing.category}</span>
-                    </div>
-
-                    <div className="flex justify-between items-center pt-2 border-t border-gray-100 mt-3">
-                      <span className="text-xs text-gray-500">
-                        {listing.datePosted}
-                      </span>
-                      <span className="text-sm font-medium text-gray-700">
-                        {listing.seller}
-                      </span>
-                    </div>
-                  </div>
-                </Link>
-              ))}
-            </div>
-
-            {/* Right Button - Overlaid on products */}
-            <button
-              onClick={() =>
-                document
-                  .getElementById("listingsContainer")
-                  .scrollBy({ left: 400, behavior: "smooth" })
-              }
-              className="absolute right-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
-            >
-              <ChevronRight size={24} />{" "}
-            </button>
-          </div>
-        </div>
+        </ScrollableProductList>
 
         {/* History Section */}
-        {showAlert && (
-          <FloatingAlert
-            message="Product added to favorites!"
-            onClose={() => setShowAlert(false)}
-          />
+        {(history.length > 0 || isLoading.history) && (
+          <ScrollableProductList
+            containerId="HistoryContainer"
+            products={history}
+            isLoading={isLoading.history}
+          >
+            <h2 className="text-xl font-semibold text-gray-800 mb-4">
+              Your Browsing History
+            </h2>
+          </ScrollableProductList>
         )}
-        <div className="relative py-4">
-          <h2 className="text-xl font-semibold text-gray-800 mb-4">History</h2>
-
-          <div className="relative">
-            {/* Left Button - Overlaid on products */}
-            <button
-              onClick={() =>
-                document
-                  .getElementById("HistoryContainer")
-                  .scrollBy({ left: -400, behavior: "smooth" })
-              }
-              className="absolute left-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
-            >
-              <ChevronLeft size={24} />{" "}
-            </button>
-
-            {/* Scrollable Listings Container */}
-            <div
-              id="HistoryContainer"
-              className="overflow-x-auto whitespace-nowrap flex space-x-6 scroll-smooth scrollbar-hide px-10 pl-0"
-            >
-              {history.map((history) => (
-                <Link
-                  key={history.id}
-                  to={`/product/${history.id}`}
-                  className="bg-white border border-gray-200 hover:shadow-md transition-shadow w-70 flex-shrink-0 relative"
-                >
-                  <div className="relative">
-                    <img
-                      src={history.image}
-                      alt={history.title}
-                      className="w-full h-48 object-cover"
-                    />
-                    <button
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        e.preventDefault();
-                        toggleFavorite(history.id);
-                      }}
-                      className="absolute top-0 right-0 p-2 rounded-bl-md bg-emerald-600 hover:bg-emerald-500 transition shadow-sm"
-                    >
-                      <Bookmark className="text-white w-5 h-5" />
-                    </button>
-                  </div>
-
-                  <div className="p-4">
-                    <h3 className="text-lg font-medium text-gray-800 leading-tight">
-                      {history.title}
-                    </h3>
-                    <span className="font-semibold text-emerald-600 block mt-1">
-                      ${history.price}
-                    </span>
-
-                    <div className="flex items-center text-sm text-gray-500 mt-2">
-                      <Tag className="h-4 w-4 mr-1" />
-                      <span>{history.category}</span>
-                    </div>
-
-                    <div className="flex justify-between items-center pt-2 border-t border-gray-100 mt-3">
-                      <span className="text-xs text-gray-500">
-                        {history.datePosted}
-                      </span>
-                      <span className="text-sm font-medium text-gray-700">
-                        {history.seller}
-                      </span>
-                    </div>
-                  </div>
-                </Link>
-              ))}
-            </div>
-
-            {/* Right Button - Overlaid on products */}
-            <button
-              onClick={() =>
-                document
-                  .getElementById("HistoryContainer")
-                  .scrollBy({ left: 400, behavior: "smooth" })
-              }
-              className="absolute right-0 top-1/2 transform -translate-y-1/2 bg-gray-800 bg-opacity-70 text-white p-4 rounded-full z-20 hidden md:flex items-center justify-center w-12 h-12"
-            >
-              <ChevronRight size={24} />{" "}
-            </button>
-          </div>
-        </div>
       </div>
 
-      {/* Footer - Added here */}
+      {/* Footer */}
       <footer className="bg-gray-800 text-white py-6 mt-12">
         <div className="container mx-auto px-4">
           <div className="flex flex-col md:flex-row justify-between items-center">
diff --git a/frontend/src/pages/ProductDetail.jsx b/frontend/src/pages/ProductDetail.jsx
index a5f0d73..ebec8f2 100644
--- a/frontend/src/pages/ProductDetail.jsx
+++ b/frontend/src/pages/ProductDetail.jsx
@@ -1,7 +1,6 @@
 import { useState, useEffect } from "react";
 import { useParams, Link } from "react-router-dom";
 import {
-  Heart,
   ArrowLeft,
   Tag,
   User,
@@ -26,7 +25,6 @@ const ProductDetail = () => {
     reviews: null,
     submit: null,
   });
-  const [isFavorite, setIsFavorite] = useState(false);
   const [showContactOptions, setShowContactOptions] = useState(false);
   const [currentImage, setCurrentImage] = useState(0);
   const [reviews, setReviews] = useState([]);
@@ -52,7 +50,6 @@ const ProductDetail = () => {
     if (data.success) {
       setShowAlert(true);
     }
-    console.log(`Add Product -> History: ${id}`);
   };
 
   const [reviewForm, setReviewForm] = useState({
@@ -248,7 +245,7 @@ const ProductDetail = () => {
   if (loading.product) {
     return (
       <div className="flex justify-center items-center h-screen">
-        <div className="animate-spin h-32 w-32 border-t-2 border-green-500"></div>
+        <div className="animate-spin h-32 w-32 border-t-2 border-emerald-600"></div>
       </div>
     );
   }
@@ -262,7 +259,7 @@ const ProductDetail = () => {
           <p className="text-gray-600">{error.product}</p>
           <Link
             to="/"
-            className="mt-4 inline-block bg-green-500 text-white px-4 py-2 hover:bg-green-600"
+            className="mt-4 inline-block bg-emerald-600 text-white px-4 py-2 hover:bg-emerald-700"
           >
             Back to Listings
           </Link>
@@ -279,7 +276,7 @@ const ProductDetail = () => {
           <h2 className="text-2xl text-red-500 mb-4">Product Not Found</h2>
           <Link
             to="/"
-            className="mt-4 inline-block bg-green-500 text-white px-4 py-2  hover:bg-green-600"
+            className="mt-4 inline-block bg-emerald-600 text-white px-4 py-2  hover:bg-emerald-700"
           >
             Back to Listings
           </Link>
@@ -291,15 +288,15 @@ const ProductDetail = () => {
   // Render product details
   return (
     <div className="max-w-6xl mx-auto px-4 py-8">
-      <div className="mb-6">
+      {/* <div className="mb-6">
         <Link
           to="/search"
-          className="flex items-center text-green-600 hover:text-green-700"
+          className="flex items-center text-emerald-700 hover:text-emerald-700"
         >
           <ArrowLeft className="h-4 w-4 mr-1" />
           <span>Back</span>
         </Link>
-      </div>
+      </div> */}
       {showAlert && (
         <FloatingAlert
           message="Product added to favorites!"
@@ -351,7 +348,7 @@ const ProductDetail = () => {
               {product.images.map((image, index) => (
                 <div
                   key={index}
-                  className={`bg-white border ${currentImage === index ? "border-green-500 border-2" : "border-gray-200"} min-w-[100px] cursor-pointer`}
+                  className={`bg-white border ${currentImage === index ? "border-emerald-600 border-2" : "border-gray-200"} min-w-[100px] cursor-pointer`}
                   onClick={() => selectImage(index)}
                 >
                   <img
@@ -381,13 +378,13 @@ const ProductDetail = () => {
                   e.preventDefault();
                   toggleFavorite(product.ProductID);
                 }}
-                className="top-0 p-2 rounded-bl-md bg-emerald-600 hover:bg-emerald-500 transition shadow-sm"
+                className="top-0 p-2 rounded-bl-md bg-emerald-700 hover:bg-emerald-600 transition shadow-sm"
               >
                 <Bookmark className="text-white w-5 h-5" />
               </button>
             </div>
 
-            <div className="text-2xl font-bold text-green-600 mb-4">
+            <div className="text-2xl font-bold text-emerald-700 mb-4">
               $
               {typeof product.Price === "number"
                 ? product.Price.toFixed(2)
@@ -418,7 +415,7 @@ const ProductDetail = () => {
             <div className="relative">
               <button
                 onClick={() => setShowContactOptions(!showContactOptions)}
-                className="w-full bg-green-500 hover:bg-green-600 text-white font-medium py-3 px-4 mb-3"
+                className="w-full bg-emerald-700 hover:bg-emerald-700 text-white font-medium py-3 px-4 mb-3"
               >
                 Contact Seller
               </button>
@@ -430,7 +427,7 @@ const ProductDetail = () => {
                       href={`tel:${product.SellerPhone}`}
                       className="flex items-center gap-2 p-3 hover:bg-gray-50 border-b border-gray-100"
                     >
-                      <Phone className="h-5 w-5 text-green-500" />
+                      <Phone className="h-5 w-5 text-emerald-600" />
                       <span>Call Seller</span>
                     </a>
                   )}
@@ -440,7 +437,7 @@ const ProductDetail = () => {
                       href={`mailto:${product.SellerEmail}`}
                       className="flex items-center gap-2 p-3 hover:bg-gray-50"
                     >
-                      <Mail className="h-5 w-5 text-green-500" />
+                      <Mail className="h-5 w-5 text-emerald-600" />
                       <span>Email Seller</span>
                     </a>
                   )}
@@ -477,7 +474,7 @@ const ProductDetail = () => {
         <div className="bg-white border border-gray-200 p-6">
           {loading.reviews ? (
             <div className="flex justify-center py-8">
-              <div className="animate-spin h-8 w-8 border-t-2 border-green-500"></div>
+              <div className="animate-spin h-8 w-8 border-t-2 border-emerald-600"></div>
             </div>
           ) : error.reviews ? (
             <div className="text-red-500 mb-4">
@@ -524,7 +521,7 @@ const ProductDetail = () => {
         <div className="mt-4">
           <button
             onClick={() => setShowReviewForm(true)}
-            className="bg-green-500 hover:bg-green-600 text-white font-medium py-2 px-4"
+            className="bg-emerald-600 hover:bg-emerald-700 text-white font-medium py-2 px-4"
           >
             Write a Review
           </button>
@@ -582,7 +579,7 @@ const ProductDetail = () => {
                     id="comment"
                     value={reviewForm.comment}
                     onChange={handleReviewInputChange}
-                    className="w-full p-3 border border-gray-300 focus:outline-none focus:border-green-500"
+                    className="w-full p-3 border border-gray-300 focus:outline-none focus:border-emerald-600"
                     rows="4"
                     required
                   ></textarea>
@@ -598,7 +595,7 @@ const ProductDetail = () => {
                   </button>
                   <button
                     type="submit"
-                    className="px-4 py-2 bg-green-500 text-white  hover:bg-green-600"
+                    className="px-4 py-2 bg-emerald-600 text-white  hover:bg-emerald-700"
                     disabled={loading.submitting}
                   >
                     {loading.submitting ? "Submitting..." : "Submit Review"}
diff --git a/frontend/src/pages/Selling.jsx b/frontend/src/pages/Selling.jsx
index 99de591..adb1db4 100644
--- a/frontend/src/pages/Selling.jsx
+++ b/frontend/src/pages/Selling.jsx
@@ -1,95 +1,264 @@
 import { useState, useEffect } from "react";
-import ProductForm from "../components/ProductForm";
+import { useLocation, Link } from "react-router-dom";
+import { X, ChevronLeft, Plus, Trash2 } from "lucide-react";
 
 const Selling = () => {
-  // State to store user's products
   const [products, setProducts] = useState([]);
-  // State to control when editing form is shown
   const [showForm, setShowForm] = useState(false);
-  // State to store the product being edited (or empty for new product)
+  const storedUser = JSON.parse(sessionStorage.getItem("user"));
+  const [categories, setCategories] = useState([]);
+  const [categoryMapping, setCategoryMapping] = useState({});
+  const [selectedCategory, setSelectedCategory] = useState("");
+  const [originalProduct, setOriginalProduct] = useState(null);
+
   const [editingProduct, setEditingProduct] = useState({
     name: "",
     price: "",
     description: "",
     categories: [],
-    status: "Unsold",
     images: [],
   });
 
+  function reloadPage() {
+    var doctTimestamp = new Date(performance.timing.domLoading).getTime();
+    var now = Date.now();
+    if (now > doctTimestamp) {
+      location.reload();
+    }
+  }
+
+  // Fetch categories from API
+  useEffect(() => {
+    const fetchCategories = async () => {
+      try {
+        const response = await fetch("http://localhost:3030/api/category");
+        if (!response.ok) throw new Error("Failed to fetch categories");
+
+        const responseJson = await response.json();
+        const data = responseJson.data;
+
+        // Create an array of category names for the dropdown
+        const categoryNames = [];
+        const mapping = {};
+
+        // Process the data properly to avoid rendering objects
+        Object.entries(data).forEach(([id, name]) => {
+          // Make sure each category name is a string
+          const categoryName = String(name);
+          categoryNames.push(categoryName);
+          mapping[categoryName] = parseInt(id);
+        });
+
+        setCategories(categoryNames);
+        setCategoryMapping(mapping);
+      } catch (error) {
+        console.error("Error fetching categories:", error);
+      }
+    };
+
+    fetchCategories();
+  }, []);
+
   // Simulate fetching products from API/database on component mount
   useEffect(() => {
-    // This would be replaced with a real API call
     const fetchProducts = async () => {
-      // Mock data
-      const mockProducts = [
-        {
-          id: "1",
-          name: "Vintage Camera",
-          price: "299.99",
-          description: "A beautiful vintage film camera in excellent condition",
-          categories: ["Electronics", "Art & Collectibles"],
-          status: "Unsold",
-          images: ["/public/Pictures/Dell1.jpg"],
-        },
-        {
-          id: "2",
-          name: "Leather Jacket",
-          price: "149.50",
-          description: "Genuine leather jacket, worn only a few times",
-          categories: ["Clothing"],
-          status: "Unsold",
-          images: [],
-        },
-      ];
+      try {
+        // Replace with your actual API endpoint
+        const response = await fetch(
+          "http://localhost:3030/api/product/myProduct",
+          {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+              userID: storedUser.ID,
+            }),
+          },
+        );
 
-      setProducts(mockProducts);
+        if (!response.ok) {
+          throw new Error("Network response was not ok");
+        }
+        const datajson = await response.json();
+        setProducts(datajson.data);
+      } catch (error) {
+        console.error("Error fetching products:", error);
+        // You might want to set an error state here
+      }
     };
 
     fetchProducts();
-  }, []);
+  }, []); // Add userId to dependency array if it might change
 
-  // Handle creating or updating a product
-  const handleSaveProduct = () => {
-    if (editingProduct.id) {
-      // Update existing product
-      setProducts(
-        products.map((p) => (p.id === editingProduct.id ? editingProduct : p)),
-      );
-    } else {
-      // Create new product
-      const newProduct = {
-        ...editingProduct,
-        id: Date.now().toString(), // Generate a temporary ID
-      };
-      setProducts([...products, newProduct]);
+  // When editing a product, save the original product properly
+  const handleEditProduct = (product) => {
+    // Save the original product completely
+    setOriginalProduct(product);
+
+    // Convert category ID to category name if needed
+    const categoryName = getCategoryNameById(product.CategoryID);
+
+    setEditingProduct({
+      ...product,
+      categories: categoryName ? [categoryName] : [],
+      images: product.images || [], // Ensure images array exists
+    });
+
+    setShowForm(true);
+  };
+
+  // Then update the handleSaveProduct function to properly merge values
+  const handleSaveProduct = async () => {
+    if (!(editingProduct.categories || []).length) {
+      alert("Please select at least one category");
+      return;
     }
 
-    // Reset form and hide it
-    setShowForm(false);
-    setEditingProduct({
-      name: "",
-      price: "",
-      description: "",
-      categories: [],
-      status: "Unsold",
-      images: [],
-    });
+    try {
+      const imagePaths = [];
+
+      // Handle images properly
+      if (editingProduct.images && editingProduct.images.length > 0) {
+        // If there are new images uploaded (File objects)
+        const newImages = editingProduct.images.filter(
+          (img) => img instanceof File,
+        );
+        newImages.forEach((file) => {
+          const simulatedPath = `/public/uploads/${file.name}`;
+          imagePaths.push(simulatedPath);
+        });
+
+        // Also include any existing image URLs that are strings, not File objects
+        const existingImages = editingProduct.images.filter(
+          (img) => typeof img === "string",
+        );
+        if (existingImages.length > 0) {
+          imagePaths.push(...existingImages);
+        }
+      } else if (originalProduct?.image_url) {
+        // If no new images but there was an original image URL
+        imagePaths.push(originalProduct.image_url);
+      }
+
+      const categoryName = (editingProduct.categories || [])[0];
+      const categoryID =
+        categoryMapping[categoryName] || originalProduct?.CategoryID || 1;
+
+      // Create payload with proper fallback to original values
+      const payload = {
+        name:
+          editingProduct.Name ||
+          editingProduct.name ||
+          originalProduct?.Name ||
+          "",
+        price: parseFloat(
+          editingProduct.Price ||
+            editingProduct.price ||
+            originalProduct?.Price ||
+            0,
+        ),
+        qty: 1,
+        userID: storedUser.ID,
+        description:
+          editingProduct.Description ||
+          editingProduct.description ||
+          originalProduct?.Description ||
+          "",
+        category: categoryID,
+        images:
+          imagePaths.length > 0
+            ? imagePaths
+            : originalProduct?.image_url
+              ? [originalProduct.image_url]
+              : [],
+      };
+
+      console.log("Sending payload:", payload);
+
+      const endpoint = editingProduct.ProductID
+        ? `http://localhost:3030/api/product/update/${editingProduct.ProductID}`
+        : "http://localhost:3030/api/product/addProduct";
+
+      const method = editingProduct.ProductID ? "PUT" : "POST";
+
+      const response = await fetch(endpoint, {
+        method,
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(payload),
+      });
+
+      if (!response.ok) {
+        const errorData = await response.text();
+        throw new Error(
+          `${editingProduct.ProductID ? "Failed to update" : "Failed to add"} product: ${errorData}`,
+        );
+      }
+
+      const data = await response.json();
+      console.log("Product saved:", data);
+
+      // Reset form and hide it
+      setShowForm(false);
+      setEditingProduct({
+        name: "",
+        price: "",
+        description: "",
+        categories: [],
+        images: [],
+      });
+
+      setOriginalProduct(null); // reset original as well
+
+      reloadPage();
+    } catch (error) {
+      console.error("Error saving product:", error);
+      alert(`Error saving product: ${error.message}`);
+    }
   };
 
   // Handle product deletion
-  const handleDeleteProduct = (productId) => {
-    if (window.confirm("Are you sure you want to delete this product?")) {
-      setProducts(products.filter((p) => p.id !== productId));
+  const handleDeleteProduct = async (productId) => {
+    try {
+      // Replace with your actual API endpoint
+      const response = await fetch(
+        "http://localhost:3030/api/product/delProduct",
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            userID: storedUser.ID,
+            productID: productId,
+          }),
+        },
+      );
+      reloadPage();
+      console.log("deleteproodidt");
+
+      if (!response.ok) {
+        throw new Error("Network response was not ok");
+      }
+    } catch (error) {
+      console.error("Error fetching products:", error);
+      // You might want to set an error state here
     }
   };
 
-  // Handle editing a product
-  const handleEditProduct = (product) => {
-    setEditingProduct({
-      ...product,
-      images: product.images || [], // Ensure images array exists
-    });
-    setShowForm(true);
+  // Helper function to get category name from ID
+  const getCategoryNameById = (categoryId) => {
+    if (!categoryId || !categoryMapping) return null;
+
+    // Find the category name by ID
+    for (const [name, id] of Object.entries(categoryMapping)) {
+      if (id === categoryId) {
+        return name;
+      }
+    }
+    return null;
   };
 
   // Handle adding a new product
@@ -99,12 +268,54 @@ const Selling = () => {
       price: "",
       description: "",
       categories: [],
-      status: "Unsold",
       images: [],
     });
     setShowForm(true);
   };
 
+  const addCategory = () => {
+    if (
+      selectedCategory &&
+      !(editingProduct.categories || []).includes(selectedCategory)
+    ) {
+      setEditingProduct((prev) => ({
+        ...prev,
+        categories: [...(prev.categories || []), selectedCategory],
+      }));
+      setSelectedCategory("");
+    }
+  };
+
+  const removeCategory = (categoryToRemove) => {
+    setEditingProduct((prev) => ({
+      ...prev,
+      categories: (prev.categories || []).filter(
+        (cat) => cat !== categoryToRemove,
+      ),
+    }));
+  };
+
+  const markAsSold = async () => {
+    // This would call an API to move the product to the transaction table
+    try {
+      // API call would go here
+      console.log(
+        "Moving product to transaction table:",
+        editingProduct.ProductID,
+      );
+
+      // Toggle the sold status in the UI
+      setEditingProduct((prev) => ({
+        ...prev,
+        isSold: !prev.isSold,
+      }));
+
+      // You would add your API call here to update the backend
+    } catch (error) {
+      console.error("Error marking product as sold:", error);
+    }
+  };
+
   return (
     <div className="container mx-auto p-4 max-w-6xl">
       <div className="flex justify-between items-center mb-6">
@@ -120,12 +331,279 @@ const Selling = () => {
       </div>
 
       {showForm ? (
-        <ProductForm
-          editingProduct={editingProduct}
-          setEditingProduct={setEditingProduct}
-          onSave={handleSaveProduct}
-          onCancel={() => setShowForm(false)}
-        />
+        <div className="bg-white border border-gray-200 shadow-md p-6">
+          {/* Back Button */}
+          <button
+            onClick={() => setShowForm(false)}
+            className="mb-4 text-emerald-600 hover:text-emerald-800 flex items-center gap-1"
+          >
+            <ChevronLeft size={16} />
+            <span>Back to Listings</span>
+          </button>
+
+          <h3 className="text-xl font-bold text-gray-800 mb-6 border-b border-gray-200 pb-3">
+            {editingProduct?.ProductID
+              ? "Edit Your Product"
+              : "List a New Product"}
+          </h3>
+
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            {/* Product Name */}
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                Product Name
+              </label>
+              <input
+                type="text"
+                value={editingProduct.Name || editingProduct.name || ""}
+                onChange={(e) =>
+                  setEditingProduct({
+                    ...editingProduct,
+                    Name: e.target.value,
+                    name: e.target.value,
+                  })
+                }
+                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
+              />
+            </div>
+
+            {/* Price */}
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                Price ($)
+              </label>
+              <input
+                type="number"
+                value={editingProduct.Price || editingProduct.price || ""}
+                onChange={(e) =>
+                  setEditingProduct({
+                    ...editingProduct,
+                    Price: e.target.value,
+                    price: e.target.value,
+                  })
+                }
+                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
+              />
+            </div>
+
+            {/* Sold Status */}
+            <div className="md:col-span-2">
+              <div className="flex items-center mt-2">
+                {editingProduct.isSold && (
+                  <span className="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-red-100 text-red-800">
+                    Sold
+                  </span>
+                )}
+              </div>
+            </div>
+
+            {/* Categories */}
+            <div className="md:col-span-2">
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                Categories
+              </label>
+              <div className="flex gap-2">
+                <select
+                  value={selectedCategory}
+                  onChange={(e) => setSelectedCategory(e.target.value)}
+                  className="flex-1 px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
+                >
+                  <option value="" disabled>
+                    Select a category
+                  </option>
+                  {categories
+                    .filter(
+                      (cat) => !(editingProduct.categories || []).includes(cat),
+                    )
+                    .map((category, index) => (
+                      <option key={index} value={category}>
+                        {category}
+                      </option>
+                    ))}
+                </select>
+                <button
+                  type="button"
+                  onClick={addCategory}
+                  disabled={!selectedCategory}
+                  className="px-3 py-2 bg-emerald-600 text-white hover:bg-emerald-700 disabled:bg-gray-300 disabled:cursor-not-allowed flex items-center gap-1"
+                >
+                  <Plus size={16} />
+                  <span>Add</span>
+                </button>
+              </div>
+
+              {/* Selected Categories */}
+              {(editingProduct.categories || []).length > 0 ? (
+                <div className="mt-2 flex flex-wrap gap-2">
+                  {(editingProduct.categories || []).map((category, index) => (
+                    <span
+                      key={index}
+                      className="inline-flex items-center px-2 py-1 bg-emerald-100 text-emerald-800"
+                    >
+                      {category}
+                      <button
+                        type="button"
+                        onClick={() => removeCategory(category)}
+                        className="ml-1 text-emerald-600 hover:text-emerald-800"
+                      >
+                        <X size={14} />
+                      </button>
+                    </span>
+                  ))}
+                </div>
+              ) : (
+                <p className="text-xs text-gray-500 mt-1">
+                  Please select at least one category
+                </p>
+              )}
+            </div>
+
+            {/* Description */}
+            <div className="md:col-span-2">
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                Description
+              </label>
+              <textarea
+                value={
+                  editingProduct.Description || editingProduct.description || ""
+                }
+                onChange={(e) =>
+                  setEditingProduct({
+                    ...editingProduct,
+                    Description: e.target.value,
+                    description: e.target.value,
+                  })
+                }
+                rows="4"
+                className="w-full px-3 py-2 border border-gray-300 focus:border-emerald-500 focus:outline-none"
+                placeholder="Describe your product in detail..."
+              ></textarea>
+            </div>
+
+            {/* Image Upload */}
+            <div className="md:col-span-2">
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                Product Images <span className="text-gray-500">(Max 5)</span>
+              </label>
+
+              <input
+                type="file"
+                accept="image/*"
+                multiple
+                onChange={(e) => {
+                  const files = Array.from(e.target.files).slice(0, 5);
+                  setEditingProduct((prev) => ({
+                    ...prev,
+                    images: [...(prev.images || []), ...files].slice(0, 5),
+                  }));
+                }}
+                className="hidden"
+                id="image-upload"
+              />
+              <label
+                htmlFor="image-upload"
+                className="block w-full p-3 border border-gray-300 bg-gray-50 text-center cursor-pointer hover:bg-gray-100"
+              >
+                <span className="text-emerald-600 font-medium">
+                  Click to upload images
+                </span>
+              </label>
+
+              {/* Image previews */}
+              {(editingProduct.images || []).length > 0 && (
+                <div className="mt-3">
+                  <div className="flex justify-between items-center mb-2">
+                    <p className="text-sm text-gray-600">
+                      {editingProduct.images.length}{" "}
+                      {editingProduct.images.length === 1 ? "image" : "images"}{" "}
+                      selected
+                    </p>
+                    <button
+                      onClick={() =>
+                        setEditingProduct((prev) => ({ ...prev, images: [] }))
+                      }
+                      className="text-sm text-red-600 hover:text-red-800 flex items-center gap-1"
+                    >
+                      <Trash2 size={14} />
+                      <span>Clear all</span>
+                    </button>
+                  </div>
+                  <div className="flex flex-wrap gap-2">
+                    {editingProduct.images.map((img, idx) => (
+                      <div
+                        key={idx}
+                        className="relative w-20 h-20 border border-gray-200 overflow-hidden"
+                      >
+                        <img
+                          src={URL.createObjectURL(img)}
+                          alt={`Product ${idx + 1}`}
+                          className="w-full h-full object-cover"
+                        />
+                        <button
+                          onClick={() => {
+                            const updated = [...editingProduct.images];
+                            updated.splice(idx, 1);
+                            setEditingProduct((prev) => ({
+                              ...prev,
+                              images: updated,
+                            }));
+                          }}
+                          className="absolute top-0 right-0 bg-white bg-opacity-80 w-6 h-6 flex items-center justify-center text-gray-700 hover:text-red-600"
+                        >
+                          <X size={14} />
+                        </button>
+                      </div>
+                    ))}
+                  </div>
+                </div>
+              )}
+
+              {/* Show current image if editing */}
+              {editingProduct.image_url && (
+                <div className="mt-3">
+                  <p className="text-sm text-gray-600 mb-2">Current image:</p>
+                  <div className="relative w-20 h-20 border border-gray-200 overflow-hidden">
+                    <img
+                      src={editingProduct.image_url}
+                      alt="Current product"
+                      className="w-full h-full object-cover"
+                    />
+                  </div>
+                </div>
+              )}
+            </div>
+          </div>
+
+          {/* Actions */}
+          <div className="mt-6 flex justify-end gap-3 border-t border-gray-200 pt-4">
+            <button
+              onClick={() => setShowForm(false)}
+              className="bg-gray-100 text-gray-700 px-4 py-2 hover:bg-gray-200 rounded-md"
+            >
+              Cancel
+            </button>
+
+            {editingProduct.ProductID && (
+              <button
+                onClick={markAsSold}
+                className={`px-4 py-2 rounded-md transition-colors ${
+                  editingProduct.isSold
+                    ? "bg-green-600 text-white hover:bg-green-700"
+                    : "bg-red-600 text-white hover:bg-red-700"
+                }`}
+              >
+                Mark as {editingProduct.isSold ? "Available" : "Sold"}
+              </button>
+            )}
+
+            <button
+              onClick={handleSaveProduct}
+              className="bg-emerald-600 text-white px-6 py-2 hover:bg-emerald-700 rounded-md"
+            >
+              {editingProduct.ProductID ? "Update Product" : "Add Product"}
+            </button>
+          </div>
+        </div>
       ) : (
         <>
           {products.length === 0 ? (
@@ -143,75 +621,72 @@ const Selling = () => {
           ) : (
             <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
               {products.map((product) => (
-                <div
-                  key={product.id}
-                  className="border-2 border-gray-200 overflow-hidden hover:shadow-md transition-shadow"
+                <Link
+                  key={product.ProductID}
+                  to={`/product/${product.ProductID}`}
                 >
-                  <div className="h-48 bg-gray-200 flex items-center justify-center">
-                    {product.images && product.images.length > 0 ? (
-                      <img
-                        src={product.images[0] || ""}
-                        alt={product.name}
-                        className="w-full h-full object-cover"
-                      />
-                    ) : (
-                      <div className="text-gray-400">No image</div>
-                    )}
-                  </div>
-
-                  <div className="p-4">
-                    <div className="flex justify-between items-start">
-                      <h3 className="text-lg font-semibold text-gray-800">
-                        {product.name}
-                      </h3>
-                      <span
-                        className={`px-2 py-1 text-xs ${
-                          product.status === "Sold"
-                            ? "bg-gray-200 text-gray-700"
-                            : "bg-emerald-100 text-emerald-800"
-                        }`}
-                      >
-                        {product.status}
-                      </span>
+                  <div className="border-2 border-gray-200 overflow-hidden hover:shadow-md transition-shadow">
+                    <div className="h-48 bg-gray-200 flex items-center justify-center">
+                      {product.image_url && product.image_url.length > 0 ? (
+                        <img
+                          src={product.image_url || ""}
+                          alt={product.Name}
+                          className="w-full h-full object-cover"
+                        />
+                      ) : (
+                        <div className="text-gray-400">No image</div>
+                      )}
                     </div>
 
-                    <p className="text-emerald-600 font-bold mt-1">
-                      ${product.price}
-                    </p>
-
-                    {product.categories && product.categories.length > 0 && (
-                      <div className="mt-2 flex flex-wrap gap-1">
-                        {product.categories.map((category) => (
-                          <span
-                            key={category}
-                            className="text-xs bg-gray-100 text-gray-600 px-2 py-1 "
-                          >
-                            {category}
-                          </span>
-                        ))}
+                    <div className="p-4">
+                      <div className="flex justify-between items-start">
+                        <h3 className="text-lg font-semibold text-gray-800">
+                          {product.Name}
+                        </h3>
                       </div>
-                    )}
 
-                    <p className="text-gray-500 text-sm mt-2 line-clamp-2">
-                      {product.description}
-                    </p>
+                      <p className="text-emerald-600 font-bold mt-1">
+                        ${product.Price}
+                      </p>
 
-                    <div className="mt-4 flex justify-end gap-2">
-                      <button
-                        onClick={() => handleDeleteProduct(product.id)}
-                        className="text-red-600 hover:text-red-800"
-                      >
-                        Delete
-                      </button>
-                      <button
-                        onClick={() => handleEditProduct(product)}
-                        className="text-emerald-600 hover:text-emerald-800 font-medium"
-                      >
-                        Edit
-                      </button>
+                      {product.CategoryID && (
+                        <div className="mt-2 flex flex-wrap gap-1">
+                          <span className="text-xs bg-gray-100 text-gray-600 px-2 py-1">
+                            {getCategoryNameById(product.CategoryID) ||
+                              product.CategoryID}
+                          </span>
+                        </div>
+                      )}
+
+                      <p className="text-gray-500 text-sm mt-2 line-clamp-2">
+                        {product.Description}
+                      </p>
+
+                      <div className="mt-4 flex justify-end gap-2">
+                        <button
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            e.preventDefault();
+                            handleDeleteProduct(product.ProductID);
+                          }}
+                          className="text-red-600 hover:text-red-800"
+                        >
+                          Delete
+                        </button>
+                        <button
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            e.preventDefault();
+                            handleEditProduct(product);
+                          }}
+                          className="text-emerald-600 hover:text-emerald-800 font-medium"
+                        >
+                          Edit
+                        </button>
+                      </div>
                     </div>
                   </div>
-                </div>
+                </Link>
               ))}
             </div>
           )}
diff --git a/recommondation-engine/__pycache__/app.cpython-313.pyc b/recommondation-engine/__pycache__/app.cpython-313.pyc
index f5efd97..1a5844b 100644
Binary files a/recommondation-engine/__pycache__/app.cpython-313.pyc and b/recommondation-engine/__pycache__/app.cpython-313.pyc differ
diff --git a/recommondation-engine/app.py b/recommondation-engine/app.py
index 748fd56..fafd72f 100644
--- a/recommondation-engine/app.py
+++ b/recommondation-engine/app.py
@@ -3,7 +3,7 @@ import mysql.connector
 from sklearn.metrics.pairwise import cosine_similarity
 import numpy as np
 import logging
-from unittest import result
+import random
 
 def database():
     db_connection = mysql.connector.connect(
@@ -14,145 +14,257 @@ def database():
     )
     return db_connection
 
-def get_popular_products():
-    pass
-
-
-def delete_user_recommendation(userID, Array):
+def delete_user_recommendations(user_id):
     db_con = database()
     cursor = db_con.cursor()
 
     try:
-        for item in Array:
-            #Product ID starts form index 1
-            item_value = item + 1
-            print(item_value)
-            # Use parameterized queries to prevent SQL injection
-            cursor.execute(f"INTO Recommendation (UserID, RecommendedProductID) VALUES ({userID}, {item_value});")
-
+        cursor.execute("DELETE FROM Recommendation WHERE UserID = %s", (user_id,))
         db_con.commit()
+        print(f"Deleted existing recommendations for user {user_id}")
+        logging.info(f"Deleted existing recommendations for user {user_id}")
+        return True
+    except Exception as e:
+        logging.error(f"Error deleting recommendations for user {user_id}: {str(e)}")
+        db_con.rollback()
+        return False
+    finally:
+        cursor.close()
+        db_con.close()
 
-        #results = cursor.fetchall()
-        #print(results)
-    except:
-        pass
-
-def get_all_products():
-
+def get_random_products(count=10, exclude_list=None):
+    """Get random products from the database, excluding any in the exclude_list"""
     db_con = database()
     cursor = db_con.cursor()
 
-    cursor.execute("SELECT CategoryID FROM Category")
-    categories = cursor.fetchall()
+    try:
+        if exclude_list and len(exclude_list) > 0:
+            # Convert exclude_list to string for SQL IN clause
+            exclude_str = ', '.join(map(str, exclude_list))
+            cursor.execute(f"SELECT ProductID FROM Product WHERE ProductID NOT IN ({exclude_str}) ORDER BY RAND() LIMIT {count}")
+        else:
+            cursor.execute(f"SELECT ProductID FROM Product ORDER BY RAND() LIMIT {count}")
 
-    select_clause = "SELECT p.ProductID"
-    for category in categories:
-        category_id = category[0]
-        select_clause += f", MAX(CASE WHEN pc.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
+        random_products = [row[0] for row in cursor.fetchall()]
+        return random_products
 
-    final_query = f"""
-        {select_clause}
-        FROM Product p
-        LEFT JOIN Product_Category pc ON p.ProductID = pc.ProductID
-        LEFT JOIN Category c ON pc.CategoryID = c.CategoryID
-        GROUP BY p.ProductID;
-        """
+    except Exception as e:
+        logging.error(f"Error getting random products: {str(e)}")
+        return []
+    finally:
+        cursor.close()
+        db_con.close()
 
-    cursor.execute(final_query)
-    results = cursor.fetchall()
+def get_popular_products(count=10):
+    """Get popular products based on history table frequency"""
+    db_con = database()
+    cursor = db_con.cursor()
 
-    final = []
-    for row in results:
-        text_list = list(row)
-        text_list.pop(0)
-        final.append(text_list)
+    try:
+        # Get products that appear most frequently in history
+        cursor.execute("""
+            SELECT ProductID, COUNT(*) as count
+            FROM History
+            GROUP BY ProductID
+            ORDER BY count DESC
+            LIMIT %s
+        """, (count,))
 
-    cursor.close()
-    db_con.close()
-    return final
+        popular_products = [row[0] for row in cursor.fetchall()]
+
+        # If not enough popular products, supplement with random ones
+        if len(popular_products) < count:
+            random_products = get_random_products(count - len(popular_products), popular_products)
+            popular_products.extend(random_products)
+
+        return popular_products
+
+    except Exception as e:
+        logging.error(f"Error getting popular products: {str(e)}")
+        return get_random_products(count)  # Fallback to random products
+    finally:
+        cursor.close()
+        db_con.close()
+
+def has_user_history_or_recommendations(user_id):
+    """Check if user exists in History or Recommendation table"""
+    db_con = database()
+    cursor = db_con.cursor()
+
+    try:
+        # Check if user has history
+        cursor.execute("SELECT COUNT(*) FROM History WHERE UserID = %s", (user_id,))
+        history_count = cursor.fetchone()[0]
+
+        # Check if user has recommendations
+        cursor.execute("SELECT COUNT(*) FROM Recommendation WHERE UserID = %s", (user_id,))
+        recommendation_count = cursor.fetchone()[0]
+
+        return history_count > 0 or recommendation_count > 0
+
+    except Exception as e:
+        logging.error(f"Error checking user history/recommendations: {str(e)}")
+        return False
+    finally:
+        cursor.close()
+        db_con.close()
+
+def get_all_products():
+    db_con = database()
+    cursor = db_con.cursor()
+
+    try:
+        cursor.execute("SELECT CategoryID FROM Category")
+        categories = cursor.fetchall()
+
+        select_clause = "SELECT p.ProductID"
+        for category in categories:
+            category_id = category[0]
+            select_clause += f", MAX(CASE WHEN pc.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
+
+        final_query = f"""
+            {select_clause}
+            FROM Product p
+            LEFT JOIN Product_Category pc ON p.ProductID = pc.ProductID
+            LEFT JOIN Category c ON pc.CategoryID = c.CategoryID
+            GROUP BY p.ProductID;
+            """
+
+        cursor.execute(final_query)
+        results = cursor.fetchall()
+
+        final = []
+        product_ids = []
+        for row in results:
+            text_list = list(row)
+            product_id = text_list.pop(0)  # Save the product ID before removing it
+            final.append(text_list)
+            product_ids.append(product_id)
+
+        cursor.close()
+        db_con.close()
+        return final, product_ids  # Return both feature vectors and product IDs
+    except Exception as e:
+        logging.error(f"Error getting all products: {str(e)}")
+        cursor.close()
+        db_con.close()
+        return [], []
 
 def get_user_history(user_id):
     db_con = database()
     cursor = db_con.cursor()
 
-    cursor.execute("SELECT CategoryID FROM Category")
-    categories = cursor.fetchall()
-
-    select_clause = "SELECT p.ProductID"
-    for category in categories:
-        category_id = category[0] # get the uid of the catefory and then append that to the new column
-        select_clause += f", MAX(CASE WHEN pc.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
-
-    final_query = f"""
-        {select_clause}
-        FROM Product p
-        LEFT JOIN Product_Category pc ON p.ProductID = pc.ProductID
-        LEFT JOIN Category c ON pc.CategoryID = c.CategoryID
-        where p.ProductID in (select ProductID from History where UserID = {user_id})
-        GROUP BY p.ProductID;
-        """
-
-    cursor.execute(final_query)
-    results = cursor.fetchall()
-    final = []
-    for row in results:
-        text_list = list(row)
-        text_list.pop(0)
-        final.append(text_list)
-
-    cursor.close()
-    db_con.close()
-    return final
-
-def get_recommendations(user_id, top_n=10):
     try:
+        cursor.execute("SELECT CategoryID FROM Category")
+        categories = cursor.fetchall()
+
+        select_clause = "SELECT p.ProductID"
+        for category in categories:
+            category_id = category[0] # get the uid of the category and then append that to the new column
+            select_clause += f", MAX(CASE WHEN pc.CategoryID = {category_id} THEN 1 ELSE 0 END) AS `Cat_{category_id}`"
+
+        final_query = f"""
+            {select_clause}
+            FROM Product p
+            LEFT JOIN Product_Category pc ON p.ProductID = pc.ProductID
+            LEFT JOIN Category c ON pc.CategoryID = c.CategoryID
+            where p.ProductID in (select ProductID from History where UserID = {user_id})
+            GROUP BY p.ProductID;
+            """
+
+        cursor.execute(final_query)
+        results = cursor.fetchall()
+        final = []
+        for row in results:
+            text_list = list(row)
+            text_list.pop(0)
+            final.append(text_list)
+
+        cursor.close()
+        db_con.close()
+        return final
+    except Exception as e:
+        logging.error(f"Error getting user history: {str(e)}")
+        cursor.close()
+        db_con.close()
+        return []
+
+def get_recommendations(user_id, top_n=5):
+    try:
+        # Always delete existing recommendations first
+        delete_user_recommendations(user_id)
+
+        # Check if user has history or recommendations
+        if not has_user_history_or_recommendations(user_id):
+            # Cold start: return random products
+            random_recs = get_random_products(top_n)
+            # Store these random recommendations
+            history_upload(user_id, random_recs)
+
+            # Add 5 more unique random products
+            additional_random = get_random_products(5, random_recs)
+            history_upload(user_id, additional_random)
+
+            return random_recs + additional_random
+
         # Get all products and user history with their category vectors
-        all_products = get_all_products()
+        all_product_features, all_product_ids = get_all_products()
         user_history = get_user_history(user_id)
-        # if not user_history:
-        #     #Cold start: return popular products
-        #     return get_popular_products(top_n)
+
+        if not user_history:
+            # User exists but has no history yet
+            popular_recs = get_popular_products(top_n)
+            history_upload(user_id, popular_recs)
+
+            # Add 5 more unique random products
+            additional_random = get_random_products(5, popular_recs)
+            history_upload(user_id, additional_random)
+
+            return popular_recs + additional_random
+
         # Calculate similarity between all products and user history
         user_profile = np.mean(user_history, axis=0)  # Average user preferences
-        similarities = cosine_similarity([user_profile], all_products)
-        # finds the indices of the top N products that have the highest
-        # cosine similarity with the user's profile and sorted from most similar to least similar.
+        similarities = cosine_similarity([user_profile], all_product_features)
+        print(similarities)
+
+        # Get indices of the top N products sorted by similarity
         product_indices = similarities[0].argsort()[-top_n:][::-1]
-        print("product", product_indices)
 
-        # Get the recommended product IDs
-        recommended_products = [all_products[i][0] for i in product_indices]  # Product IDs
+        # Get the actual product IDs using the indices
+        recommended_product_ids = [all_product_ids[i] for i in product_indices]
 
-        # Upload the recommendations to the database
-        history_upload(user_id, product_indices)  # Pass the indices directly to history_upload
+        # Upload the core recommendations to the database
+        history_upload(user_id, recommended_product_ids)
+
+        # Add 5 more unique random products that aren't in the recommendations
+        additional_random = get_random_products(5, recommended_product_ids)
+        history_upload(user_id, additional_random)
+
+        # Return both the similarity-based recommendations and the random ones
+        return recommended_product_ids + additional_random
 
-        # Return recommended product IDs
-        return recommended_products
     except Exception as e:
         logging.error(f"Recommendation error for user {user_id}: {str(e)}")
-        # return get_popular_products(top_n)  # Fallback to popular products
+        # Fallback to random products
+        random_products = get_random_products(top_n + 5)
+        return random_products
 
-def history_upload(userID, anrr):
+def history_upload(userID, products):
+    """Upload product recommendations to the database"""
     db_con = database()
     cursor = db_con.cursor()
 
     try:
-        for item in anrr:
-            #Product ID starts form index 1
-            item_value = item + 1
-            print(item_value)
+        for product_id in products:
             # Use parameterized queries to prevent SQL injection
-            cursor.execute(f"INSERT INTO Recommendation (UserID, RecommendedProductID) VALUES ({userID}, {item_value});")
+            cursor.execute("INSERT INTO Recommendation (UserID, RecommendedProductID) VALUES (%s, %s)",
+                          (userID, product_id))
 
         # Commit the changes
         db_con.commit()
 
-        # If you need results, you'd typically fetch them after a SELECT query
-        #results = cursor.fetchall()
-        #print(results)
-
     except Exception as e:
-        print(f"Error: {e}")
+        logging.error(f"Error uploading recommendations: {str(e)}")
         db_con.rollback()
     finally:
         # Close the cursor and connection