diff --git a/administrator/components/com_j2store/helpers/j2html.php b/administrator/components/com_j2store/helpers/j2html.php
index 771e7c7b..09b3030b 100755
--- a/administrator/components/com_j2store/helpers/j2html.php
+++ b/administrator/components/com_j2store/helpers/j2html.php
@@ -66,9 +66,9 @@ public static function price($name, $value = null, $options = array())
 
         // return price input
         $html = '';
-        $html .= '<div class="input-prepend">';
+        $html .= '<div class="input-group">';
         if (!empty($symbol)) {
-            $html .= '<span class="add-on">' . $symbol . '</span>';
+            $html .= '<span class="input-group-text">' . $symbol . '</span>';
         }
         $html .= '<input type="text" name="' . $name . '" value="' . $value . '"  ' . $optionvalue . '    />';
         $html .= '</div>';
@@ -87,9 +87,9 @@ public static function price_with_data($prefix, $primary_key, $name, $value, $op
         $value = str_replace(str_split('\\/:*?"<>|+-'),'',$value);
         // return price input
         $html = '';
-        $html .= '<div class="input-prepend">';
+        $html .= '<div class="input-group">';
         if (!empty($symbol)) {
-            $html .= '<span class="add-on">' . $symbol . '</span>';
+            $html .= '<span class="input-group-text">' . $symbol . '</span>';
         }
         $html .= '<input type="text" name="' . $prefix . $name . '" value="' . $value . '"  ' . $optionvalue . '    />';
         $html .= '</div>';
@@ -213,22 +213,10 @@ public static function radioBooleanList($name, $value = '', $options = [])
 		$html = '';
 		$id = $options['id'] ?? $name;
 
-		// Display label if hide_label is not set or empty
-		if (empty($options['hide_label'])) {
-			$html .= '<div class="control-group">';
-			$labelText = $options['label_text'] ?? Text::_('JGLOBAL_YES');
-			$html .= self::label($labelText, $options);
-		}
-
 		// Use HTMLHelper to generate the boolean list with localized labels for yes/no
 		$attribs = [];
 		$html .= HTMLHelper::_('select.booleanlist', $name, $attribs, $value, Text::_('JYES'), Text::_('JNO'), $id);
 
-		// Close the control group div if label is displayed
-		if (empty($options['hide_label'])) {
-			$html .= '</div>';
-		}
-
 		return $html;
 	}
 
@@ -663,7 +651,7 @@ public static function country($name, $value, $options)
         $country_id = isset($options['id']) && $options['id'] ? $options['id'] : 'country_id';
         $zone_id = isset($options['zone_id']) && $options['zone_id'] ? $options['zone_id'] : 'zone_id';
         $zone_value = isset($options['zone_value']) && $options['zone_value'] ? $options['zone_value'] : '';
-        $attr = array("onchange" => "changeZone('$country_id',this.value,'$zone_id',$zone_value)", 'id' => $country_id);
+        $attr = array("onchange" => "changeZone('$country_id',this.value,'$zone_id',$zone_value)", 'id' => $country_id, 'class' => 'form-select');
         return self::select()->clearState()
             ->idTag($country_id)
             ->type('genericlist')
