diff --git a/admin/order-history.php b/admin/order-history.php
index 32bb406..5846190 100644
--- a/admin/order-history.php
+++ b/admin/order-history.php
@@ -55,814 +55,14 @@ $allorders = json_encode($orders, true);
 	<div class="wrapper">
 
 		<!-- LEFT MAIN SIDEBAR -->
-		<div class="ec-left-sidebar ec-bg-sidebar">
-			<div id="sidebar" class="sidebar ec-sidebar-footer">
-
-				<div class="ec-brand">
-					<a href="index.php" title="Ekka">
-						<img class="ec-brand-icon" src="assets/img/logo/ec-site-logo.png" alt="" />
-						<span class="ec-brand-name text-truncate">Ekka</span>
-					</a>
-				</div>
-
-				<!-- begin sidebar scrollbar -->
-				<div class="ec-navigation" data-simplebar>
-					<!-- sidebar menu -->
-					<ul class="nav sidebar-inner" id="sidebar-menu">
-						<!-- Dashboard -->
-						<li>
-							<a class="sidenav-item-link" href="index.php">
-								<i class="mdi mdi-view-dashboard-outline"></i>
-								<span class="nav-text">Dashboard</span>
-							</a>
-							<hr>
-						</li>
-
-						<!-- Vendors -->
-						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-account-group-outline"></i>
-								<span class="nav-text">Vendors</span> <b class="caret"></b>
-							</a>
-							<div class="collapse">
-								<ul class="sub-menu" id="vendors" data-parent="#sidebar-menu">
-									<li class="">
-										<a class="sidenav-item-link" href="vendor-card.html">
-											<span class="nav-text">Vendor Grid</span>
-										</a>
-									</li>
-
-									<li class="">
-										<a class="sidenav-item-link" href="vendor-list.html">
-											<span class="nav-text">Vendor List</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="vendor-profile.html">
-											<span class="nav-text">Vendors Profile</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</li>
-
-						<!-- Users -->
-						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-account-group"></i>
-								<span class="nav-text">Users</span> <b class="caret"></b>
-							</a>
-							<div class="collapse">
-								<ul class="sub-menu" id="users" data-parent="#sidebar-menu">
-									<li>
-										<a class="sidenav-item-link" href="user-card.html">
-											<span class="nav-text">User Grid</span>
-										</a>
-									</li>
-
-									<li class="">
-										<a class="sidenav-item-link" href="user-list.html">
-											<span class="nav-text">User List</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="user-profile.html">
-											<span class="nav-text">Users Profile</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-							<hr>
-						</li>
-
-						<!-- Category -->
-						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-dns-outline"></i>
-								<span class="nav-text">Categories</span> <b class="caret"></b>
-							</a>
-							<div class="collapse">
-								<ul class="sub-menu" id="categorys" data-parent="#sidebar-menu">
-									<li class="">
-										<a class="sidenav-item-link" href="main-category.html">
-											<span class="nav-text">Main Category</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="sub-category.html">
-											<span class="nav-text">Sub Category</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</li>
-
-						<!-- Products -->
-						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-palette-advanced"></i>
-								<span class="nav-text">Products</span> <b class="caret"></b>
-							</a>
-							<div class="collapse">
-								<ul class="sub-menu" id="products" data-parent="#sidebar-menu">
-									<li class="">
-										<a class="sidenav-item-link" href="product-add.html">
-											<span class="nav-text">Add Product</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="product-list.html">
-											<span class="nav-text">List Product</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="product-grid.html">
-											<span class="nav-text">Grid Product</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="product-detail.html">
-											<span class="nav-text">Product Detail</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</li>
-
-						<!-- Orders -->
-						<li class="has-sub active expand">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-cart"></i>
-								<span class="nav-text">Orders</span> <b class="caret"></b>
-							</a>
-							<div class="collapse show">
-								<ul class="sub-menu" id="orders" data-parent="#sidebar-menu">
-									<li class="">
-										<a class="sidenav-item-link" href="new-order.html">
-											<span class="nav-text">New Order</span>
-										</a>
-									</li>
-									<li class="active">
-										<a class="sidenav-item-link" href="order-history.html">
-											<span class="nav-text">Order History</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="order-detail.html">
-											<span class="nav-text">Order Detail</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="invoice.html">
-											<span class="nav-text">Invoice</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</li>
-
-						<!-- Reviews -->
-						<li>
-							<a class="sidenav-item-link" href="review-list.html">
-								<i class="mdi mdi-star-half"></i>
-								<span class="nav-text">Reviews</span>
-							</a>
-						</li>
-
-						<!-- Brands -->
-						<li>
-							<a class="sidenav-item-link" href="brand-list.html">
-								<i class="mdi mdi-tag-faces"></i>
-								<span class="nav-text">Brands</span>
-							</a>
-							<hr>
-						</li>
-
-						<!-- Authentication -->
-						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-login"></i>
-								<span class="nav-text">Authentication</span> <b class="caret"></b>
-							</a>
-							<div class="collapse">
-								<ul class="sub-menu" id="authentication" data-parent="#sidebar-menu">
-									<li class="">
-										<a href="sign-in.html">
-											<span class="nav-text">Sign In</span>
-										</a>
-									</li>
-									<li class="">
-										<a href="sign-up.html">
-											<span class="nav-text">Sign Up</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</li>
-
-						<!-- Icons -->
-						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-diamond-stone"></i>
-								<span class="nav-text">Icons</span> <b class="caret"></b>
-							</a>
-							<div class="collapse">
-								<ul class="sub-menu" id="icons" data-parent="#sidebar-menu">
-									<li class="">
-										<a class="sidenav-item-link" href="material-icon.html">
-											<span class="nav-text">Material Icon</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="font-awsome-icons.html">
-											<span class="nav-text">Font Awsome Icon</span>
-										</a>
-									</li>
-									<li class="">
-										<a class="sidenav-item-link" href="flag-icon.html">
-											<span class="nav-text">Flag Icon</span>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</li>
-
-						<!-- Other Pages -->
-						<li class="has-sub">
-							<a class="sidenav-item-link" href="javascript:void(0)">
-								<i class="mdi mdi-image-filter-none"></i>
-								<span class="nav-text">Other Pages</span> <b class="caret"></b>
-							</a>
-							<div class="collapse">
-								<ul class="sub-menu" id="otherpages" data-parent="#sidebar-menu">
-									<li class="has-sub">
-										<a href="404.html">404 Page</a>
-									</li>
-								</ul>
-							</div>
-						</li>
-					</ul>
-				</div>
-			</div>
-		</div>
+		<?php include 'left-main-sidebar.php' ?>
 
 		<!-- PAGE WRAPPER -->
 		<div class="ec-page-wrapper">
 
 			<!-- Header -->
