diff --git a/src/App/components/cart/Cart.php b/src/App/components/cart/Cart.php
index cf0b7cd08567e57f3c41c0ee7dd2ec17c14651f8..b143cc5ea75fbec847a458c4f3a84174a9b95dbd 100644
--- a/src/App/components/cart/Cart.php
+++ b/src/App/components/cart/Cart.php
@@ -14,8 +14,8 @@
     <div id="checkout-alert"></div>
 
     <?php
-    if($_SERVER["HTTP_REFERER"] == 'http://localhost:8000/Cart.php'){
-        echo '<script>showCheckoutAlert("Checkout successful!");</script>';;
+    if($this->data['checkout']){
+        echo '<script>showCheckoutAlert("Checkout successful!");</script>';
     }
     include(dirname(__DIR__) . '/template/Navbar.php');
     ?>
diff --git a/src/App/controller/cart/CartController.php b/src/App/controller/cart/CartController.php
index e773620879d07b62780e2c36d1af59f6bf55bb90..b46f23500a271956fa6da5985d144d7445e604af 100644
--- a/src/App/controller/cart/CartController.php
+++ b/src/App/controller/cart/CartController.php
@@ -6,6 +6,12 @@ class CartController extends Controller {
             throw new Exception("You are not allowed to view this page", 405);
         }
 
+        $isCheckout = false;
+        if($page === "checkout") {
+            $isCheckout = true;
+            $page = 1;
+        }
+
         $cartModel = $this->model("CartModel");
         $cart = $cartModel->getUserCart($_SESSION['user_id']);
         
@@ -24,6 +30,7 @@ class CartController extends Controller {
             "data" => $cart,
             "page" => $page,
             "pageLimit" => $this->pageLimit,
+            "checkout" => $isCheckout,
 
             "cart" => $pageCart,
             "cartItems" => $cartItems,
diff --git a/src/App/controller/checkout/CheckoutController.php b/src/App/controller/category/CheckoutController.php
similarity index 91%
rename from src/App/controller/checkout/CheckoutController.php
rename to src/App/controller/category/CheckoutController.php
index f99f9c54750672c5ae0544ea559549e0a0b57be4..9591226bef3fc20fb8bfa38e55cd2b2c2936e8f0 100644
--- a/src/App/controller/checkout/CheckoutController.php
+++ b/src/App/controller/category/CheckoutController.php
@@ -15,7 +15,7 @@ class CheckoutController extends Controller{
         }
 
         
-        header("Location: /Cart");
+        header("Location: /cart/checkout");
     }
 }