@@ -684,7 +672,7 @@ public static function country($name, $value, $options)
     public static function zone($name, $value, $options)
     {
         $zone_id = isset($options['id']) && $options['id'] ? $options['id'] : 'zone_id';
-        $attr = array('id' => $zone_id);
+        $attr = array('id' => $zone_id, 'class' => 'form-select');
         return self::select()->clearState()
             ->idTag($zone_id)
             ->type('genericlist')
@@ -709,13 +697,13 @@ public static function queueKey($name, $value,$options)
         $queue_key = $config->get ( 'queue_key','' );
         $url = 'index.php?option=com_j2store&view=configuration&task=regenerateQueuekey';
         if(empty( $queue_key )){
-            $queue_string = JFactory::getConfig ()->get ( 'sitename','' ).time ();
+            $queue_string = Factory::getApplication()->getConfig()->get ( 'sitename','' ).time ();
             $queue_key = md5 ( $queue_string );
             $config->saveOne ( 'queue_key', $queue_key );
         }
 
         $html = '';
-        $html .= '<div class="alert alert-block alert-info"><strong id="j2store_queue_key">'.$queue_key.'</strong>&nbsp;&nbsp;&nbsp;<a onclick="regenerateQueueKey()" class="btn btn-danger">'.Text::_ ( 'J2STORE_STORE_REGENERATE' ).'</a>
+        $html .= '<div class="alert alert-block alert-info"><strong id="j2store_queue_key">'.$queue_key.'</strong><a onclick="regenerateQueueKey()" class="btn btn-primary btn-sm text-white ms-3"><span class="fas fa-solid fa-redo me-2" aria-hidden="true"></span>'.Text::_ ( 'J2STORE_STORE_REGENERATE' ).'</a>
 		<script>
 		function regenerateQueueKey(){
 			(function($){
@@ -758,7 +746,7 @@ public static function cronLastHit($name,$value,$options){
     public static function customLink($name,$value,$options){
         $id = isset($options['id']) && $options['id'] ? $options['id'] : $name;
         $text = isset($options['text']) && $options['text'] ? $options['text'] : '';
-        return '<a class="btn btn-warning" id="'.$id.'" href="#">'.Text::_($text).'</a>';
+        return '<a class="btn btn-primary btn-sm" id="'.$id.'" href="#">'.Text::_($text).'</a>';
     }
 
     public static function menuItems($name,$value,$options){
@@ -817,13 +805,18 @@ public static function menuItems($name,$value,$options){
                 )
             );
         }else {
-            $html = \Joomla\CMS\HTML\HTMLHelper::_(
-                'select.groupedlist', $groups, $name,
-                array(
-                    'list.attr' => implode(' ',$options), 'id' => $id, 'list.select' => $value, 'group.items' => null, 'option.key.toHtml' => false,
-                    'option.text.toHtml' => false,
-                )
-            );
+	        $attr = [
+		        'id'        => $id,
+		        'list.select' => $value,
+		        'option.key.toHtml' => false,
+		        'option.text.toHtml' => false,
+		        'group.items' => null,
+		        'list.attr' => [
+			        implode(' ',$options),
+			        'class' => 'form-select'
+		        ]
+	        ];
+	        $html = HTMLHelper::_('select.groupedlist', $groups, $name, $attr);
         }
          return $html;
     }
@@ -1351,7 +1344,7 @@ public static function getOrderStatusHtml($id)
         $html = '';
         $item = F0FModel::getTmpInstance('OrderStatuses', 'J2StoreModel')->getItem($id);
         if ($id) {
-            $html .= '<label class="label ' . $item->orderstatus_cssclass . '">' . Text::_($item->orderstatus_name) . '</label>';
+            $html .= '<label class="label badge ' . $item->orderstatus_cssclass . '">' . Text::_($item->orderstatus_name) . '</label>';
         }
         return $html;
     }
@@ -1536,6 +1529,50 @@ public static function checkboxlist($data, $name, $attribs = null, $optKey = 'va
         return $html;
     }
 
+	public static function checkboxswitch($data, $name, $attribs = null, $optKey = 'value', $optText = 'text', $selected = null, $idtag = false,
+	                                    $translate = false)
+	{
+		reset($data);
+
+		if (is_array($attribs)) {
+			$attribs = J2Store::platform()->toString($attribs);
+		}
+
+		$id_text = $idtag ? $idtag : $name;
+
+		$html = '<div class="form-check form-switch">';
+
+		foreach ($data as $obj) {
+			$k = $obj->$optKey;
+			$t = $translate ? Text::_($obj->$optText) : $obj->$optText;
+			$id = (isset($obj->id) ? $obj->id : null);
+
+			$extra = '';
+			$id = $id ? $obj->id : $id_text . $k;
+
+			if (is_array($selected)) {
+				foreach ($selected as $val) {
+					$k2 = is_object($val) ? $val->$optKey : $val;
+
+					if ($k == $k2) {
+						$extra .= ' selected="selected" ';
+						break;
+					}
+				}
+			} else {
+				$extra .= ((string)$k == (string)$selected ? ' checked="checked" ' : '');
+			}
+
+			$html .= '<input type="checkbox" name="' . $name . '" id="' . $id . '" value="' . $k . '" ' . $extra. $attribs . ' >';
+			$html .= '<label for="' . $id . '" id="' . $id . '-lbl" class="form-check-label">';
+			$html .= $t;
+			$html .= '</label>';
+		}
+		$html .= '</div>';
+
+		return $html;
+	}
+
     /**
      * Method to return PRO feature notice
      *
@@ -1637,11 +1674,7 @@ public static function fieldSQL($name, $field, $item)
 
 		if (!empty($field['key_field']) && !empty($query) && !empty($item->$name)) {
 			// Get the database instance
-			if (version_compare(JVERSION, '3.99.99', 'lt')) {
-				$db = JFactory::getDbo();
-			} else {
-				$db = Factory::getContainer()->get('DatabaseDriver');
-			}
+			$db = Factory::getContainer()->get('DatabaseDriver');
 
 			// Properly escape column and value
 			$query .= ' WHERE ' . $db->quoteName($field['key_field']) . ' = ' . $db->quote($item->$name);
@@ -1649,11 +1682,7 @@ public static function fieldSQL($name, $field, $item)
 
 		if (!empty($query)) {
 			try {
-				if (version_compare(JVERSION, '3.99.99', 'lt')) {
-					$db = JFactory::getDbo();
-				} else {
-					$db = Factory::getContainer()->get('DatabaseDriver');
-				}
+				$db = Factory::getContainer()->get('DatabaseDriver');
 				$field_data = $db->setQuery($query)->loadObject();
 				$value_field = $field['value_field'] ?? '';
 				$html = $field_data->$value_field ?? '';
@@ -1752,6 +1781,73 @@ public static function fieldCore($name, $field, $item){
 
         return $html;
     }
+	public static function calculateDaysFromStartDate($customer_start_date)
+	{
+		$startDate = new DateTime($customer_start_date);
+		$currentDate = new DateTime();
+		$interval = $startDate->diff($currentDate);
+		return $interval->days;
+	}
+	public static function getCustomerStartDate($orders)
+	{
+		if (!empty($orders) && isset($orders[0]->created_on)) {
+			return $orders[0]->created_on;
+		}
+		return null;
+	}
+	public static function getGrossCustomerSales($orders)
+	{
+		$total = 0;
+		foreach ($orders as $order) {
+			// Check if orderstatus_cssclass is set and does not contain 'danger', 'important', or 'warning'
+			if (isset($order->orderstatus_cssclass) &&
+				!str_contains($order->orderstatus_cssclass, 'danger') &&
+				!str_contains($order->orderstatus_cssclass, 'important') &&
+				!str_contains($order->orderstatus_cssclass, 'warning'))
+			{
+				$total += (float) $order->order_total;
+			}
+		}
+		return $total;
+	}
+	public static function getSumCustomerOrders($orders)
+	{
+		foreach ($orders as $order) {
+			// Ensure orderstatus_cssclass is set and does not contain 'danger', 'important', or 'warning'
+			if (isset($order->orderstatus_cssclass) &&
+				!str_contains($order->orderstatus_cssclass, 'danger') &&
+				!str_contains($order->orderstatus_cssclass, 'important') &&
+				!str_contains($order->orderstatus_cssclass, 'warning'))
+			{
+				$count++;
+			}
+		}
+		return $count;
+	}
+	public static function countUserOrders($userId)
+	{
+		$db = Factory::getContainer()->get('DatabaseDriver');
+		$query = $db->getQuery(true)
+			->select('COUNT(*)')
+			->from($db->quoteName('#__j2store_orders'))
+			->where($db->quoteName('user_id') . ' = ' . (int) $userId);
+		$db->setQuery($query);
+		$count = $db->loadResult();
+		return $count;
+	}
+
+	public static function getUserOrders($user_id)
+	{
+		$db = Factory::getContainer()->get('DatabaseDriver');
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__j2store_orders'))
+			->where($db->quoteName('user_id') . ' = ' . (int) $user_id);
+		$db->setQuery($query);
+		$orders = $db->loadObjectList();
+		return $orders;
+	}
+
 }
 
 class J2Select extends JObject
diff --git a/media/j2store/css/J4/j2store_admin.css b/media/j2store/css/J4/j2store_admin.css
index 18bdfe6a..9a71df93 100755
--- a/media/j2store/css/J4/j2store_admin.css
+++ b/media/j2store/css/J4/j2store_admin.css
@@ -453,10 +453,7 @@ span.required{display: inline; float: left;}
     font-size: 14px;
     line-height: 1;
 }
-/*.social-share {*/
-/*    float: right;*/
-/*    margin: -35px 10px;*/
-/*}*/
+
 .social-share .btn{
     background:transparent;
     border-color:#808b9c;
@@ -578,7 +575,7 @@ div.j2store-tab-container{
     -moz-border-radius: 4px;
     border:1px solid #ddd;
     margin-top: 20px;
-    margin-left: 50px;
+    margin-inline-start: 50px;
     -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
     box-shadow: 0 6px 12px rgba(0,0,0,.175);
     -moz-box-shadow: 0 6px 12px rgba(0,0,0,.175);
@@ -618,9 +615,8 @@ div.j2store-tab-menu div.list-group>a.active .fa{
     color: #ffffff;
 }
 
-div.j2store-tab-content{
+div.j2store-tab-content{    
     background-color: #ffffff;
-    /* border: 1px solid #eeeeee; */
     padding-left: 20px;
     padding-top: 10px;
 }
@@ -630,20 +626,21 @@ div.j2store-tab div.j2store-tab-content:not(.active){
 }
 
 /* product form */
-.j2store-product-edit-form {
-    background: none repeat scroll 0 0 #f0f3f3;
-    padding: 20px 10px;
+#fieldset-j2store.options-form {
+  padding: 0.5vw 1vw;
+}
+
+#fieldset-j2store.options-form > legend {
+  margin-bottom: 0.25rem;
 }
 
-.j2store-product-edit-form label {
-    font-size: 100%;
-    font-weight: 700;
-    color: #565656;
+.j2store-product-edit-form {
+  background: none repeat scroll 0 0 var(--admin-background);
+  padding: 20px;
 }
 
-.j2store-product-edit-form label.control-label {
-    padding-top: 0px;
-    width: 180px;
+.filterRemove {
+  cursor:pointer;
 }
 
 .j2store-product-edit-form .tabs-left > .nav-tabs > li > a {
@@ -694,7 +691,7 @@ div.j2store-tab div.j2store-tab-content:not(.active){
     transition: all 0.2s ease-in-out 0s;
     text-decoration: none;
     color: #fff;
-    margin-right: 10px;
+    margin-inline-end: 10px;
 }
 
 /*apps */
@@ -757,13 +754,12 @@ div.j2store-tab div.j2store-tab-content:not(.active){
     width: 120px;
     display: inline;
     float: left;
-    margin-right: 5px;
+    margin-inline-end: 5px;
 }
 
 .j2store_field_required {
-    float: left;
     color: #ff0000;
-    margin-right: 2px;
+    margin-inline-start: 3px;
 }
 
 #myFileModal .modal-body {
@@ -805,7 +801,7 @@ div.j2store-tab div.j2store-tab-content:not(.active){
     flex-direction: row;
 }
 #j2store-navbar .nav-link {
-    margin-right: 10px;
+    margin-inline-end: 10px;
 }
 #j2store-navbar .navbar-nav .nav-item .nav-link {
     display: inline;
@@ -850,9 +846,7 @@ div.j2store-tab div.j2store-tab-content:not(.active){
     position: relative;
 }
 
-/*#j2store-navbar .collapse:not(.show) {
-    display: block;
-}*/
+
 #j2store-navbar .btn-group h3{
     color: #FFFFFF;
     margin-top: -24px;
@@ -886,22 +880,15 @@ div.j2store-tab div.j2store-tab-content:not(.active){
         background-color:#132f53;
     }
     #j2store-navbar .img-circle {height:32px;width:auto;}
-    #j2store-navbar .navbar-nav .nav-item .nav-link {display: block;margin-right:0;width:100%;}
+    #j2store-navbar .navbar-nav .nav-item .nav-link {
+      display: block;
+      margin-inline-end:0;
+      width:100%;
+    }
     #j2store-navbar .navbar-nav .dropdown-menu {
         position: static;
     }
-    /*#j2store-navbar .collapse:not(.show) {
-        display: none;
-    }*/
-
-   /* #j2store-navbar .nav-item {
-        padding: 10px 47px;
-    }*/
-    /*#j2store-navbar .navbar {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }*/
+
     #j2store-navbar .btn-group h3 {
         color: #FFFFFF;
         margin: -40px -117px;
@@ -926,13 +913,68 @@ div.j2store-tab div.j2store-tab-content:not(.active){
 .com_j2store a[target="_blank"]::before{
     content: none !important;
 }
-.com_j2store joomla-field-fancy-select .choices{
-    width: 260px;
-}
 
 .com_j2store .min-w-0 {min-width:0!important;}
 .com_j2store .form-control-qty {max-width:150px!important;}
 .com_j2store .j2commerce-app-image {width:140px;}
-.com_j2store .inventory-form-control {width:60px;}
+.com_j2store .inventory-form-control {width:90px;}
 .com_j2store .table.itemList.options-list .field-media-wrapper .field-media-preview {height:100px;}
 .com_j2store .table.itemList.options-list joomla-field-media .field-media-preview-icon {background-size: 4rem;width: 4rem;height: 4rem;}
+.com_j2store .text-subdued {color:#64748b;}
+.com_j2store .max-content-height {height: max-content;}
+.com_j2store .width-48 {width: 48px;}
+.com_j2store .height-48 {height: 48px;}
+.com_j2store .width-64 {width: 64px;}
+.com_j2store .height-64 {height: 64px;}
+
+@media (min-width: 300px) {
+    .w-xs-25 { width: 25% !important; }
+    .w-xs-50 { width: 50% !important; }
+    .w-xs-75 { width: 75% !important; }
+    .w-xs-100 { width: 100% !important; }
+    .w-xs-auto { width: auto !important; }
+}
+/* Small devices (≥576px) */
+@media (min-width: 576px) {
+    .w-sm-25 { width: 25% !important; }
+    .w-sm-50 { width: 50% !important; }
+    .w-sm-75 { width: 75% !important; }
+    .w-sm-100 { width: 100% !important; }
+    .w-sm-auto { width: auto !important; }
+}
+
+/* Medium devices (≥768px) */
+@media (min-width: 768px) {
+    .w-md-25 { width: 25% !important; }
+    .w-md-50 { width: 50% !important; }
+    .w-md-75 { width: 75% !important; }
+    .w-md-100 { width: 100% !important; }
+    .w-md-auto { width: auto !important; }
+}
+
+/* Large devices (≥992px) */
+@media (min-width: 992px) {
+    .w-lg-25 { width: 25% !important; }
+    .w-lg-50 { width: 50% !important; }
+    .w-lg-75 { width: 75% !important; }
+    .w-lg-100 { width: 100% !important; }
+    .w-lg-auto { width: auto !important; }
+}
+
+/* Extra large devices (≥1200px) */
+@media (min-width: 1200px) {
+    .w-xl-25 { width: 25% !important; }
+    .w-xl-50 { width: 50% !important; }
+    .w-xl-75 { width: 75% !important; }
+    .w-xl-100 { width: 100% !important; }
+    .w-xl-auto { width: auto !important; }
+}
+
+/* Extra extra large devices (≥1400px) */
+@media (min-width: 1400px) {
+    .w-xxl-25 { width: 25% !important; }
+    .w-xxl-50 { width: 50% !important; }
+    .w-xxl-75 { width: 75% !important; }
+    .w-xxl-100 { width: 100% !important; }
+    .w-xxl-auto { width: auto !important; }
+}
diff --git a/media/j2store/css/backend/editview.css b/media/j2store/css/backend/editview.css
index 8bb02429..5a2611b7 100755
--- a/media/j2store/css/backend/editview.css
+++ b/media/j2store/css/backend/editview.css
@@ -1,34 +1,12 @@
-
-
-/* tab content */
 .com_j2store .tab-content{
     margin-top:20px;
 }
-
-/*input field */
-
-.com_j2store .control-group .controls .field-calendar .input-group .form-control{
-    width: auto !important;
-    flex: none;
-}
-
-.com_j2store  .control-group .controls .input-group .form-control {
-    width:150px;
-    flex:none;
-}
-
-.com_j2store select:not(.form-select) {
-    width: 203px;
-    padding: 4px 4px;
-}
-
 .com_j2store .input-xxlarge{
     width:auto;
 }
 .com_j2store .input-mini {
     width: 60px;
 }
- /*label*/
 .com_j2store .view-orders  label {
     display: block;
     margin-bottom: 5px;
@@ -40,44 +18,3 @@
     color: #132f53;
 }
 
-.com_j2store legend{
-    color: #142842;
-}
-.com_j2store .btn-toolbar .btn-wrapper {
-    display: inline-block;
-    margin: 0 0 8px 5px;
-}
-.com_j2store #payment_shipping_methods #shippingcost-pane textarea {
-    width: 203px;
-    padding: 4px 4px;
-}
-.com_j2store .hero-unit{
-    text-align: center;
-    padding: 60px;
-    margin-bottom: 30px;
-    font-size: 18px;
-    line-height: 27px;
-    color: inherit;
-    background-color: #eee;
-    border-radius: 6px;
-}
-.com_j2store .center {
-    text-align: center;
-}
-.com_j2store .j2store_configuration_edit input[value="0"].btn-check:checked  + .btn-outline-success{
-    background-color: #802420;
-    border-color: #802420;
-    color: #fff;
-}
-.com_j2store .j2store_configuration_edit .btn-outline-success:hover {
-    color: #000;
-    background-color: #fff;
-    border-color: #000;
-}
-.com_j2store .control-group .controls  .field-user-wrapper .input-group .form-control{
-    width: 150px !important;
-    flex: none;
-}
-.com_j2store.task-add .form-horizontal,.com_j2store .view-taxprofile,.com_j2store.task-createOrder .form-horizontal {
-    padding: 10px 36px;
-}