diff --git a/.DS_Store b/.DS_Store
index b004b72..0008460 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/WebContent/cart.jsp b/WebContent/cart.jsp
index 26a2d4f..6b7f391 100755
--- a/WebContent/cart.jsp
+++ b/WebContent/cart.jsp
@@ -84,7 +84,7 @@ if (cart_list != null) {
 									href="quantity-inc-dec?action=dec&id=<%=c.getId()%>"><i
 									class="fas fa-minus-square"></i></a>
 							</div>
-							<button type="submit" class="btn btn-primary btn-sm">Buy</button>
+							
 						</form>
 					</td>
 					<td><a href="remove-from-cart?id=<%=c.getId()%>"
diff --git a/WebContent/checkout.jsp b/WebContent/checkout.jsp
index 234d1b4..5636b93 100644
--- a/WebContent/checkout.jsp
+++ b/WebContent/checkout.jsp
@@ -65,11 +65,7 @@ ArrayList<Cart> cart_list = (ArrayList<Cart>) session.getAttribute("cart-list");
 									</div>
 								</div>
 							</div>
-							<ul class="nav nav-pills nav-stacked">
-								<li class="active"><a href="#"><span
-										class="badge pull-right"><span
-											class="glyphicon glyphicon-usd"></span>4200</span> Final Payment</a></li>
-							</ul>
+							
 							<br />
 							<button class="btn btn-success btn-lg btn-block" type="submit">Pay</button>
 						</form>
diff --git a/WebContent/login.jsp b/WebContent/login.jsp
index 8bee630..f793fe7 100755
--- a/WebContent/login.jsp
+++ b/WebContent/login.jsp
@@ -23,7 +23,7 @@
 
 	<div class="container">
 		<div class="card w-50 mx-auto my-5">
-			<div class="card-header text-center">User Login</div>
+			<div class="card-header text-center">Login</div>
 			<div class="card-body">
 				<form action="user-login" method="post">
 					<div class="form-group">
diff --git a/src/cfy/dao/OrderDao.java b/src/cfy/dao/OrderDao.java
index 6eab0d8..51d7cdc 100755
--- a/src/cfy/dao/OrderDao.java
+++ b/src/cfy/dao/OrderDao.java
@@ -26,12 +26,11 @@ public class OrderDao {
 	public boolean insertOrder(Order model) {
         boolean result = false;
         try {
-            query = "insert into orders (p_id, u_id, o_quantity, o_date) values(?,?,?,?)";
+            query = "insert into orders(p_id, u_id, o_quantity) values(?,?,?)";
             pst = this.con.prepareStatement(query);
-            pst.setInt(1, model.getId());
+            pst.setInt(1, model.getP_id());
             pst.setInt(2, model.getUid());
             pst.setInt(3, model.getQunatity());
-            pst.setString(4, model.getDate());
             pst.executeUpdate();
             result = true;
         } catch (SQLException e) {
diff --git a/src/cfy/servlet/OrderNowServlet.java b/src/cfy/servlet/OrderNowServlet.java
index 0f9c4e7..a9c01c6 100755
--- a/src/cfy/servlet/OrderNowServlet.java
+++ b/src/cfy/servlet/OrderNowServlet.java
@@ -97,8 +97,9 @@ public class OrderNowServlet extends HttpServlet {
 				}
 				
 			}
+			session.removeAttribute("cart-list");
 			
-			response.getWriter().write("order placed");
+			response.sendRedirect("index.jsp");
 
 		} else {
 			response.getWriter().write("card invalid");
diff --git a/target/classes/cfy/connection/DbCon.class b/target/classes/cfy/connection/DbCon.class
index 750f631..5e38e39 100644
Binary files a/target/classes/cfy/connection/DbCon.class and b/target/classes/cfy/connection/DbCon.class differ
diff --git a/target/classes/cfy/connection/ValidateCard.class b/target/classes/cfy/connection/ValidateCard.class
index 1019177..f839107 100644
Binary files a/target/classes/cfy/connection/ValidateCard.class and b/target/classes/cfy/connection/ValidateCard.class differ
diff --git a/target/classes/cfy/dao/OrderDao.class b/target/classes/cfy/dao/OrderDao.class
index b86461b..8d4b0aa 100644
Binary files a/target/classes/cfy/dao/OrderDao.class and b/target/classes/cfy/dao/OrderDao.class differ
diff --git a/target/classes/cfy/dao/ProductDao.class b/target/classes/cfy/dao/ProductDao.class
index 9fc83d9..300ed86 100644
Binary files a/target/classes/cfy/dao/ProductDao.class and b/target/classes/cfy/dao/ProductDao.class differ
diff --git a/target/classes/cfy/dao/UserDao.class b/target/classes/cfy/dao/UserDao.class
index f63b79b..74e7667 100644
Binary files a/target/classes/cfy/dao/UserDao.class and b/target/classes/cfy/dao/UserDao.class differ
diff --git a/target/classes/cfy/model/Cart.class b/target/classes/cfy/model/Cart.class
index 72bbcfa..e2a66ac 100644
Binary files a/target/classes/cfy/model/Cart.class and b/target/classes/cfy/model/Cart.class differ
diff --git a/target/classes/cfy/model/Order.class b/target/classes/cfy/model/Order.class
index 06fadb2..038df8a 100644
Binary files a/target/classes/cfy/model/Order.class and b/target/classes/cfy/model/Order.class differ
diff --git a/target/classes/cfy/model/Product.class b/target/classes/cfy/model/Product.class
index bc67722..e1554e1 100644
Binary files a/target/classes/cfy/model/Product.class and b/target/classes/cfy/model/Product.class differ
diff --git a/target/classes/cfy/model/User.class b/target/classes/cfy/model/User.class
index 6efa3d7..1b2a7b1 100644
Binary files a/target/classes/cfy/model/User.class and b/target/classes/cfy/model/User.class differ
diff --git a/target/classes/cfy/servlet/AddToCartServlet.class b/target/classes/cfy/servlet/AddToCartServlet.class
index 9fe32c5..e2d7372 100644
Binary files a/target/classes/cfy/servlet/AddToCartServlet.class and b/target/classes/cfy/servlet/AddToCartServlet.class differ
diff --git a/target/classes/cfy/servlet/AdminPanel.class b/target/classes/cfy/servlet/AdminPanel.class
index bda661f..1bcb486 100644
Binary files a/target/classes/cfy/servlet/AdminPanel.class and b/target/classes/cfy/servlet/AdminPanel.class differ
diff --git a/target/classes/cfy/servlet/CancelOrderServlet.class b/target/classes/cfy/servlet/CancelOrderServlet.class
index 6fd3877..c990be5 100644
Binary files a/target/classes/cfy/servlet/CancelOrderServlet.class and b/target/classes/cfy/servlet/CancelOrderServlet.class differ
diff --git a/target/classes/cfy/servlet/CheckOutServlet.class b/target/classes/cfy/servlet/CheckOutServlet.class
index 596162a..6e8ce85 100644
Binary files a/target/classes/cfy/servlet/CheckOutServlet.class and b/target/classes/cfy/servlet/CheckOutServlet.class differ
diff --git a/target/classes/cfy/servlet/Checkout.class b/target/classes/cfy/servlet/Checkout.class
index eb7cfe5..8a9eaf7 100644
Binary files a/target/classes/cfy/servlet/Checkout.class and b/target/classes/cfy/servlet/Checkout.class differ
diff --git a/target/classes/cfy/servlet/LoginServlet.class b/target/classes/cfy/servlet/LoginServlet.class
index b7b4eca..ccd280d 100644
Binary files a/target/classes/cfy/servlet/LoginServlet.class and b/target/classes/cfy/servlet/LoginServlet.class differ
diff --git a/target/classes/cfy/servlet/LogoutServlet.class b/target/classes/cfy/servlet/LogoutServlet.class
index 9bfa8d7..0f4fb8d 100644
Binary files a/target/classes/cfy/servlet/LogoutServlet.class and b/target/classes/cfy/servlet/LogoutServlet.class differ
diff --git a/target/classes/cfy/servlet/QuantityIncDecServlet.class b/target/classes/cfy/servlet/QuantityIncDecServlet.class
index 256013e..ef351dc 100644
Binary files a/target/classes/cfy/servlet/QuantityIncDecServlet.class and b/target/classes/cfy/servlet/QuantityIncDecServlet.class differ
diff --git a/target/classes/cfy/servlet/RegisterServlet.class b/target/classes/cfy/servlet/RegisterServlet.class
index 127d674..1594b6d 100644
Binary files a/target/classes/cfy/servlet/RegisterServlet.class and b/target/classes/cfy/servlet/RegisterServlet.class differ
diff --git a/target/classes/cfy/servlet/RemoveFromCartServlet.class b/target/classes/cfy/servlet/RemoveFromCartServlet.class
index 5d4e56f..8d46061 100644
Binary files a/target/classes/cfy/servlet/RemoveFromCartServlet.class and b/target/classes/cfy/servlet/RemoveFromCartServlet.class differ
diff --git a/target/m2e-wtp/web-resources/META-INF/maven/computer-for-you/e-cart/pom.properties b/target/m2e-wtp/web-resources/META-INF/maven/computer-for-you/e-cart/pom.properties
index 972b22a..de2066c 100644
--- a/target/m2e-wtp/web-resources/META-INF/maven/computer-for-you/e-cart/pom.properties
+++ b/target/m2e-wtp/web-resources/META-INF/maven/computer-for-you/e-cart/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Aug 26 09:05:22 BST 2022
+#Fri Aug 26 13:23:56 BST 2022
 m2e.projectLocation=/Users/roshanthomas/jsp/Web-App-and-AI
 m2e.projectName=Computer-for-you-WAA-12186042
 groupId=computer-for-you