-			<header class="ec-main-header" id="header">
-				<nav class="navbar navbar-static-top navbar-expand-lg">
-					<!-- Sidebar toggle button -->
-					<button id="sidebar-toggler" class="sidebar-toggle"></button>
-					<!-- search form -->
-					<div class="search-form d-lg-inline-block">
-						<div class="input-group">
-							<input type="text" name="query" id="search-input" class="form-control" placeholder="search.." autofocus autocomplete="off" />
-							<button type="button" name="search" id="search-btn" class="btn btn-flat">
-								<i class="mdi mdi-magnify"></i>
-							</button>
-						</div>
-						<div id="search-results-container">
-							<ul id="search-results"></ul>
-						</div>
-					</div>
-
-					<!-- navbar right -->
-					<div class="navbar-right">
-						<ul class="nav navbar-nav">
-							<!-- User Account -->
-							<li class="dropdown user-menu">
-								<button class="dropdown-toggle nav-link ec-drop" data-bs-toggle="dropdown" aria-expanded="false">
-									<img src="assets/img/user/user.png" class="user-image" alt="User Image" />
-								</button>
-								<ul class="dropdown-menu dropdown-menu-right ec-dropdown-menu">
-									<!-- User image -->
-									<li class="dropdown-header">
-										<img src="assets/img/user/user.png" class="img-circle" alt="User Image" />
-										<div class="d-inline-block">
-											John Deo <small class="pt-1">john.example@gmail.com</small>
-										</div>
-									</li>
-									<li>
-										<a href="user-profile.html">
-											<i class="mdi mdi-account"></i> My Profile
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-email"></i> Message
-										</a>
-									</li>
-									<li>
-										<a href="#"> <i class="mdi mdi-diamond-stone"></i> Projects </a>
-									</li>
-									<li class="right-sidebar-in">
-										<a href="javascript:0"> <i class="mdi mdi-settings-outline"></i> Setting </a>
-									</li>
-									<li class="dropdown-footer">
-										<a href="index.php"> <i class="mdi mdi-logout"></i> Log Out </a>
-									</li>
-								</ul>
-							</li>
-							<li class="dropdown notifications-menu custom-dropdown">
-								<button class="dropdown-toggle notify-toggler custom-dropdown-toggler">
-									<i class="mdi mdi-bell-outline"></i>
-								</button>
-
-								<div class="card card-default dropdown-notify dropdown-menu-right mb-0">
-									<div class="card-header card-header-border-bottom px-3">
-										<h2>Notifications</h2>
-									</div>
-
-									<div class="card-body px-0 py-0">
-										<ul class="nav nav-tabs nav-style-border p-0 justify-content-between" id="myTab" role="tablist">
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link active pb-3" id="home2-tab" data-bs-toggle="tab" data-bs-target="#home2" role="tab" aria-controls="home2" aria-selected="true">All (10)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="profile2-tab" data-bs-toggle="tab" data-bs-target="#profile2" role="tab" aria-controls="profile2" aria-selected="false">Msgs (5)</a>
-											</li>
-
-											<li class="nav-item mx-3 my-0 py-0">
-												<a href="#" class="nav-link pb-3" id="contact2-tab" data-bs-toggle="tab" data-bs-target="#contact2" role="tab" aria-controls="contact2" aria-selected="false">Others (5)</a>
-											</li>
-										</ul>
-
-										<div class="tab-content" id="myTabContent3">
-											<div class="tab-pane fade show active" id="home2" role="tabpanel" aria-labelledby="home2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Nitin</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Lovina</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Crinali</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification event-active">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Yearly Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="profile2" role="tabpanel" aria-labelledby="profile2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u6.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Hardiko</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u7.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browin</h4>
-																	<p class="last-msg">Nam ut nisi erat. Ut quis tortor
-																		varius, hendrerit arcu quis, congue nisl. In
-																		scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification media-active">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u1.jpg" alt="Image">
-																<span class="status active"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">jenelia</h4>
-																	<p class="last-msg">Donec mattis augue a nisl
-																		consequat, nec imperdiet ex rutrum. Fusce et
-																		vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-white">
-																		<i class="mdi mdi-clock-outline"></i> Just
-																		now...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u2.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Bhavlio</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-															<div class="position-relative mr-3">
-																<img class="rounded-circle" src="assets/img/user/u5.jpg" alt="Image">
-																<span class="status away"></span>
-															</div>
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Browini</h4>
-																	<p class="last-msg">Lorem ipsum dolor sit, amet
-																		consectetur adipisicing elit. Nam itaque
-																		doloremque odio, eligendi delectus vitae.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-												</ul>
-											</div>
-
-											<div class="tab-pane fade" id="contact2" role="tabpanel" aria-labelledby="contact2-tab">
-												<ul class="list-unstyled" data-simplebar style="height: 360px">
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification event-active">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-info text-white">
-																<i class="mdi mdi-calendar-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Upcomming event added</h4>
-																	<p class="last-msg font-size-14">03/Jan/2020 (1pm -
-																		2pm)</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 10 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-warning text-white">
-																<i class="mdi mdi-chart-areaspline font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Sales report</h4>
-																	<p class="last-msg font-size-14">Lorem ipsum dolor
-																		sit, amet consectetur adipisicing elit. Nam
-																		itaque doloremque odio, eligendi delectus vitae.
-																	</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 1 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-primary text-white">
-																<i class="mdi mdi-account-multiple-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Request</h4>
-																	<p class="last-msg font-size-14">Add Dany Jones as
-																		your contact consequat nec imperdiet ex rutrum.
-																		Fusce et vehicula enim. Sed in enim.</p>
-
-																	<span class="my-1 btn btn-sm btn-success">Accept</span>
-																	<span class="my-1 btn btn-sm btn-secondary">Delete</span>
-
-																	<span class="font-size-12 font-weight-medium text-secondary d-block">
-																		<i class="mdi mdi-clock-outline"></i> 5 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-danger text-white">
-																<i class="mdi mdi-server-network-off font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">Server overloaded</h4>
-																	<p class="last-msg font-size-14">Donec mattis augue
-																		a nisl consequat, nec imperdiet ex rutrum. Fusce
-																		et vehicula enim. Sed in enim eu odio vehic.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 30 min
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-
-													<li>
-														<a href="javscript:void(0)" class="media media-message media-notification">
-
-															<div class="d-flex rounded-circle align-items-center justify-content-center mr-3 media-icon iconbox-45 bg-purple text-white">
-																<i class="mdi mdi-playlist-check font-size-20"></i>
-															</div>
-
-															<div class="media-body d-flex justify-content-between">
-																<div class="message-contents">
-																	<h4 class="title">New Task complete</h4>
-																	<p class="last-msg font-size-14">Nam ut nisi erat.
-																		Ut quis tortor varius, hendrerit arcu quis,
-																		congue nisl. In scelerisque, sem ut ve.</p>
-
-																	<span class="font-size-12 font-weight-medium text-secondary">
-																		<i class="mdi mdi-clock-outline"></i> 2 hrs
-																		ago...
-																	</span>
-																</div>
-															</div>
-														</a>
-													</li>
-												</ul>
-											</div>
-										</div>
-									</div>
-								</div>
-
-								<ul class="dropdown-menu dropdown-menu-right d-none">
-									<li class="dropdown-header">You have 5 notifications</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-plus"></i> New user registered
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-remove"></i> User deleted
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 07 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-chart-areaspline"></i> Sales report is ready
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 12 PM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-account-supervisor"></i> New client
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 10 AM</span>
-										</a>
-									</li>
-									<li>
-										<a href="#">
-											<i class="mdi mdi-server-network-off"></i> Server overloaded
-											<span class=" font-size-12 d-inline-block float-right"><i class="mdi mdi-clock-outline"></i> 05 AM</span>
-										</a>
-									</li>
-									<li class="dropdown-footer">
-										<a class="text-center" href="#"> View All </a>
-									</li>
-								</ul>
-							</li>
-							<li class="right-sidebar-in right-sidebar-2-menu">
-								<i class="mdi mdi-settings-outline mdi-spin"></i>
-							</li>
-						</ul>
-					</div>
-				</nav>
-			</header>
+		<?php include 'header.php' ?>
+			
 
 			<!-- CONTENT WRAPPER -->
 			<div class="ec-content-wrapper">
diff --git a/cart.php b/cart.php
index b12214b..8e8206f 100644
--- a/cart.php
+++ b/cart.php
@@ -229,7 +229,7 @@ if ($_SESSION["userId"] <> "") {
                                                         ?>
 
                                                                 <tr id="cart_order_<?php echo $order['_id'] ?>">
-                                                                    <td data-label="Product" class="ec-cart-pro-name"><a href="shop-left-sidebar-col-4.php"><img class="ec-cart-pro-img mr-4" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="" /><?php echo $order['items'][0]['product']['name']; ?></a></td>
+                                                                    <td data-label="Product" class="ec-cart-pro-name"><a href="product-left-sidebar.php?id=<?php echo $order['items'][0]['product']['product_id']; ?>"><img class="ec-cart-pro-img mr-4" src="<?php echo $order['items'][0]['product']['product_image']; ?>" alt="" /><?php echo $order['items'][0]['product']['name']; ?></a></td>
                                                                     <td data-label="Price" class="ec-cart-pro-price"><span class="amount"><?php echo $order['items'][0]['price']; ?></span></td>
                                                                     <td data-label="Quantity" class="ec-cart-pro-qty" style="text-align: center;">
                                                                         <div class="cart-qty-plus-minus2" style="width:100px; margin:auto;">
@@ -291,6 +291,11 @@ if ($_SESSION["userId"] <> "") {
 
                                                                     } else {
                                                                         console.log('herreeeee')
+                                                                      
+                                                                        var newQuantity = parseInt(qtyInputCart.value) + 1;
+                                                                        qtyInput.value = newQuantity;
+                                                                        qtyInputCart.value = newQuantity;
+
                                                                         updateQuantityCart(orderId, itemId, newQuantity, isFloat);
                                                                     }
                                                                 } else {
diff --git a/catalog-single-vendor.php b/catalog-single-vendor.php
index d567c64..76ed0f0 100644
--- a/catalog-single-vendor.php
+++ b/catalog-single-vendor.php
@@ -346,8 +346,8 @@ if (!empty($_GET['minPrice']) || !empty($_GET['maxPrice']) || !empty($_GET['cate
                         <div class="ec-page-description p-30">
                             <h5 class="ec-desc-title">About Our Firm</h5>
                             <!-- raymart replace the vendor descript march 8 2024 -->
-                                <?php if (!empty($vendorData['vendor_description'])): ?>
-                                    <p><?php echo $vendorData['vendor_description']; ?></p>
+                                <?php if (!empty($vendor['vendor_description'])): ?>
+                                    <p><?php echo $vendor['vendor_description']; ?></p>
                                 <?php else: ?>
                                     <p>No description available.</p>
                                 <?php endif; ?>
diff --git a/forgot_password.php b/forgot_password.php
index ac683b1..61e63c3 100644
--- a/forgot_password.php
+++ b/forgot_password.php
@@ -162,10 +162,15 @@
                         <div class="ec-login-form">
                         <?php
                             if (isset($_SESSION["forgotPasswordError"])) {
-                                echo '<div class="alert alert-danger" role="alert">';
+                                echo '<div class="alert alert-danger" id="alertDanger" style="background:#FFCCCB;  role="alert">';
                                 echo $_SESSION["forgotPasswordError"];
                                 echo '</div>';
                                 unset($_SESSION["forgotPasswordError"]); 
+                                echo "   <script>
+                                            setTimeout(function() {
+                                                document.getElementById('alertDanger').style.display = 'none';
+                                            }, 10000);
+                                        </script>";
                             }
                         ?>
                             <form action="forgot_password_action.php" method="post">
diff --git a/header.php b/header.php
index 2613191..a65f8cc 100644
--- a/header.php
+++ b/header.php
@@ -261,7 +261,7 @@ if ($_SESSION["userId"] <> "") {
                                 } else {
                         ?>
                             <li><a class="dropdown-item" href="register.php">Register</a></li>
-                            <li><a class="dropdown-item" href="checkout.html">Checkout</a></li>
+                            <!-- <li><a class="dropdown-item" href="checkout.html">Checkout</a></li> -->
                             <li><a class="dropdown-item" href="login.php">Login</a></li>
                         <?php
                                 }
@@ -498,10 +498,25 @@ if ($_SESSION["userId"] <> "") {
                                                 function handleQtyInput(input, orderId, itemId, isFloat) {
                                                     login(email, password, function(token) {
                                                         var newQuantity = parseInt(input.value);
-                                                        updateQuantity(orderId, itemId, newQuantity, isFloat, token);
+                                                        if (newQuantity >= 1) {
+                                                            updateQuantity(orderId, itemId, newQuantity, isFloat, token);
+                                                        } else {
+                                                            input.value = 0; 
+                                                            deleteOrder(orderId, itemId, 0, isFloat, token);
+                                                            // input.value = 1; 
+                                                            // updateQuantity(orderId, itemId, 1, isFloat, token);
+                                                        }
                                                     })
                                                 }
 
+
+                                                // function handleQtyInput(input, orderId, itemId, isFloat) {
+                                                //     login(email, password, function(token) {
+                                                //         var newQuantity = parseInt(input.value);
+                                                //         updateQuantity(orderId, itemId, newQuantity, isFloat, token);
+                                                //     })
+                                                // }
+
                                                 function qtyIncrement(orderId, itemId, isFloat) {
                                                     login(email, password, function(token) {
                                                         var qtyInput = document.getElementById('qty-input-' + itemId);
@@ -516,13 +531,29 @@ if ($_SESSION["userId"] <> "") {
                                                     login(email, password, function(token) {
                                                         var qtyInput = document.getElementById('qty-input-' + itemId);
                                                         var newQuantity = parseInt(qtyInput.value) - 1;
-                                                        qtyInput.value = newQuantity;
                                                         if (newQuantity >= 1) {
+                                                            qtyInput.value = newQuantity;
                                                             updateQuantity(orderId, itemId, newQuantity, isFloat, token);
+                                                        } else {
+                                                            qtyInput.value = 0; 
+                                                            deleteOrder(orderId, itemId, 0, isFloat, token); 
+                                                            // qtyInput.value = 1; 
+                                                            // updateQuantity(orderId, itemId, 1, isFloat, token); 
                                                         }
                                                     })
                                                 }
 
+                                                // function qtyDecrement(orderId, itemId, isFloat) {
+                                                //     login(email, password, function(token) {
+                                                //         var qtyInput = document.getElementById('qty-input-' + itemId);
+                                                //         var newQuantity = parseInt(qtyInput.value) - 1;
+                                                //         qtyInput.value = newQuantity;
+                                                //         if (newQuantity >= 1) {
+                                                //             updateQuantity(orderId, itemId, newQuantity, isFloat, token);
+                                                //         }
+                                                //     })
+                                                // }
+
                                                 function updateQuantity(orderId, itemId, newQuantity, isFloat, token) {
                                                     console.log(isFloat)
                                                     // const token = '<?php echo $_SESSION["token"] ?>';
diff --git a/index.php b/index.php
index a57d7ac..a64fec3 100644
--- a/index.php
+++ b/index.php
@@ -242,7 +242,7 @@ if ($_SESSION["userId"] <> "") {
                                                                 }
                                                             } else {
                                                                 ?>
-                                                                <img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
+                                                                <img class="hover-image" src="https://api.obanana.com/images/storage/web_images/1709002636671-viber_image_2024-02-22_15-54-42-498.png" alt="edit" />
                                                             <?php
                                                             }
                                                             ?>
@@ -362,7 +362,7 @@ if ($_SESSION["userId"] <> "") {
                                                                 }
                                                             } else {
                                                                 ?>
-                                                                <img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
+                                                                <img class="hover-image" src="https://api.obanana.com/images/storage/web_images/1709002636671-viber_image_2024-02-22_15-54-42-498.png" alt="edit" />
                                                             <?php
                                                             }
                                                             ?>
@@ -484,7 +484,7 @@ if ($_SESSION["userId"] <> "") {
                                                                 }
                                                             } else {
                                                                 ?>
-                                                                <img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
+                                                                <img class="hover-image" src="https://api.obanana.com/images/storage/web_images/1709002636671-viber_image_2024-02-22_15-54-42-498.png" alt="edit" />
                                                             <?php
                                                             }
                                                             ?>
@@ -604,7 +604,7 @@ if ($_SESSION["userId"] <> "") {
                                                                 }
                                                             } else {
                                                                 ?>
-                                                                <img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
+                                                                <img class="hover-image" src="https://api.obanana.com/images/storage/web_images/1709002636671-viber_image_2024-02-22_15-54-42-498.png" alt="edit" />
                                                             <?php
                                                             }
                                                             ?>
@@ -1054,7 +1054,25 @@ if ($_SESSION["userId"] <> "") {
                         <div class="ec-vendor-card">
                             <div class="ec-vendor-detail">
                                 <div class="ec-vendor-avtar" style="width: 75px; height: 75px; overflow: hidden;">
-                                    <img src="<?php echo $vendor['vendor_image']; ?>" alt="vendor img" style="width: 100%; height: 100%; object-fit: cover;">
+                                <?php
+                                    if (isset($vendor['vendor_image'])) {
+                                        $image_urls = explode(',', $vendor['vendor_image']);
+                                        if (!empty($image_urls)) {
+                                            $first_image_url = trim($image_urls[0]);
+                                    ?>
+                                            <img src="<?php echo $vendor['vendor_image']; ?>" alt="vendor img" style="width: 100%; height: 100%; object-fit: cover;" />
+                                        <?php
+                                        }
+                                    } else {
+                                        ?>
+                                            <img alt="vendor img" style="width: 100%; height: 100%; object-fit: cover;" src="https://api.obanana.com/images/storage/web_images/1709002636671-viber_image_2024-02-22_15-54-42-498.png" />
+                                    <?php
+                                    }
+                                    ?>
+                                            <!-- <img src="<?php echo $vendor['vendor_image']; ?>" alt="vendor img" style="width: 100%; height: 100%; object-fit: cover;"> -->
+                                    
+                                            <!-- <img alt="vendor img" style="width: 100%; height: 100%; object-fit: cover;" src="https://api.obanana.com/images/storage/web_images/1709002636671-viber_image_2024-02-22_15-54-42-498.png" /> -->
+                                      
                                 </div>
                                 <div class="ec-vendor-info">
                                     <a href="catalog-single-vendor.php?id=<?php echo $vendor['_id'] ?>" class="name"><?php echo $vendor['user_login'] ?></a>
@@ -1229,7 +1247,7 @@ if ($_SESSION["userId"] <> "") {
                                                 }
                                             } else {
                                                 ?>
-                                                <img class="hover-image" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/65/No-Image-Placeholder.svg/495px-No-Image-Placeholder.svg.png?20200912122019" alt="edit" />
+                                                <img class="hover-image" src="https://api.obanana.com/images/storage/web_images/1709002636671-viber_image_2024-02-22_15-54-42-498.png" alt="edit" />
                                             <?php
                                             }
                                             ?>
@@ -1244,7 +1262,7 @@ if ($_SESSION["userId"] <> "") {
                                             <?php if (isset($newArrival[$pid]["sale_price"]) && $newArrival[$pid]["sale_price"] > 0) : ?>
                                                 <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
-                                                
+                                            
                                             <?php elseif (isset($newArrival[$pid]["regular_price"]) && $newArrival[$pid]["regular_price"] != "") : ?>
                                                 <button title="Add To Cart" onclick="popupAddToCart(`<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>`,`<?php echo htmlspecialchars($vendorOfProduct, ENT_QUOTES, 'UTF-8'); ?>`,  `<?php echo isset($_SESSION['token']) ? $_SESSION['token'] : ''; ?>` , `<?php echo isset($_SESSION['email']) ? $_SESSION['email'] : ''; ?>` ,  `<?php echo isset($_SESSION['password']) ? $_SESSION['password'] : ''; ?>` , `<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>`);" class="add-to-cart"><i class="fi-rr-shopping-basket"></i> Add To Cart</button>
                                                 <a class="ec-btn-group wishlist" title="Wishlist" onclick="popupWishlist('<?php echo htmlspecialchars(json_encode($newArrival[$pid]), ENT_QUOTES, 'UTF-8'); ?>', '<?php echo htmlspecialchars(json_encode($customer_data), ENT_QUOTES, 'UTF-8'); ?>');"><i class="fi-rr-heart"></i></a>
diff --git a/login.php b/login.php
index 9ccd466..3e9626a 100644
--- a/login.php
+++ b/login.php
@@ -162,12 +162,16 @@
                 <div class="ec-login-wrapper">
                     <div class="ec-login-container">
                         <div class="ec-login-form">
+                       
                         <?php
-                            if (isset($_SESSION["loginError"])) {
-                                echo '<div class="alert alert-danger" role="alert">';
-                                echo $_SESSION["loginError"];
-                                echo '</div>';
-                                unset($_SESSION["loginError"]); 
+                            session_start();
+                            if(isset($_GET["error"]) && $_GET["error"] == 1) {
+                                echo "<div class='alert alert-danger' style='background:#FFCCCB;' id='alertDanger' role='alert'>Login failed. Please try again.</div>";
+                                echo "   <script>
+                                        setTimeout(function() {
+                                            document.getElementById('alertDanger').style.display = 'none';
+                                        }, 10000);
+                                    </script>";
                             }
                         ?>
                             <form action="login_action.php" method="post">
diff --git a/login_action.php b/login_action.php
index f3358ef..adb9c4e 100644
--- a/login_action.php
+++ b/login_action.php
@@ -21,8 +21,8 @@
         }
         header("location: $url");
     } else {
-        $_SESSION["loginError"] = "Invalid email or password. Please try again.";
-        header("location: login.php"); 
+        // $_SESSION["loginError"] = "Invalid email or password. Please try again.";
+        header("location: login.php?error=1"); 
     }
 
     
diff --git a/vendor-dashboard-orders-edit.php b/vendor-dashboard-orders-edit.php
index 06b7ac9..32f428d 100644
--- a/vendor-dashboard-orders-edit.php
+++ b/vendor-dashboard-orders-edit.php
@@ -116,6 +116,9 @@ $array = json_decode($result, true);
                                         <li><a href="vendor-dashboard.php">Dashboard</a></li>
                                         <li><a href="vendor-uploads-add-product-action.php">Upload Product</a></li>
                                         <li><a href="vendor-settings.php">Settings (Edit)</a></li>
+                                        <li><a href="vendor-refund-history.php">Vendor Refund History</a></li>
+                                        <li><a href="vendor-payments.php">Payments</a></li>
+                                        <li><a href="vendor-payouts.php">Payouts</a></li>
                                     </ul>
                                 </div>
                             </div>
diff --git a/vendor-dashboard.php b/vendor-dashboard.php
index 9e1c126..38ae990 100644
--- a/vendor-dashboard.php
+++ b/vendor-dashboard.php
@@ -268,7 +268,7 @@ if (is_array($vendorOrderss)) {
                                                     <td><span><?php echo  $item['product']['name']; ?></span></td>
                                                     <td><span><?php echo  $orderItems['status']; ?></span></td>
                                                     <td><span><?php echo  $orderItems['shipping_address']['shipping_first_name']; ?></span></td>
-                                                    <td><span><?php echo  $item['price']; ?></span></td>
+                                                    <td><span><?php echo  $orderItems['total_amount']; ?></span></td>
                                                     <td style="display:flex; justify-content:center; margin-top:-4px;">
                                                         <span onclick="editVendorOrder('<?php echo $orderItems['_id'] ?>');">
                                                             <a class="mdi mdi-circle-edit-outline" style="font-size: 20px;"></a>