diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
index 640e10ebd..982033ebc 100644
--- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
@@ -29,10 +29,10 @@ class AttributeDataGrid
             'name' => 'Attributes',
             'table' => 'attributes',
             'select' => 'id',
-            'perpage' => 10,
-            'aliased' => false, //use this with false as default and true in case of joins
+            'perpage' => 5,
+            'aliased' => true,
 
-            'massoperations' =>[
+            'massoperations' => [
                 [
                     'route' => route('admin.datagrid.delete'),
                     'method' => 'DELETE',
@@ -55,20 +55,11 @@ class AttributeDataGrid
                 ],
             ],
 
-            'join' => [
-                // [
-                //     'join' => 'leftjoin',
-                //     'table' => 'roles as r',
-                //     'primaryKey' => 'u.role_id',
-                //     'condition' => '=',
-                //     'secondaryKey' => 'r.id',
-                // ]
-            ],
+            'join' => [],
 
             //use aliasing on secodary columns if join is performed
 
             'columns' => [
-
                 [
                     'name' => 'id',
                     'alias' => 'attributeId',
@@ -95,73 +86,106 @@ class AttributeDataGrid
                     'alias' => 'attributeType',
                     'type' => 'string',
                     'label' => 'Type',
-                    'sortable' => true,
+                    'sortable' => false,
                 ],
                 [
                     'name' => 'is_required',
                     'alias' => 'attributeIsRequired',
                     'type' => 'string',
                     'label' => 'Required',
-                    'sortable' => true,
+                    'sortable' => false,
+                    'wrapper' => function ($value) {
+                        if($value == 0)
+                            return "False";
+                        else
+                            return "True";
+                    },
                 ],
                 [
                     'name' => 'is_unique',
                     'alias' => 'attributeIsUnique',
                     'type' => 'string',
                     'label' => 'Unique',
-                    'sortable' => true,
+                    'sortable' => false,
+                    'wrapper' => function ($value) {
+                        if($value == 0)
+                            return "False";
+                        else
+                            return "True";
+                    },
                 ],
                 [
                     'name' => 'value_per_locale',
                     'alias' => 'attributeValuePerLocale',
                     'type' => 'string',
                     'label' => 'ValuePerLocale',
-                    'sortable' => true,
+                    'sortable' => false,
+                    'wrapper' => function ($value) {
+                        if($value == 0)
+                            return "False";
+                        else
+                            return "True";
+                    },
                 ],
                 [
                     'name' => 'value_per_channel',
                     'alias' => 'attributeValuePerChannel',
                     'type' => 'string',
                     'label' => 'ValuePerChannel',
-                    'sortable' => true,
+                    'sortable' => false,
+                    'wrapper' => function ($value) {
+                        if($value == 0)
+                            return "False";
+                        else
+                            return "True";
+                    },
                 ],
-
             ],
 
             'filterable' => [
-                // [
-                //     'column' => 'id',
-                //     'alias' => 'attribute_family_id',
-                //     'type' => 'number',
-                //     'label' => 'ID',
-                // ],
-                // [
-                //     'column' => 'code',
-                //     'alias' => 'attribute_family_code',
-                //     'type' => 'string',
-                //     'label' => 'Code',
-                // ],
-                // [
-                //     'column' => 'name',
-                //     'alias' => 'attribute_family_name',
-                //     'type' => 'string',
-                //     'label' => 'Name',
-                // ],
+                [
+                    'column' => 'id',
+                    'alias' => 'attributeId',
+                    'type' => 'number',
+                    'label' => 'ID',
+                ],
+                [
+                    'column' => 'code',
+                    'alias' => 'attributeCode',
+                    'type' => 'string',
+                    'label' => 'Code',
+                ],
+                [
+                    'column' => 'admin_name',
+                    'alias' => 'attributeAdminName',
+                    'type' => 'string',
+                    'label' => 'AdminName',
+                ],
+                [
+                    'column' => 'type',
+                    'alias' => 'attributeType',
+                    'type' => 'string',
+                    'label' => 'Type',
+                ],
             ],
 
             //don't use aliasing in case of searchables
-
             'searchable' => [
-                // [
-                //     'column' => 'name',
-                //     'type' => 'string',
-                //     'label' => 'Name',
-                // ],
-                // [
-                //     'column' => 'code',
-                //     'type' => 'string',
-                //     'label' => 'Code',
-                // ],
+                [
+                    'column' => 'code',
+                    'alias' => 'attributeCode',
+                    'type' => 'string',
+                ],
+                [
+                    'column' => 'admin_name',
+                    'alias' => 'attributeAdminName',
+                    'type' => 'string',
+                ],
+                [
+                    'column' => 'type',
+                    'alias' => 'attributeType',
+                    'type' => 'string',
+                ],
             ],
 
             //list of viable operators that will be used
@@ -176,16 +200,14 @@ class AttributeDataGrid
                 'like' => "like",
                 'nlike' => "not like",
             ],
-            // 'css' => []
 
+            // 'css' => []
         ]);
 
     }
 
     public function render()
     {
-
         return $this->createAttributeDataGrid()->render();
-
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
index 5f85e2f2d..08012cfb2 100644
--- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
@@ -69,7 +69,6 @@ class CategoryDataGrid
                     'condition' => '=',
                     'secondaryKey' => 'cta.category_id',
                 ],
-
             ],
 
             //use aliasing on secodary columns if join is performed
@@ -105,44 +104,56 @@ class CategoryDataGrid
                     'type' => 'string',
                     'label' => 'Visible in Menu',
                     'sortable' => true,
+                    'wrapper' => function ($value) {
+                        if($value == 0)
+                            return "False";
+                        else
+                            return "True";
+                    },
                 ],
 
             ],
 
             'filterable' => [
-                // [
-                //     'column' => 'id',
-                //     'alias' => 'attribute_family_id',
-                //     'type' => 'number',
-                //     'label' => 'ID',
-                // ],
-                // [
-                //     'column' => 'code',
-                //     'alias' => 'attribute_family_code',
-                //     'type' => 'string',
-                //     'label' => 'Code',
-                // ],
-                // [
-                //     'column' => 'name',
-                //     'alias' => 'attribute_family_name',
-                //     'type' => 'string',
-                //     'label' => 'Name',
-                // ],
+                [
+                    'column' => 'cat.id',
+                    'alias' => 'catID',
+                    'type' => 'number',
+                    'label' => 'Category ID',
+                ], [
+                    'column' => 'ct.name',
+                    'alias' => 'catName',
+                    'type' => 'string',
+                    'label' => 'Category Name',
+                ], [
+                    'column' => 'cta.name',
+                    'alias' => 'parentName',
+                    'type' => 'string',
+                    'label' => 'Parent Name',
+                ], [
+                    'column' => 'cat.status',
+                    'alias' => 'catStatus',
+                    'type' => 'string',
+                    'label' => 'Visible in Menu',
+                ],
             ],
 
             //don't use aliasing in case of searchables
 
             'searchable' => [
-                // [
-                //     'column' => 'name',
-                //     'type' => 'string',
-                //     'label' => 'Name',
-                // ],
-                // [
-                //     'column' => 'code',
-                //     'type' => 'string',
-                //     'label' => 'Code',
-                // ],
+                [
+                    'column' => 'cat.id',
+                    'type' => 'number',
+                    'label' => 'Category ID',
+                ], [
+                    'column' => 'ct.name',
+                    'type' => 'string',
+                    'label' => 'Category Name',
+                ], [
+                    'column' => 'cat.status',
+                    'type' => 'string',
+                    'label' => 'Visible in Menu',
+                ]
             ],
 
             //list of viable operators that will be used
@@ -158,14 +169,11 @@ class CategoryDataGrid
                 'nlike' => "not like",
             ],
             // 'css' => []
-
         ]);
-
     }
 
     public function render()
     {
-
         return $this->createCategoryDataGrid()->render();
 
     }
diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
index 592b0f5b4..070694ca2 100644
--- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
@@ -30,14 +30,14 @@ class CustomerDataGrid
             'table' => 'customers',
             'select' => 'id',
             'perpage' => 10,
-            'aliased' => false, //use this with false as default and true in case of joins
+            'aliased' => true, //use this with false as default and true in case of joins
 
             'massoperations' =>[
                 [
                     'route' => route('admin.datagrid.delete'),
                     'method' => 'DELETE',
                     'label' => 'Delete',
-                    'type' => 'button',
+                    'type' => 'button', //select || button only
                 ],
             ],
 
@@ -56,53 +56,45 @@ class CustomerDataGrid
             ],
 
             'join' => [
-                // [
-                //     'join' => 'leftjoin',
-                //     'table' => 'roles as r',
-                //     'primaryKey' => 'u.role_id',
-                //     'condition' => '=',
-                //     'secondaryKey' => 'r.id',
-                // ]
+
             ],
 
             //use aliasing on secodary columns if join is performed
-
             'columns' => [
-
                 [
                     'name' => 'id',
-                    'alias' => 'customerId',
+                    'alias' => 'ID',
                     'type' => 'number',
-                    'label' => 'ID',
+                    'label' => 'Customer ID',
                     'sortable' => true,
                 ],
                 [
                     'name' => 'first_name',
-                    'alias' => 'customerFirstName',
+                    'alias' => 'FirstName',
                     'type' => 'string',
-                    'label' => 'Name',
-                    'sortable' => true,
+                    'label' => 'Customer First Name',
+                    'sortable' => false,
                 ],
                 [
                     'name' => 'email',
-                    'alias' => 'customerEmail',
+                    'alias' => 'Email',
                     'type' => 'string',
-                    'label' => 'Email',
-                    'sortable' => true,
+                    'label' => 'Customer E-Mail',
+                    'sortable' => false,
                 ],
                 [
                     'name' => 'phone',
-                    'alias' => 'customerPhone',
+                    'alias' => 'Phone',
                     'type' => 'number',
-                    'label' => 'Phone',
+                    'label' => 'Customer Phone',
                     'sortable' => true,
                 ],
                 [
                     'name' => 'customer_group_id',
-                    'alias' => 'customerGroupId',
+                    'alias' => 'CustomerGroupId',
                     'type' => 'number',
                     'label' => 'Customer Group',
-                    'sortable' => true,
+                    'sortable' => false,
                 ],
             ],
 
@@ -111,49 +103,31 @@ class CustomerDataGrid
             'filterable' => [
 
                 [
-                    'name' => 'id',
-                    'alias' => 'customerId',
+                    'column' => 'id',
+                    'alias' => 'ID',
                     'type' => 'number',
-                    'label' => 'ID',
+                    'label' => 'Customer ID',
                 ],
                 [
-                    'name' => 'first_name',
-                    'alias' => 'customerFirstName',
+                    'column' => 'first_name',
+                    'alias' => 'FirstName',
                     'type' => 'string',
-                    'label' => 'Name',
-                ],
-                [
-                    'name' => 'email',
-                    'alias' => 'customerEmail',
-                    'type' => 'string',
-                    'label' => 'Email',
-                ],
-                [
-                    'name' => 'phone',
-                    'alias' => 'customerPhone',
-                    'type' => 'number',
-                    'label' => 'Phone',
-                ],
-                [
-                    'name' => 'customer_group_id',
-                    'alias' => 'customerGroupId',
-                    'type' => 'string',
-                    'label' => 'Customer Group',
-                ],
+                    'label' => 'Customer First Name',
+                ]
             ],
 
             //don't use aliasing in case of searchables
 
             'searchable' => [
                 [
-                    'column' => 'first_name',
+                    'column' => 'FirstName',
                     'type' => 'string',
-                    'label' => 'Title',
+                    'label' => 'Customer First Name',
                 ],
                 [
                     'column' => 'email',
                     'type' => 'string',
-                    'label' => 'Rating',
+                    'label' => 'Customer E-Mail',
                 ],
             ],
 
diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
index fff921c47..2360e9e89 100644
--- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
@@ -19,7 +19,7 @@ class CustomerReviewDataGrid
      * The CustomerReviewDataGrid
      * implementation.
      *
-     * @var ReviewsDataGrid
+     * @var CustomerReviewsDataGrid
      * for Reviews
      */
 
@@ -57,13 +57,6 @@ class CustomerReviewDataGrid
             ],
 
             'join' => [
-                // [
-                //     'join' => 'leftjoin',
-                //     'table' => 'roles as r',
-                //     'primaryKey' => 'u.role_id',
-                //     'condition' => '=',
-                //     'secondaryKey' => 'r.id',
-                // ]
             ],
 
             //use aliasing on secodary columns if join is performed
@@ -76,67 +69,51 @@ class CustomerReviewDataGrid
                     'type' => 'number',
                     'label' => 'ID',
                     'sortable' => true,
-                ],
-                [
+                ], [
                     'name' => 'title',
                     'alias' => 'titleName',
                     'type' => 'string',
                     'label' => 'Title',
                     'sortable' => true,
-                ],
-                [
-                    'name' => 'rating',
-                    'alias' => 'productRating',
-                    'type' => 'number',
-                    'label' => 'Rating',
-                    'sortable' => true,
-                ],
-                [
+                ], [
                     'name' => 'comment',
                     'alias' => 'productComment',
                     'type' => 'string',
                     'label' => 'Comment',
                     'sortable' => true,
-                ],
-                [
+                ], [
                     'name' => 'status',
                     'alias' => 'reviewStatus',
                     'type' => 'number',
                     'label' => 'Status',
                     'sortable' => true,
                 ],
-
             ],
 
             //don't use aliasing in case of filters
-
             'filterable' => [
                 [
-                    'name' => 'id',
+                    'column' => 'id',
                     'alias' => 'reviewId',
                     'type' => 'number',
                     'label' => 'ID',
-                ],
-                [
-                    'name' => 'title',
+                ], [
+                    'column' => 'title',
                     'alias' => 'titleName',
                     'type' => 'string',
                     'label' => 'Title',
-                ],
-                [
-                    'name' => 'rating',
+                ], [
+                    'column' => 'rating',
                     'alias' => 'productRating',
                     'type' => 'number',
                     'label' => 'Rating',
-                ],
-                [
-                    'name' => 'comment',
+                ], [
+                    'column' => 'comment',
                     'alias' => 'productComment',
                     'type' => 'string',
                     'label' => 'Comment',
-                ],
-                [
-                    'name' => 'status',
+                ], [
+                    'column' => 'status',
                     'alias' => 'reviewStatus',
                     'type' => 'string',
                     'label' => 'Status',
@@ -144,14 +121,12 @@ class CustomerReviewDataGrid
             ],
 
             //don't use aliasing in case of searchables
-
             'searchable' => [
                 [
                     'column' => 'title',
                     'type' => 'string',
                     'label' => 'Title',
-                ],
-                [
+                ], [
                     'column' => 'rating',
                     'type' => 'number',
                     'label' => 'Rating',
diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
index 876587c00..85d091a3b 100644
--- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
@@ -64,7 +64,6 @@ class InventorySourcesDataGrid
             ],
 
             //use aliasing on secodary columns if join is performed
-
             'columns' => [
 
                 [
@@ -73,34 +72,36 @@ class InventorySourcesDataGrid
                     'type' => 'number',
                     'label' => 'ID',
                     'sortable' => true,
-                ],
-                [
+                ], [
                     'name' => 'code',
                     'alias' => 'inventoryCode',
                     'type' => 'string',
                     'label' => 'Code',
-                    'sortable' => true,
-                ],
-                [
+                    'sortable' => false,
+                ], [
                     'name' => 'name',
                     'alias' => 'inventoryName',
                     'type' => 'string',
                     'label' => 'Name',
-                    'sortable' => true,
-                ],
-                [
+                    'sortable' => false,
+                ], [
                     'name' => 'priority',
                     'alias' => 'inventoryPriority',
                     'type' => 'string',
                     'label' => 'Priority',
                     'sortable' => true,
-                ],
-                [
+                ], [
                     'name' => 'status',
                     'alias' => 'inventoryStatus',
                     'type' => 'string',
                     'label' => 'Status',
                     'sortable' => true,
+                    'wrapper' => function ($value) {
+                        if($value == 0)
+                            return "In Active";
+                        else
+                            return "Active";
+                    },
                 ],
 
             ],
diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
new file mode 100644
index 000000000..5324637a4
--- /dev/null
+++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace Webkul\Admin\DataGrids;
+
+use Illuminate\View\View;
+use Webkul\Ui\DataGrid\Facades\DataGrid;
+
+/**
+ * Order DataGrid
+ *
+ * @author    Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+
+class OrderDataGrid
+{
+    /**
+     * The Data Grid implementation.
+     *
+     * @var AttributeDataGrid
+     * for countries
+     */
+
+    public function createCategoryDataGrid()
+    {
+
+            return DataGrid::make([
+            'name' => 'Orders',
+            'table' => 'orders as ord',
+            'select' => 'ord.id',
+            'perpage' => 5,
+            'aliased' => true, //use this with false as default and true in case of joins
+
+            'massoperations' =>[
+                [
+                    'route' => route('admin.datagrid.delete'),
+                    'method' => 'DELETE',
+                    'label' => 'Delete',
+                    'type' => 'button',
+                ],
+            ],
+
+            'actions' => [
+                [
+                    'type' => 'Edit',
+                    'route' => route('admin.datagrid.delete'),
+                    'confirm_text' => 'Do you really want to do this?',
+                    'icon' => 'icon pencil-lg-icon',
+                ], [
+                    'type' => 'Delete',
+                    'route' => route('admin.datagrid.delete'),
+                    'confirm_text' => 'Do you really want to do this?',
+                    'icon' => 'icon trash-icon',
+                ],
+            ],
+
+            'join' => [
+                [
+                    'join' => 'leftjoin',
+                    'table' => 'category_translations as ct',
+                    'primaryKey' => 'cat.id',
+                    'condition' => '=',
+                    'secondaryKey' => 'ct.category_id',
+                ], [
+                    'join' => 'leftjoin',
+                    'table' => 'category_translations as cta',
+                    'primaryKey' => 'cat.parent_id',
+                    'condition' => '=',
+                    'secondaryKey' => 'cta.category_id',
+                ],
+            ],
+
+            //use aliasing on secodary columns if join is performed
+
+            'columns' => [
+                [
+                    'name' => 'cat.id',
+                    'alias' => 'catID',
+                    'type' => 'number',
+                    'label' => 'Category ID',
+                    'sortable' => true,
+                ], [
+                    'name' => 'ct.name',
+                    'alias' => 'catName',
+                    'type' => 'string',
+                    'label' => 'Category Name',
+                    'sortable' => false,
+                ], [
+                    'name' => 'cat.position',
+                    'alias' => 'catPosition',
+                    'type' => 'string',
+                    'label' => 'Category Position',
+                    'sortable' => false,
+                ], [
+                    'name' => 'cta.name',
+                    'alias' => 'parentName',
+                    'type' => 'string',
+                    'label' => 'Parent Name',
+                    'sortable' => true,
+                ], [
+                    'name' => 'cat.status',
+                    'alias' => 'catStatus',
+                    'type' => 'string',
+                    'label' => 'Visible in Menu',
+                    'sortable' => true,
+                    'wrapper' => function ($value) {
+                        if($value == 0)
+                            return "False";
+                        else
+                            return "True";
+                    },
+                ],
+
+            ],
+
+            'filterable' => [
+                [
+                    'column' => 'cat.id',
+                    'alias' => 'catID',
+                    'type' => 'number',
+                    'label' => 'Category ID',
+                ], [
+                    'column' => 'ct.name',
+                    'alias' => 'catName',
+                    'type' => 'string',
+                    'label' => 'Category Name',
+                ], [
+                    'column' => 'cta.name',
+                    'alias' => 'parentName',
+                    'type' => 'string',
+                    'label' => 'Parent Name',
+                ], [
+                    'column' => 'cat.status',
+                    'alias' => 'catStatus',
+                    'type' => 'string',
+                    'label' => 'Visible in Menu',
+                ],
+            ],
+
+            //don't use aliasing in case of searchables
+
+            'searchable' => [
+                [
+                    'column' => 'cat.id',
+                    'type' => 'number',
+                    'label' => 'Category ID',
+                ], [
+                    'column' => 'ct.name',
+                    'type' => 'string',
+                    'label' => 'Category Name',
+                ], [
+                    'column' => 'cat.status',
+                    'type' => 'string',
+                    'label' => 'Visible in Menu',
+                ]
+            ],
+
+            //list of viable operators that will be used
+            'operators' => [
+                'eq' => "=",
+                'lt' => "<",
+                'gt' => ">",
+                'lte' => "<=",
+                'gte' => ">=",
+                'neqs' => "<>",
+                'neqn' => "!=",
+                'like' => "like",
+                'nlike' => "not like",
+            ],
+            // 'css' => []
+        ]);
+    }
+
+    public function render()
+    {
+        return $this->createCategoryDataGrid()->render();
+
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
index 25cf5249d..74e236511 100644
--- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php
@@ -129,25 +129,25 @@ class ProductDataGrid
             'filterable' => [
                 //column, type, and label
                 [
-                    'name' => 'prods.id',
+                    'column' => 'prods.id',
                     'alias' => 'productID',
                     'type' => 'number',
                     'label' => 'ID',
                 ],
                 [
-                    'name' => 'prods.sku',
+                    'column' => 'prods.sku',
                     'alias' => 'productCode',
                     'type' => 'string',
                     'label' => 'SKU',
                 ],
                 [
-                    'name' => 'attfam.name',
+                    'column' => 'attfam.name',
                     'alias' => 'FamilyName',
                     'type' => 'string',
                     'label' => 'Family Name',
                 ],
                 [
-                    'name' => 'pi.qty',
+                    'column' => 'pi.qty',
                     'alias' => 'ProductQuantity',
                     'type' => 'number',
                     'label' => 'Product Quatity',
diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
index 361c6cb43..759fb0f45 100644
--- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
@@ -67,28 +67,25 @@ class SliderDataGrid
             //use aliasing on secodary columns if join is performed
 
             'columns' => [
-
                 [
                     'name' => 's.id',
                     'alias' => 'sliderId',
                     'type' => 'number',
                     'label' => 'ID',
                     'sortable' => true,
-                ],
-                [
+                ], [
                     'name' => 's.title',
                     'alias' => 'sliderTitle',
                     'type' => 'string',
                     'label' => 'title',
-                ],
-                [
+                    'sortable' => false
+                ], [
                     'name' => 's.channel_id',
                     'alias' => 'channelId',
                     'type' => 'string',
                     'label' => 'Channel ID',
-                    'sortable' => true,
-                ],
-                [
+                    'sortable' => false,
+                ], [
                     'name' => 'c.name',
                     'alias' => 'channelName',
                     'type' => 'string',
@@ -98,41 +95,31 @@ class SliderDataGrid
             ],
 
             //don't use aliasing in case of filters
-
             'filterable' => [
                 [
-                    'column' => 'id',
-                    'alias' => 'locale_id',
+                    'column' => 's.id',
+                    'alias' => 'sliderId',
                     'type' => 'number',
-                    'label' => 'ID',
-                ],
-                [
-                    'column' => 'code',
-                    'alias' => 'locale_code',
+                    'label' => 'ID'
+                ], [
+                    'column' => 's.title',
+                    'alias' => 'SliderTitle',
                     'type' => 'string',
-                    'label' => 'Code',
-                ],
-                [
-                    'column' => 'name',
-                    'alias' => 'locale_name',
-                    'type' => 'string',
-                    'label' => 'Name',
+                    'label' => 'Slider Title'
                 ],
             ],
 
             //don't use aliasing in case of searchables
-
             'searchable' => [
-                // [
-                //     'column' => 'name',
-                //     'type' => 'string',
-                //     'label' => 'Name',
-                // ],
-                // [
-                //     'column' => 'code',
-                //     'type' => 'string',
-                //     'label' => 'Code',
-                // ],
+                [
+                    'column' => 's.id',
+                    'type' => 'number',
+                    'label' => 'ID'
+                ], [
+                    'column' => 's.title',
+                    'type' => 'string',
+                    'label' => 'Slider Title'
+                ]
             ],
 
             //list of viable operators that will be used
@@ -148,9 +135,7 @@ class SliderDataGrid
                 'nlike' => "not like",
             ],
             // 'css' => []
-
         ]);
-
     }
 
     public function render()
diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php
index e51d10f11..f93464664 100644
--- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php
@@ -24,7 +24,6 @@ class TaxRateDataGrid
     {
 
         return DataGrid::make([
-
             'name' => 'Tax Rates',
             'table' => 'tax_rates as tr',
             'select' => 'tr.id',
@@ -64,21 +63,13 @@ class TaxRateDataGrid
                     'icon' => 'icon trash-icon',
                 ],
             ],
-            'join' => [
-                // [
-                //     'join' => 'leftjoin',
-                //     'table' => 'roles as r',
-                //     'primaryKey' => 'u.role_id',
-                //     'condition' => '=',
-                //     'secondaryKey' => 'r.id',
-                // ]
-            ],
+            'join' => [],
 
             //use aliasing on secodary columns if join is performed
             'columns' => [
                 [
                     'name' => 'tr.id',
-                    'alias' => 'ID',
+                    'alias' => 'id',
                     'type' => 'number',
                     'label' => 'ID',
                     'sortable' => true,
@@ -90,7 +81,7 @@ class TaxRateDataGrid
                     'label' => 'Identifier',
                     'sortable' => true,
                     // 'wrapper' => function ($value, $object) {
-                    //     return '<a class="color-red">' . $object->Name . '</a>';
+                    //     return '<a class="color-red">' . $object->identifier . '</a>';
                     // },
                 ],
                 [
@@ -119,32 +110,27 @@ class TaxRateDataGrid
             //don't use aliasing in case of filters
             'filterable' => [
                 [
-                    'name' => 'tr.id',
+                    'column' => 'tr.id',
                     'alias' => 'ID',
                     'type' => 'number',
                     'label' => 'ID',
-                ],
-                [
-                    'name' => 'tr.identifier',
+                ], [
+                    'column' => 'tr.identifier',
                     'alias' => 'identifier',
                     'type' => 'string',
                     'label' => 'Identifier',
-                ],
-                [
-                    'name' => 'tr.state',
+                ], [
+                    'column' => 'tr.state',
                     'alias' => 'state',
                     'type' => 'string',
                     'label' => 'State',
-                ],
-                [
-                    'name' => 'tr.country',
+                ], [
+                    'column' => 'tr.country',
                     'alias' => 'country',
                     'type' => 'string',
                     'label' => 'Country',
-                ],
-
-                [
-                    'name' => 'tr.tax_rate',
+                ], [
+                    'column' => 'tr.tax_rate',
                     'alias' => 'tax_rate',
                     'type' => 'number',
                     'label' => 'Tax Rate',
@@ -157,22 +143,6 @@ class TaxRateDataGrid
                     'type' => 'string',
                     'label' => 'Identifier',
                 ],
-                [
-                    'column' => 'tr.state',
-                    'type' => 'string',
-                    'label' => 'State',
-                ],
-                [
-                    'column' => 'tr.country',
-                    'type' => 'string',
-                    'label' => 'Country',
-                ],
-
-                [
-                    'column' => 'tr.tax_rate',
-                    'type' => 'number',
-                    'label' => 'Tax Rate',
-                ],
             ],
             'operators' => [
                 'eq' => "=",
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index eebafe9b8..4128e88ca 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -107,8 +107,6 @@ class Cart {
     {
         $product = $this->product->findOneByField('id', $productId);
 
-        // dd($product);
-
         //Check if the product's information is proper or not.
         if(!isset($data['product']) || !isset($data['quantity'])) {
             session()->flash('error', trans('shop::app.checkout.cart.integrity.missing_fields'));
@@ -961,4 +959,24 @@ class Cart {
 
         return $finalData;
     }
+
+    /**
+     * Move to Cart
+     *
+     * Move a wishlist item to cart
+     */
+    public function moveToCart($productId) {
+        $data = [
+            'product' => $productId,
+            'quantity' => 1,
+        ];
+
+        $result = $this->add($productId, $data);
+
+        if($result instanceof Collection || $result == true) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
index 5b3e1a7af..600431d22 100644
--- a/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/WishlistController.php
@@ -5,7 +5,9 @@ namespace Webkul\Customer\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Webkul\Customer\Repositories\CustomerRepository;
+use Webkul\Product\Repositories\ProductRepository;
 use Webkul\Customer\Repositories\WishlistRepository;
+use Cart;
 use Auth;
 
 /**
@@ -26,13 +28,15 @@ class WishlistController extends Controller
 
     protected $wishlist;
 
+    protected $product;
+
     /**
      * Initializes the required repository instances.
      *
      * @param $customer
      * @param $wishlist
      */
-    public function __construct(CustomerRepository $customer, WishlistRepository $wishlist)
+    public function __construct(CustomerRepository $customer, WishlistRepository $wishlist, ProductRepository $product)
     {
         $this->middleware('customer');
 
@@ -41,6 +45,8 @@ class WishlistController extends Controller
         $this->customer = $customer;
 
         $this->wishlist = $wishlist;
+
+        $this->product = $product;
     }
 
     /**
@@ -67,6 +73,15 @@ class WishlistController extends Controller
      * @param integer $itemId
      */
     public function add($itemId) {
+        $product = $this->product->findOneByField('id', $itemId);
+
+        if($product->type == "configurable") {
+            $slug = $product->url_key;
+
+            session()->flash('warning', trans('customer::app.wishlist.select-options'));
+
+            return redirect()->route('shop.products.index', $slug);
+        }
 
         $data = [
             'channel_id' => core()->getCurrentChannel()->id,
@@ -111,12 +126,45 @@ class WishlistController extends Controller
         }
     }
 
+    /**
+     * Add the configurable product
+     * to the wishlist.
+     *
+     * @return response
+     */
+    public function addconfigurable($urlkey) {
+        dd($urlkey);
+        session()->flash('warning', trans('Select options before adding to wishlist'));
+        return redirect()->route('shop.products.index', $urlkey);
+    }
+
     /**
      * Function to move item from wishlist to cart.
      *
      * @param integer $itemId
      */
-    public function moveToCart() {
-        dd('adding item to wishlist');
+    public function moveAll() {
+        Cart::moveAllToCart();
+    }
+
+    /**
+     * Function to move item from wishlist to cart.
+     *
+     * @param integer $itemId
+     */
+    public function move($productId) {
+        $result = Cart::moveToCart($productId);
+
+        $wishlist = $this->wishlist->findWhere(['customer_id' => auth()->guard('customer')->user()->id, 'product_id' => $productId]);
+
+        if($this->wishlist->delete($wishlist[0]->id)) {
+            session()->flash('success', 'Item Moved To Cart Successfully');
+
+            return redirect()->back();
+        } else {
+            session()->flash('error', 'Item Cannot Be Moved To Cart Successfully');
+
+            return redirect()->back();
+        }
     }
 }
diff --git a/packages/Webkul/Customer/src/Resources/lang/en/app.php b/packages/Webkul/Customer/src/Resources/lang/en/app.php
index 470145c57..30f59002c 100644
--- a/packages/Webkul/Customer/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Customer/src/Resources/lang/en/app.php
@@ -7,6 +7,7 @@ return [
         'already' => 'Item Already Present In Your Wishlist',
         'removed' => 'Item Successfully Added To Wishlist',
         'remove-fail' => 'Item Cannot Be Removed From Wishlist',
-        'empty' => 'You Don\'t Have Any Items In Your Wishlist'
+        'empty' => 'You Don\'t Have Any Items In Your Wishlist',
+        'select-options' => 'Need To Select Options Before Adding To Wishlist'
     ],
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Helpers/Review.php b/packages/Webkul/Product/src/Helpers/Review.php
index 992e53971..0cc496b9d 100644
--- a/packages/Webkul/Product/src/Helpers/Review.php
+++ b/packages/Webkul/Product/src/Helpers/Review.php
@@ -7,7 +7,7 @@ class Review extends AbstractProduct
     /**
      * Returns the product's avg rating
      *
-    * @param Product $product
+     * @param Product $product
      * @return float
      */
     public function getReviews($product)
@@ -18,7 +18,7 @@ class Review extends AbstractProduct
     /**
      * Returns the product's avg rating
      *
-    * @param Product $product
+     * @param Product $product
      * @return float
      */
     public function getAverageRating($product)
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 8a89f7159..444862394 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -1,6 +1,7 @@
 <?php
 
 Route::group(['middleware' => ['web']], function () {
+
     Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [
         'view' => 'shop::home.index'
     ])->name('shop.home.index');
@@ -119,6 +120,10 @@ Route::group(['middleware' => ['web']], function () {
 
             Route::get('wishlist/remove/{id}', 'Webkul\Customer\Http\Controllers\WishlistController@remove')->name('customer.wishlist.remove');
 
+            Route::get('wishlist/move/{id}', 'Webkul\Customer\Http\Controllers\WishlistController@move')->name('customer.wishlist.move');
+
+            Route::get('wishlist/moveall', 'Webkul\Customer\Http\Controllers\WishlistController@moveAll')->name('customer.wishlist.moveall');
+
             //customer account
             Route::prefix('account')->group(function () {
 
@@ -163,7 +168,6 @@ Route::group(['middleware' => ['web']], function () {
                 Route::post('address/edit', 'Webkul\Customer\Http\Controllers\AddressController@edit')->defaults('_config', [
                     'redirect' => 'customer.address.index'
                 ])->name('customer.address.edit');
-
                 /*    Routes for Addresses ends here   */
 
                 /* Wishlist route */
@@ -188,5 +192,4 @@ Route::group(['middleware' => ['web']], function () {
         });
     });
     //customer routes end here
-
 });
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/cross-icon-adj.svg b/packages/Webkul/Shop/src/Resources/assets/images/cross-icon-adj.svg
new file mode 100644
index 000000000..d62bc542c
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/assets/images/cross-icon-adj.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>Artboard</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <path d="M9.06852618,23.2496556 L22.5678375,9.75034436" id="Line-2" stroke="#242424" stroke-width="3"></path>
+        <path d="M9.06852618,9.75034436 L22.5678375,23.2496556" id="Line-2" stroke="#242424" stroke-width="3"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 43e4137d8..0c6107496 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -481,7 +481,7 @@ section.slider-block {
         }
 
         .nav a:first-child{
-            margin-left: 20px;
+            // margin-left: 20px;
         }
 
         .nav  li  > .icon{
@@ -1658,62 +1658,52 @@ section.review {
 
     .review-layouter {
         display: flex;
-        flex-flow: row;
-        margin-top: 20px;
+        flex-direction: row;
 
         .product-info {
 
-            .image {
-                border:1px solid red;
-
+            .product-image {
                 img {
+                    display: block;
                     height: 280px;
                     width: 280px;
                 }
             }
 
-            .heading {
+            .product-name {
                 margin-top: 20px;
 
                 span {
                     font-size: 24px;
-
                 }
             }
 
-            .price {
+            .product-price {
                 margin-top: 10px;
 
                 .pro-price {
                     font-size: 24px;
                     color: $disc-price;
-
                 }
 
                 .pro-price-not {
                     margin-left: 10px;
                     color: $disc-price-pro;
-
                 }
 
                 .offer {
                     margin-left: 10px;
-
                 }
             }
         }
 
-        .review-info {
+        .review-form {
             margin-left: 20px;
             width: 49%;
 
             .heading {
                 margin-top: 10px;
 
-                span {
-
-                }
-
                 .btn.btn-primary.right {
                    float: right;
                    margin-top: -10px;
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
index b37e216e4..de24f9f32 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
@@ -1,3 +1,57 @@
+.product-card {
+
+    .product-image {
+        max-height: 350px;
+        max-width: 280px;
+        margin-bottom: 10px;
+        background: #F2F2F2;
+
+        img {
+            display: block;
+            width: 100%;
+        }
+    }
+
+    .product-name {
+        margin-bottom: 14px;
+        width: 100%;
+        color: $font-color;
+
+        a {
+            color: $font-color;
+        }
+    }
+
+    .product-description {
+        display: none;
+    }
+
+    .product-ratings {
+        width: 100%;
+
+        .icon {
+            width: 16px;
+            height: 16px;
+        }
+    }
+
+    .cart-wish-wrap {
+        display: inline-flex;
+        justify-content: flex-start;
+        align-items: center;
+        height: 40px;
+
+        .addtocart {
+            margin-right: 10px;
+            text-transform: uppercase;
+        }
+
+        .add-to-wishlist {
+            margin-top: 5px;
+        }
+    }
+}
+
 // product card, requires no changes for responsiveness.
 .product-grid-4 {
     display: grid;
@@ -43,55 +97,6 @@
     }
 }
 
-.product-card {
-
-    .product-image {
-        max-height: 350px;
-        max-width: 280px;
-        margin-bottom: 10px;
-        background: #F2F2F2;
-
-        img {
-            display: block;
-            width: 100%;
-        }
-    }
-
-    .product-name {
-        margin-bottom: 14px;
-        width: 100%;
-        color: $font-color;
-
-        a {
-            color: $font-color;
-        }
-    }
-
-    .product-description {
-        display: none;
-    }
-
-    .product-ratings {
-        width: 100%;
-
-        .icon {
-            width: 16px;
-            height: 16px;
-        }
-    }
-
-    .cart-fav-seg {
-        display: inline-flex;
-        align-items: center;
-
-        .addtocart {
-            margin-right: 10px;
-            text-transform: uppercase;
-            white-space: nowrap;
-        }
-
-    }
-}
 
 //wishlist icon hover properties
 .add-to-wishlist {
@@ -140,7 +145,7 @@
         text-align: left;
     }
 
-    .account-edit {
+    .account-action {
         font-size: 17px;
         margin-top: 1%;
         color: $brand-color;
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss
index b0eacb07b..d6d741b6b 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss
@@ -15,8 +15,12 @@
     background-image:URL('../images/icon-menu-close.svg');
     width: 24px;
     height: 24px;
-    margin-left:auto;
-    margin-bottom: 2px;
+}
+
+.icon-menu-close-adj {
+    background-image:URL('../images/cross-icon-adj.svg');
+    width: 32px;
+    height: 32px;
 }
 
 .grid-view-icon {
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 1943ef3d8..879c8df7d 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -11,6 +11,13 @@ return [
         ]
     ],
 
+    'reviews' => [
+        'add-review-page-title' => 'Add Review',
+        'write-review' => 'Write a review',
+        'review-title' => 'Give Your Review a Title',
+        'empty' => 'You Haven\'t Reviewed Any Product Yet'
+    ],
+
     'customer' => [
         'signup-text' => [
             'account_exists' => 'Already have an account',
@@ -191,7 +198,11 @@ return [
     'wishlist' => [
         'title' => 'Wishlist',
         'deleteall' => 'Delete All',
-        'moveall' => 'Move All Products To Cart'
+        'moveall' => 'Move All Products To Cart',
+        'move-to-cart' => 'Move To Cart',
+        'empty' => 'You Have No Items In Your Wishlist',
+        'add' => 'Item Successfully Added To Wishlist',
+        'remove' => 'Item Successfully Removed From Wishlist'
     ],
 
     'checkout' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
index 2e29b4de5..ce7c36d75 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
@@ -16,7 +16,7 @@
             <span class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
 
             @if(!$address->isEmpty())
-            <span class="account-edit">
+            <span class="account-action">
                 <a href="{{ route('customer.address.edit') }}">
                     {{ __('shop::app.customer.account.address.index.edit') }}
                 </a>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index aa2752cb7..e6bdef52b 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -7,7 +7,7 @@
         @include('shop::customers.account.partials.sidemenu')
 
         <div class="account-layout">
-            <div class="account-head mb-10">
+            <div class="account-head mb-15">
                 <div class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</div>
             </div>
             <form method="post" action="{{ route('customer.address.create') }}" @submit.prevent="onSubmit">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 15a6a7881..443bcd0d1 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -8,7 +8,7 @@
 
         <div class="account-layout">
 
-            <div class="account-head mb-10">
+            <div class="account-head mb-15">
                 <div class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</div>
             </div>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index ae7fc484e..5ba28e4e9 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -16,7 +16,7 @@
 
             <span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
 
-            <span class="account-edit">
+            <span class="account-action">
                 <a href="{{ route('customer.profile.edit') }}">{{ __('shop::app.customer.account.profile.index.edit') }}</a>
             </span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
index 5e8f30ac0..84f1ba4b5 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/reviews.blade.php
@@ -6,59 +6,41 @@
         @include('shop::customers.account.partials.sidemenu')
 
         <div class="account-layout">
-
             <div class="account-head">
                 <span class="account-heading">Reviews</span>
                 <div class="horizontal-rule"></div>
             </div>
 
             <div class="account-items-list">
-                {{-- <div class="account-item-card mt-15 mb-15">
-                    <div class="media-info">
-                        @php
-                            $image = $productImageHelper->getProductBaseImage($item);
-                        @endphp
-                        <img class="media" src="{{ $image['small_image_url'] }}" />
+                @if(count($reviews))
+                    @foreach($reviews as $review)
+                    <div class="account-item-card mt-15 mb-15">
+                        <div class="media-info">
+                            <?php $image = $productImageHelper->getGalleryImages($review->product); ?>
+                            <img class="media" src="{{ $image[0]['small_image_url'] }}" />
 
-                        <div class="info mt-20">
-                            <div class="product-name">{{$item->name}}</div>
-                        </div>
-                    </div>
+                            <div class="info mt-20">
+                                <div class="product-name">{{$review->product->name}}</div>
 
-                    <div class="operations">
-                        <a class="mb-50" href="{{ route('customer.wishlist.remove', $item->id) }}"><span class="icon trash-icon"></span></a>
+                                <div>
+                                    @for($i=0 ; $i < $review->rating ; $i++)
+                                        <span class="icon star-icon"></span>
+                                    @endfor
+                                </div>
 
-                        <button class="btn btn-primary btn-md">Move To Cart</button>
-                    </div>
-                </div> --}}
-                @foreach($reviews as $review)
-                <div class="account-item-card mt-15 mb-15">
-                    <div class="media-info">
-                        <?php $image = $productImageHelper->getGalleryImages($review->product); ?>
-                        <img class="media" src="{{ $image[0]['small_image_url'] }}" />
-
-                        <div class="info mt-20">
-                            <div class="product-name">{{$review->product->name}}</div>
-
-                            <div>
-                                @for($i=0 ; $i < $review->rating ; $i++)
-                                    <span class="icon star-icon"></span>
-                                @endfor
-                            </div>
-
-                            <div>
-                                {{ $review->comment }}
+                                <div>
+                                    {{ $review->comment }}
+                                </div>
                             </div>
                         </div>
                     </div>
-
-                    <div class="operations">
-
+                    <div class="horizontal-rule mb-10 mt-10"></div>
+                    @endforeach
+                @else
+                    <div class="empty">
+                        {{ __('customer::app.reviews.empty') }}
                     </div>
-
-                </div>
-                <div class="horizontal-rule mb-10 mt-10"></div>
-                @endforeach
+                @endif
             </div>
         </div>
     </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
index ff790f96f..bfb929133 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
@@ -9,11 +9,11 @@
 
     <div class="account-layout">
 
-        <div class="account-head">
+        <div class="account-head mb-15">
             <span class="account-heading">{{ __('shop::app.wishlist.title') }}</span>
 
             @if(count($items))
-            <div class="account-edit">
+            <div class="account-action">
                 <a href="" style="margin-right: 15px;">{{ __('shop::app.wishlist.deleteall') }}</a>
                 <a href="">{{ __('shop::app.wishlist.moveall') }}</a>
             </div>
@@ -40,7 +40,7 @@
                     <div class="operations">
                         <a class="mb-50" href="{{ route('customer.wishlist.remove', $item->id) }}"><span class="icon trash-icon"></span></a>
 
-                        <button class="btn btn-primary btn-md">Move To Cart</button>
+                        <a href="{{ route('customer.wishlist.move', $item->id) }}" class="btn btn-primary btn-md">{{ __('shop::app.wishlist.move-to-cart') }}</a>
                     </div>
                 </div>
                 <div class="horizontal-rule mb-10 mt-10"></div>
diff --git a/packages/Webkul/Shop/src/Resources/views/error.blade.php b/packages/Webkul/Shop/src/Resources/views/error.blade.php
new file mode 100644
index 000000000..d78938fdb
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/error.blade.php
@@ -0,0 +1,19 @@
+@extends('shop::layouts.master')
+@section('content-wrapper')
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+        <div class="wrapper" style="display: flex; height: 100vh; width: 80vw;
+    justify-content: space-between; align-items: center;">
+            <div class="error-box">
+                <div class="error-title">404</div>
+                <div class="error-messgae">Page Not Found</div>
+                <div class="error-description"></div>
+                <a href="url()->to('/')">GO TO HOME</a>
+                {{-- pass the content dynamically --}}
+                Show the exception here or error message here.
+            </div>
+
+        <div class="error-graphic" style="height: 236px; width: 255px; border: 1px solid red; background-image: url('.{{ asset('images.error') }}.')">
+        </div>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/index.blade.php b/packages/Webkul/Shop/src/Resources/views/index.blade.php
index a8e715d27..38d8cd592 100644
--- a/packages/Webkul/Shop/src/Resources/views/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/index.blade.php
@@ -1,22 +1,11 @@
 @inject('rateHelper' , 'Webkul\Shipping\Helper\Rate')
-
-
 <div>
-
     @foreach($rateHelper->collectRates() as $key=>$count)
-
-    <div class="shipping-method">
-
-        <input type="radio" name="price"> ${{ core()->currency($count) }}  <span> {{ $key }} </span>
-
-
-    </div>
-
+        <div class="shipping-method">
+            <input type="radio" name="price"> ${{ core()->currency($count) }}  <span> {{ $key }} </span>
+        </div>
     @endforeach
-
-
 </div>
-
 <style>
     span {
         margin-left: 10px;
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index 2f297f69c..23879816c 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -262,79 +262,46 @@
     </div>
 </div>
 
-
-
 @push('scripts')
+    <script>
+        window.onload = function() {
+            var hamMenu = document.getElementById("hammenu");
+            var search = document.getElementById("search");
+            var searchResponsive = document.getElementsByClassName('search-responsive')[0];
+            var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
+            var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
+            var navResponsive = document.getElementsByClassName('responsive-nav')[0];
+            var thumbList = document.getElementsByClassName('thumb-list')[0];
 
-<script>
+            search.addEventListener("click", header);
+            hamMenu.addEventListener("click", header);
 
-    window.onload = function() {
-        var hamMenu = document.getElementById("hammenu");
-        var search = document.getElementById("search");
-
-        var searchResponsive = document.getElementsByClassName('search-responsive')[0];
-        var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
-        var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
-        var navResponsive = document.getElementsByClassName('responsive-nav')[0];
-        var thumbList = document.getElementsByClassName('thumb-list')[0];
-        var thumbFrame = document.getElementsByClassName('thumb-frame');
-        var productHeroImage = document.getElementsByClassName('product-hero-image')[0];
-
-        search.addEventListener("click", header);
-        hamMenu.addEventListener("click", header);
-
-        // activate on window resize
-        window.addEventListener('resize', function(){
-            if(window.innerWidth > 720){
-                searchResponsive.style.display = 'none';
-                navResponsive.style.display = 'none';
-                if(layerFilter && sortLimit){
-                    layerFilter.style.display ="none";
-                    sortLimit.style.display ="none";
+            // for header responsive icon
+            function header(){
+                var className = document.getElementById(this.id).className;
+                if(className === 'icon icon-search' ){
+                    search.classList.remove("icon-search");
+                    search.classList.add("icon-menu-close");
+                    hamMenu.classList.remove("icon-menu-close");
+                    hamMenu.classList.add("icon-menu");
+                    searchResponsive.style.display = 'block';
+                    navResponsive.style.display = 'none';
+                }else if(className === 'icon icon-menu'){
+                    hamMenu.classList.remove("icon-menu");
+                    hamMenu.classList.add("icon-menu-close");
+                    search.classList.remove("icon-menu-close");
+                    search.classList.add("icon-search");
+                    searchResponsive.style.display = 'none';
+                    navResponsive.style.display = 'block';
+                }else{
+                    search.classList.remove("icon-menu-close");
+                    search.classList.add("icon-search");
+                    hamMenu.classList.remove("icon-menu-close");
+                    hamMenu.classList.add("icon-menu");
+                    searchResponsive.style.display = 'none';
+                    navResponsive.style.display = 'none';
                 }
             }
-            if(window.innerWidth < 1313 && window.innerWidth > 720){
-                if(thumbList){
-                    thumbList.style.maxHeight = productHeroImage.offsetHeight + "px";
-                    for(let i=0 ; i < thumbFrame.length ; i++){
-                        thumbFrame[i].style.height = (productHeroImage.offsetHeight/4) + "px";
-                    }
-                }
-            }else {
-                for(let i=0 ; i < thumbFrame.length ; i++){
-                    thumbFrame[i].style.height = 120 + "px";
-                }
-            }
-        });
-
-        // for header responsive icon
-        function header(){
-            var className = document.getElementById(this.id).className;
-            if(className === 'icon icon-search' ){
-                search.classList.remove("icon-search");
-                search.classList.add("icon-menu-close");
-                hamMenu.classList.remove("icon-menu-close");
-                hamMenu.classList.add("icon-menu");
-                searchResponsive.style.display = 'block';
-                navResponsive.style.display = 'none';
-            }else if(className === 'icon icon-menu'){
-                hamMenu.classList.remove("icon-menu");
-                hamMenu.classList.add("icon-menu-close");
-                search.classList.remove("icon-menu-close");
-                search.classList.add("icon-search");
-                searchResponsive.style.display = 'none';
-                navResponsive.style.display = 'block';
-            }else{
-                search.classList.remove("icon-menu-close");
-                search.classList.add("icon-search");
-                hamMenu.classList.remove("icon-menu-close");
-                hamMenu.classList.add("icon-menu");
-                searchResponsive.style.display = 'none';
-                navResponsive.style.display = 'none';
-            }
         }
-    }
-
-</script>
-
+    </script>
 @endpush
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
index 618856942..9b405f9e9 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -42,14 +42,21 @@
 
     <script type="text/javascript">
         window.flashMessages = [];
+
         @if($success = session('success'))
             window.flashMessages = [{'type': 'alert-success', 'message': "{{ $success }}" }];
         @elseif($warning = session('warning'))
             window.flashMessages = [{'type': 'alert-warning', 'message': "{{ $warning }}" }];
+        @elseif($warning = session('info'))
+            window.flashMessages = [{'type': 'alert-info', 'message': "{{ $info }}" }
+            ];
         @elseif($error = session('error'))
-            window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }];
+            window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }
+            ];
         @endif
+
         window.serverErrors = [];
+
         @if (count($errors))
             window.serverErrors = @json($errors->getMessages());
         @endif
diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
index cbf86e2ea..e9eb00dc5 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
@@ -3,16 +3,13 @@
 @section('content-wrapper')
 
 @inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
-
     <div class="main">
-
         <div class="category-container">
             @include ('shop::products.list.layered-navigation')
 
             <div class="category-block">
-
                 <div class="hero-image mb-35">
-                    <img src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
+                <img    src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
                 </div>
 
                 <?php $products = $productRepository->findAllByCategory($category->id); ?>
@@ -23,84 +20,72 @@
 
                 @if ($toolbarHelper->getCurrentMode() == 'grid')
                     <div class="product-grid-3">
-
                         @foreach ($products as $product)
-
                             @include ('shop::products.list.card', ['product' => $product])
-
                         @endforeach
-
                     </div>
                 @else
                     <div class="product-list">
-
                         @foreach ($products as $product)
-
                             @include ('shop::products.list.card', ['product' => $product])
-
                         @endforeach
-
                     </div>
                 @endif
 
                 <div class="bottom-toolbar">
-
                     {{ $products->appends(request()->input())->links() }}
-
                 </div>
             </div>
         </div>
     </div>
-
 @stop
 
-
 @push('scripts')
+    <script>
+        $(document).ready(function() {
+            var sort = document.getElementById("sort");
+            var filter = document.getElementById("filter");
+            var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
+            var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
 
-<script>
-    $(document).ready(function() {
-
-        var sort = document.getElementById("sort");
-        var filter = document.getElementById("filter");
-        var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
-        var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
-
-        if(sort && filter){
-            sort.addEventListener("click", sortFilter);
-            filter.addEventListener("click", sortFilter);
-        }
-
-        function sortFilter(){
-            var className = document.getElementById(this.id).className;
-
-            if(className === 'icon sort-icon' ){
-                sort.classList.remove("sort-icon");
-                sort.classList.add("icon-menu-close");
-                filter.classList.remove("icon-menu-close");
-                filter.classList.add("filter-icon");
-                sortLimit.style.display ="flex";
-                sortLimit.style.justifyContent="space-between";
-                layerFilter.style.display ="none";
-            }else if(className === 'icon filter-icon'){
-                filter.classList.remove("filter-icon");
-                filter.classList.add("icon-menu-close");
-                sort.classList.remove("icon-menu-close");
-                sort.classList.add("sort-icon");
-                layerFilter.style.display ="block";
-                sortLimit.style.display ="none";
-            }else{
-                sort.classList.remove("icon-menu-close");
-                sort.classList.add("sort-icon");
-                filter.classList.remove("icon-menu-close");
-                filter.classList.add("filter-icon");
-                sortLimit.style.display ="none";
-                layerFilter.style.display ="none";
+            if(sort && filter){
+                sort.addEventListener("click", sortFilter);
+                filter.addEventListener("click", sortFilter);
             }
-        }
-    })
-</script>
 
-@endpush
+            function sortFilter(){
+                var className = document.getElementById(this.id).className;
 
+                if(className === 'icon sort-icon'){
+                    sort.classList.remove("sort-icon");
+                    sort.classList.add("icon-menu-close-adj");
 
+                    filter.classList.remove("icon-menu-close-adj");
+                    filter.classList.add("filter-icon");
 
+                    sortLimit.style.display ="flex";
+                    sortLimit.style.justifyContent="space-between";
+                    layerFilter.style.display ="none";
+                }else if(className === 'icon filter-icon'){
+                    filter.classList.remove("filter-icon");
+                    filter.classList.add("icon-menu-close-adj");
+
+                    sort.classList.remove("icon-menu-close-adj");
+                    sort.classList.add("sort-icon");
+
+                    layerFilter.style.display ="block";
+                    sortLimit.style.display ="none";
+                }else{
+                    sort.classList.remove("icon-menu-close-adj");
+                    sort.classList.add("sort-icon");
+
+                    filter.classList.remove("icon-menu-close-adj");
+                    filter.classList.add("filter-icon");
+
+                    sortLimit.style.display ="none";
+                    layerFilter.style.display ="none";
+                }
+            }
+        });
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
index 2b0b55206..7ab65e6eb 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
@@ -33,15 +33,18 @@
         @else
             @if($product->type == "configurable")
                 <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</a>
-            @else
-                <form action="{{route('cart.add', $product->id)}}" method="POST">
-                    @csrf
-                    <input type="hidden" name="product" value="{{ $product->id }}">
-                    <input type="hidden" name="quantity" value="1">
-                    <input type="hidden" value="false" name="is_configurable">
-                    <button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
-                </form>
                 @include('shop::products.wishlist')
+            @else
+                <div class="cart-wish-wrap">
+                    <form action="{{route('cart.add', $product->id)}}" method="POST">
+                        @csrf
+                        <input type="hidden" name="product" value="{{ $product->id }}">
+                        <input type="hidden" name="quantity" value="1">
+                        <input type="hidden" value="false" name="is_configurable">
+                        <button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
+                    </form>
+                    @include('shop::products.wishlist')
+                </div>
             @endif
         @endif
     </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
index 40f1f4999..9557e3956 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/create.blade.php
@@ -1,26 +1,25 @@
 @extends('shop::layouts.master')
-
+@section('page_title')
+    {{ __('shop::app.reviews.add-review-page-title') }} - {{ $product->name }}
+@endsection
 @section('content-wrapper')
     <section class="review">
 
-        <div class="category-breadcrumbs">
+        {{-- <div class="category-breadcrumbs">
             <span class="breadcrumb">Home</span> > <span class="breadcrumb">Men</span> > <span class="breadcrumb">Slit Open Jeans</span>
-        </div>
-
-        <div class="review-layouter">
+        </div> --}}
 
+        <div class="review-layouter mb-20">
             <div class="product-info">
-
-                <div class="image">
+                <div class="product-image">
                     <img src="{{ bagisto_asset('images/jeans_big.jpg') }}" />
                 </div>
 
-                <div class="heading">
+                <div class="product-name">
                     <span>{{ $product->name }}</span>
                 </div>
 
-
-                <div class="price">
+                <div class="product-price">
 
                     @inject ('priceHelper', 'Webkul\Product\Helpers\Price')
 
@@ -34,37 +33,37 @@
                         @endif
                     @endif
 
-                    <span class="pro-price-not">
+                    {{-- <span class="pro-price-not">
                         <strike> $45.00 </strike>
                     </span>
 
-                    <span class="offer"> 10% Off </span>
-
+                    <span class="offer"> 10% Off </span> --}}
                 </div>
-
-
             </div>
 
-            <div class="review-info">
-
+            <div class="review-form">
                 <form method="POST" action="{{ route('shop.reviews.store', $product->id ) }}">
                     @csrf
-
                     <div class="heading">
-                        <span> Write a review </span>
+                        <span>{{ __('shop::app.reviews.write-review') }}</span>
                     </div>
 
                     <div class="rating">
                         <span> {{ __('admin::app.customers.reviews.rating') }} </span>
                     </div>
+
                     <div class="stars">
                         <label class="star star-5" for="star-5" onclick="calculateRating(id)" id="1"></label>
+
                         <label class="star star-4" for="star-4" onclick="calculateRating(id)" id="2"></label>
+
                         <label class="star star-3" for="star-3" onclick="calculateRating(id)" id="3"></label>
+
                         <label class="star star-2" for="star-2" onclick="calculateRating(id)" id="4"></label>
+
                         <label class="star star-1" for="star-1" onclick="calculateRating(id)" id="5"></label>
 
-                        <input type="name" name="title" class="form-control" placeholder="title">
+                        <input type="name" name="title" class="form-control" placeholder="{{ __('shop::app.reviews.review-title') }}">
 
                         <input type="hidden" id="rating" name="rating">
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
index 892bf28b7..4ffa896e3 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -65,53 +65,14 @@
                     </accordian>
 
                     @include ('shop::products.view.attributes')
-                    
+
                     @include ('shop::products.view.reviews')
                 </div>
             </form>
         </div>
-
         @include ('shop::products.view.up-sells')
     </section>
-
 @endsection
 
-@push('scripts')
-<script>
-
-    document.onreadystatechange = function () {
-        var state = document.readyState
-        var galleryTemplate = document.getElementById('product-gallery-template');
-        var addTOButton = document.getElementsByClassName('add-to-buttons')[0];
-
-        if(galleryTemplate){
-            if (state == 'interactive') {
-                galleryTemplate.style.display="none";
-            } else  {
-                document.getElementById('loader').style.display="none";
-                addTOButton.style.display="flex";
-            }
-        }
-    }
-
-    $(document).ready(function() {
-
-        var thumbList = document.getElementsByClassName('thumb-list')[0];
-        var thumbFrame = document.getElementsByClassName('thumb-frame');
-        var productHeroImage = document.getElementsByClassName('product-hero-image')[0];
-
-        // for product page resize image
-        if(thumbList && productHeroImage){
-            thumbList.style.maxHeight = productHeroImage.offsetHeight + "px";
-            for(let i=0 ; i < thumbFrame.length ; i++){
-                thumbFrame[i].style.height = (productHeroImage.offsetHeight/4) + "px";
-            }
-        }
-    })
-
-</script>
-@endpush
-
-
 
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/reviews.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/reviews.blade.php
index 0a25d6656..f67cd116f 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view/reviews.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/reviews.blade.php
@@ -70,4 +70,10 @@
 
     </div>
 </div>
+@else
+    @if(!is_null($customer))
+        <a href="{{ route('shop.reviews.create', $product->url_key) }}" class="btn btn-lg btn-primary">
+            {{ __('shop::app.products.write-review-btn') }}
+        </a>
+    @endif
 @endif
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php
index 07c17d4be..4cb6e668a 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/wishlist.blade.php
@@ -1,5 +1,5 @@
 @auth('customer')
-<a class="add-to-wishlist" href="{{ route('customer.wishlist.add', $product->id) }}">
-    <span class="icon wishlist-icon"></span>
-</a>
+    <a class="add-to-wishlist" href="{{ route('customer.wishlist.add', $product->id) }}">
+        <span class="icon wishlist-icon"></span>
+    </a>
 @endauth
diff --git a/packages/Webkul/Ui/src/DataGrid/DataGrid.php b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
index bd212bdf2..9cc49cabd 100644
--- a/packages/Webkul/Ui/src/DataGrid/DataGrid.php
+++ b/packages/Webkul/Ui/src/DataGrid/DataGrid.php
@@ -596,7 +596,7 @@ class DataGrid
                             array_values($value)[0]
                         );
                     } else {
-                        throw new \Exception('Multiple Sort keys Found, Please Resolve the URL Manually.');
+                        throw new \Exception('Multiple Sort keys Found, Please Resolve the URL Manually');
                     }
                 } elseif ($key=="search") {
 
@@ -689,7 +689,6 @@ class DataGrid
         $parsed = $this->parse();
 
         if ($this->aliased==true) {
-
             //flags
             $table_alias = false;
             $join_table_alias = false;
@@ -710,7 +709,7 @@ class DataGrid
             //check whether exploded string still has same table name
             if ($exploded[0]==$this->table) {
                 $table_alias = false;
-            } else { // (isset($exploded))
+            } else {
                 $table_alias = true;
                 $table_name = trim($exploded[0]);
                 $table_alias = trim($exploded[1]);
diff --git a/packages/Webkul/Ui/src/Providers/UiServiceProvider.php b/packages/Webkul/Ui/src/Providers/UiServiceProvider.php
index 6229e49c5..5f6c0256a 100644
--- a/packages/Webkul/Ui/src/Providers/UiServiceProvider.php
+++ b/packages/Webkul/Ui/src/Providers/UiServiceProvider.php
@@ -20,6 +20,8 @@ class UiServiceProvider extends ServiceProvider
             __DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/ui/assets'),
         ], 'public');
 
+        $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'ui');
+
         $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'ui');
 
         Paginator::defaultView('ui::partials.pagination');
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sort-Up.svg b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sort-Up.svg
new file mode 100644
index 000000000..1c9462c2b
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/Icon-Sort-Up.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="14px" viewBox="0 0 10 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon-Sort-Down</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Settings-Users-Roles" transform="translate(-451.000000, -218.000000)" stroke="#979797">
+            <g id="Paper" transform="translate(344.000000, 145.000000)">
+                <g id="Table" transform="translate(0.000000, 61.000000)">
+                    <g id="Strip-Head">
+                        <g id="Icon-Sort-Up" transform="translate(103.000000, 10.000000)">
+                            <g id="Icon-Sort-Down" transform="translate(9.000000, 9.000000) scale(1, -1) rotate(90.000000) translate(-9.000000, -9.000000) translate(3.000000, 5.000000)">
+                                <path d="M1.13686838e-12,4 L10.068125,4" id="Path-3" stroke-width="2"></path>
+                                <polyline id="Path-4" stroke-width="2" points="8 0 12 4.08548298 8 8"></polyline>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/cross-icon-adj.svg b/packages/Webkul/Ui/src/Resources/assets/images/cross-icon-adj.svg
new file mode 100644
index 000000000..d62bc542c
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/cross-icon-adj.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>Artboard</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
+        <path d="M9.06852618,23.2496556 L22.5678375,9.75034436" id="Line-2" stroke="#242424" stroke-width="3"></path>
+        <path d="M9.06852618,9.75034436 L22.5678375,23.2496556" id="Line-2" stroke="#242424" stroke-width="3"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/sort-up-icon.png b/packages/Webkul/Ui/src/Resources/assets/images/sort-up-icon.png
new file mode 100644
index 000000000..2578e18db
Binary files /dev/null and b/packages/Webkul/Ui/src/Resources/assets/images/sort-up-icon.png differ
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue
index f4c3c2ab3..665700d27 100644
--- a/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue
+++ b/packages/Webkul/Ui/src/Resources/assets/js/components/flash.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="alert" v-bind:class="flash.type">
         <span class="icon white-cross-sm-icon" @click="remove"></span>
-        <p>{{ flash.message }}</p>  
+        <p>{{ flash.message }}</p>
     </div>
 </template>
 
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss
index afe55ad04..ef8f97015 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/_variables.scss
@@ -1,5 +1,6 @@
 $font-color: #3a3a3a;
 $brand-color: #0041FF;
+$info-color: #204d74;
 $danger-color: #FC6868;
 $success-color: #4CAF50;
 $warning-color: #FFC107;
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 96bf34e93..593c8e447 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -1,6 +1,7 @@
 // Icon scss
 @import "icons";
 @import "variables";
+@import "components";
 @import "mixins";
 @import "animations";
 
@@ -521,6 +522,10 @@ h2 {
             background: $danger-color;
         }
 
+        &.alert-info {
+            background: $info-color;
+        }
+
         &.alert-success {
             background: $success-color;
         }
@@ -675,263 +680,6 @@ h2 {
     }
 }
 
-/*  Data grid css starts here  */
-.grid-container {
-    user-select: none;
-
-    .filter-wrapper {
-        display: block;
-        box-sizing: border-box;
-
-        .filter-row-one,
-        .filter-row-two {
-            display: flex;
-            flex-direction: row;
-        }
-        .filter-row-one {
-            height: 40px;
-            align-items: center;
-            justify-content: space-between;
-
-            .search-filter {
-                .control {
-                    font-family: "montserrat", sans-serif;
-                    padding-left: 5px;
-                    width: 380px;
-                    height: 36px;
-                    border: 2px solid $control-border-color;
-                    border-radius: 3px;
-                    border-right: 0px;
-                    border-top-right-radius: 0px;
-                    border-bottom-right-radius: 0px;
-                    font-size: 14px;
-                }
-                .ic-wrapper {
-                    display: block;
-                    height: 36px;
-                    width: 36px;
-                    border: 2px solid $control-border-color;
-                    border-left: none;
-                    border-radius: 2px;
-
-                    .search-icon {
-                        margin-left: 4px;
-                        margin-top: 4px;
-                        height: 24px;
-                        width: 24px;
-                    }
-                }
-            }
-
-            .dropdown-filters {
-                display: inline-flex;
-
-                .more-filters {
-                    margin-right: 5px;
-
-                    .dropdown-toggle {
-                        display: flex;
-                        flex-direction: row;
-                        align-items: center;
-                        justify-content: center;
-                        font-family: "montserrat", sans-serif;
-                        padding-left: 5px;
-                        height: 36px;
-                        width: 150px;
-                        border: 2px solid $control-border-color;
-                        border-radius: 2px;
-                        background-color: $color-white;
-                        color: $filter-toggle-color;
-                        font-size: 14px;
-
-                        .dropdown-header {
-                            width: 100%;
-                            display: flex;
-                            flex-direction: row;
-                            align-items: center;
-                            justify-content: space-between;
-
-                            .arrow-down-icon {
-                                margin-right: 5px;
-                            }
-                        }
-                    }
-                    .dropdown-list {
-                        .dropdown-container {
-                            ul {
-                                li.filter-column-dropdown {
-                                    .filter-column-select {
-                                        width: 100%;
-                                        background: $color-white;
-                                        border: 2px solid $control-border-color;
-                                        border-radius: 3px;
-                                        height: 36px;
-                                        display: inline-block;
-                                        vertical-align: middle;
-                                        -webkit-transition: 0.2s
-                                            cubic-bezier(0.4, 0, 0.2, 1);
-                                        transition: 0.2s
-                                            cubic-bezier(0.4, 0, 0.2, 1);
-                                        padding: 0px 5px;
-                                        font-family: "montserrat", sans-serif;
-                                        margin-top: 10px;
-                                        margin-bottom: 5px;
-                                    }
-                                }
-                                li {
-                                    select {
-                                        background: $color-white;
-                                        border: 2px solid $control-border-color;
-                                        border-radius: 3px;
-                                        height: 36px;
-                                        max-width: 100%;
-                                        display: inline-block;
-                                        vertical-align: middle;
-                                        -webkit-transition: 0.2s
-                                            cubic-bezier(0.4, 0, 0.2, 1);
-                                        transition: 0.2s
-                                            cubic-bezier(0.4, 0, 0.2, 1);
-                                        padding: 0px 5px;
-                                        font-family: "montserrat", sans-serif;
-                                        margin-top: 10px;
-                                        margin-bottom: 5px;
-                                    }
-                                    input {
-                                        background: #fff;
-                                        border: 2px solid #c7c7c7;
-                                        border-radius: 3px;
-                                        height: 36px;
-                                        max-width: 100%;
-                                        display: inline-block;
-                                        vertical-align: middle;
-                                        -webkit-transition: 0.2s
-                                            cubic-bezier(0.4, 0, 0.2, 1);
-                                        transition: 0.2s
-                                            cubic-bezier(0.4, 0, 0.2, 1);
-                                        padding: 0px 5px;
-                                        font-family: "montserrat", sans-serif;
-                                        margin-top: 10px;
-                                        margin-bottom: 5px;
-                                    }
-                                }
-                                .filter-condition-dropdown-string {
-                                    display: none;
-                                }
-                                .filter-condition-dropdown-number {
-                                    display: none;
-                                }
-                                .filter-condition-dropdown-datetime {
-                                    display: none;
-                                }
-
-                                .filter-response-string {
-                                    display: none;
-                                }
-                                .filter-response-boolean {
-                                    display: none;
-                                }
-                                .filter-response-datetime {
-                                    display: none;
-                                }
-                                .filter-response-number {
-                                    display: none;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        .filter-row-two {
-            display: flex;
-            flex-direction: row;
-            flex-wrap: wrap;
-            margin-top: 6px;
-            margin-bottom: 6px;
-
-            .filter-one {
-                margin-right: 10px;
-
-                .filter-name {
-                    margin-right: 5px;
-                }
-
-                .filter-value {
-                    display: inline-flex;
-                    background: #e7e7e7;
-                    padding-left: 5px;
-                    color: $color-black-shade;
-                    vertical-align: middle;
-
-                    .f-value {
-                        margin: auto;
-                    }
-
-                    .cross-icon {
-                        margin: 5px;
-                        height: 18px !important;
-                        width: 18px !important;
-                        cursor: pointer;
-                    }
-                }
-            }
-        }
-    }
-    .table {
-        thead {
-            .mass-action-wrapper {
-                display: flex;
-                flex-direction: row;
-                justify-content: flex-start;
-                align-items: center;
-
-                .massaction-remove {
-                    margin-top: 10px;
-                    margin-right: 10px;
-                }
-
-                form {
-                    margin-top: 8px;
-                }
-
-                .selected-items {
-                    margin-right: 15px;
-                }
-            }
-            tr {
-                th.grid_head {
-                    cursor:pointer;
-
-                    .sort-down-icon {
-                        margin-left: 5px;
-                        margin-top: -3px;
-                        vertical-align: middle;
-                        cursor: pointer;
-                    }
-                }
-
-                th {
-                    text-transform: capitalize;
-                }
-            }
-        }
-
-        tbody {
-            td.action {
-                a:first-child {
-                    margin-right: 10px;
-                }
-            }
-        }
-
-        .pagination {
-            margin-top:20px;
-        }
-    }
-}
-
-/*   DataGrid css ends in here   */
-
 .modal-open {
     overflow: hidden;
 }
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss
new file mode 100644
index 000000000..c06dfab97
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss
@@ -0,0 +1,257 @@
+/*  Data grid css starts here  */
+.grid-container {
+    user-select: none;
+
+    .filter-wrapper {
+        display: block;
+        box-sizing: border-box;
+
+        .filter-row-one,
+        .filter-row-two {
+            display: flex;
+            flex-direction: row;
+        }
+        .filter-row-one {
+            height: 40px;
+            align-items: center;
+            justify-content: space-between;
+
+            .search-filter {
+                .control {
+                    font-family: "montserrat", sans-serif;
+                    padding-left: 10px;
+                    width: 380px;
+                    height: 36px;
+                    border: 2px solid $control-border-color;
+                    border-radius: 3px;
+                    border-right: 0px;
+                    border-top-right-radius: 0px;
+                    border-bottom-right-radius: 0px;
+                    font-size: 14px;
+                }
+                .ic-wrapper {
+                    display: block;
+                    height: 36px;
+                    width: 36px;
+                    border: 2px solid $control-border-color;
+                    border-left: none;
+                    border-radius: 2px;
+
+                    .search-icon {
+                        margin-left: 4px;
+                        margin-top: 4px;
+                        height: 24px;
+                        width: 24px;
+                    }
+                }
+            }
+
+            .dropdown-filters {
+                display: inline-flex;
+
+                .more-filters {
+                    margin-right: 5px;
+
+                    .dropdown-toggle {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: center;
+                        font-family: "montserrat", sans-serif;
+                        padding-left: 5px;
+                        height: 36px;
+                        width: 150px;
+                        border: 2px solid $control-border-color;
+                        border-radius: 2px;
+                        background-color: $color-white;
+                        color: $filter-toggle-color;
+                        font-size: 14px;
+
+                        .dropdown-header {
+                            width: 100%;
+                            display: flex;
+                            flex-direction: row;
+                            align-items: center;
+                            justify-content: space-between;
+
+                            .arrow-down-icon {
+                                margin-right: 5px;
+                            }
+                        }
+                    }
+                    .dropdown-list {
+                        .dropdown-container {
+                            ul {
+                                li.filter-column-dropdown {
+                                    .filter-column-select {
+                                        width: 100%;
+                                        background: $color-white;
+                                        border: 2px solid $control-border-color;
+                                        border-radius: 3px;
+                                        height: 36px;
+                                        display: inline-block;
+                                        vertical-align: middle;
+                                        -webkit-transition: 0.2s
+                                            cubic-bezier(0.4, 0, 0.2, 1);
+                                        transition: 0.2s
+                                            cubic-bezier(0.4, 0, 0.2, 1);
+                                        padding: 0px 5px;
+                                        font-family: "montserrat", sans-serif;
+                                        margin-top: 10px;
+                                        margin-bottom: 5px;
+                                    }
+                                }
+                                li {
+                                    select {
+                                        background: $color-white;
+                                        border: 2px solid $control-border-color;
+                                        border-radius: 3px;
+                                        height: 36px;
+                                        max-width: 100%;
+                                        display: inline-block;
+                                        vertical-align: middle;
+                                        -webkit-transition: 0.2s
+                                            cubic-bezier(0.4, 0, 0.2, 1);
+                                        transition: 0.2s
+                                            cubic-bezier(0.4, 0, 0.2, 1);
+                                        padding: 0px 5px;
+                                        font-family: "montserrat", sans-serif;
+                                        margin-top: 10px;
+                                        margin-bottom: 5px;
+                                    }
+                                    input {
+                                        background: #fff;
+                                        border: 2px solid #c7c7c7;
+                                        border-radius: 3px;
+                                        height: 36px;
+                                        max-width: 100%;
+                                        display: inline-block;
+                                        vertical-align: middle;
+                                        -webkit-transition: 0.2s
+                                            cubic-bezier(0.4, 0, 0.2, 1);
+                                        transition: 0.2s
+                                            cubic-bezier(0.4, 0, 0.2, 1);
+                                        padding: 0px 5px;
+                                        font-family: "montserrat", sans-serif;
+                                        margin-top: 10px;
+                                        margin-bottom: 5px;
+                                    }
+                                }
+                                .filter-condition-dropdown-string {
+                                    display: none;
+                                }
+                                .filter-condition-dropdown-number {
+                                    display: none;
+                                }
+                                .filter-condition-dropdown-datetime {
+                                    display: none;
+                                }
+
+                                .filter-response-string {
+                                    display: none;
+                                }
+                                .filter-response-boolean {
+                                    display: none;
+                                }
+                                .filter-response-datetime {
+                                    display: none;
+                                }
+                                .filter-response-number {
+                                    display: none;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        .filter-row-two {
+            display: flex;
+            flex-direction: row;
+            flex-wrap: wrap;
+            margin-top: 6px;
+            margin-bottom: 6px;
+
+            .filter-one {
+                margin-right: 10px;
+
+                .filter-name {
+                    margin-right: 5px;
+                }
+
+                .filter-value {
+                    display: inline-flex;
+                    background: #e7e7e7;
+                    padding-left: 5px;
+                    color: $color-black-shade;
+                    vertical-align: middle;
+
+                    .f-value {
+                        margin: auto;
+                    }
+
+                    .cross-icon {
+                        margin: 5px;
+                        height: 18px !important;
+                        width: 18px !important;
+                        cursor: pointer;
+                    }
+                }
+            }
+        }
+    }
+    .table {
+        thead {
+            .mass-action-wrapper {
+                display: flex;
+                flex-direction: row;
+                justify-content: flex-start;
+                align-items: center;
+
+                .massaction-remove {
+                    margin-top: 10px;
+                    margin-right: 10px;
+                }
+
+                form {
+                    margin-top: 8px;
+                }
+
+                .selected-items {
+                    margin-right: 15px;
+                }
+            }
+            tr {
+                th.grid_head {
+
+                    .sort-down-icon, .sort-up-icon {
+                        margin-left: 5px;
+                        margin-top: -3px;
+                        vertical-align: middle;
+                    }
+                }
+
+                th.grid_head.sortable {
+                    cursor: pointer;
+                }
+
+                th {
+                    text-transform: capitalize;
+                }
+            }
+        }
+
+        tbody {
+            td.action {
+                a:first-child {
+                    margin-right: 10px;
+                }
+            }
+        }
+
+        .pagination {
+            margin-top:20px;
+        }
+    }
+}
+/*   DataGrid css ends in here   */
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/override.scss b/packages/Webkul/Ui/src/Resources/assets/sass/override.scss
new file mode 100644
index 000000000..5799558a6
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/override.scss
@@ -0,0 +1,11 @@
+.color-red {
+    color: red;
+}
+
+.color-default {
+    color: $font-color;
+}
+
+.color-brand {
+    color: $brand-color;
+}
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/lang/en/app.php b/packages/Webkul/Ui/src/Resources/lang/en/app.php
new file mode 100644
index 000000000..ab0c53687
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/lang/en/app.php
@@ -0,0 +1,6 @@
+<?php
+return [
+    'datagrid' => [
+        'actions' => 'Actions'
+    ]
+];
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/filters/default.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php
similarity index 97%
rename from packages/Webkul/Ui/src/Resources/views/datagrid/filters/default.blade.php
rename to packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php
index 868c5906e..dad134cb1 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/filters/default.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/filters.blade.php
@@ -1,5 +1,4 @@
 <div class="{{ $css->filter }}filter-wrapper">
-    {{-- for loading the filters from another file --}}
     <div class="filter-row-one">
         <div class="search-filter" style="display: inline-flex; align-items: center;">
             <input type="search" class="control search-field" placeholder="Search Users" value="" />
@@ -24,7 +23,8 @@
             <div class="more-filters">
                 <div class="dropdown-toggle">
                     <div class="dropdown-header">
-                        <span class="name">Filter</span> {{-- <span class="role">Filter</span> --}}
+                        <span class="name">Filter</span>
+                        {{-- <span class="role">Filter</span> --}}
                         <i class="icon arrow-down-icon active"></i>
                     </div>
                 </div>
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
index 3675dbc66..34cf664f3 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php
@@ -1,73 +1,53 @@
-<div class="grid-container {{-- $css->datagrid --}}">
-
+<div class="grid-container">
     {{-- For loading the filters from includes directory file --}}
-    @include('ui::datagrid.filters.default')
+    @include('ui::datagrid.filters')
 
     {{-- for generating the table and its content --}}
-    @include('ui::datagrid.table.default')
+    @include('ui::datagrid.table')
 
     {{-- Section for datagrid javascript --}}
     @push('scripts')
         <script type="text/javascript">
-
             var columns = @json($columns); //referential
-
             var allFilters = [];
-
             var search_value;
-
             var filter_column;
-
             var filter_condition;
-
             var filter_range;
-
             var count_filters = parseInt(0);
-
             var url;
-
             var array_start = '[';
-
             var array_end = ']';
-
             var typeValue;
-
             var selectedColumn = '';
-
             var myURL = document.location;
-
             let params;
 
             $(document).ready(function() {
-
                 params = (new URL(document.location)).search;
-
-                if(params.length>0) {
-
+                if(params.length > 0) {
                     if(allFilters.length == 0) {
                         //call reverse url function
-                        arrayFromUrl(params.slice(1,params.length));
+                        arrayFromUrl(params.slice(1, params.length));
                     }
                 }
 
                 $('.search-btn').click(function() {
-
                     search_value = $(".search-field").val();
-                    formURL('search','all', search_value, params);  //format for search
+                    formURL('search', 'all', search_value, params);  //format for search
                 });
 
                 //controls for header when sorting is done
                 $('.grid_head').on('click', function() {
-
                     var column = $(this).data('column-name');
-
                     var currentSort = $(this).data('column-sort');
 
-                    if(currentSort == "asc")
-                        formURL("sort",column,"desc",params);
-
-                    else if(currentSort == "desc")
-                        formURL("sort",column,"asc",params);
+                    if(currentSort == "asc") {
+                        formURL("sort", column, "desc", params);
+                    }
+                    else if(currentSort == "desc") {
+                        formURL("sort", column, "asc", params);
+                    }
                 });
 
                 $('select.filter-column-select').change(function() {
@@ -80,32 +60,22 @@
                     if(typeValue == 'string') {
                         //default behaviour for strings
                         $('.filter-condition-dropdown-number').css('display','none');
-
                         $('.filter-condition-dropdown-datetime').css('display','none');
-
                         $('.filter-response-number').css('display','none');
-
                         $('.filter-response-datetime').css('display','none');
-
                         $('.filter-response-boolean').css('display','none');
 
                         //show the two wanted
                         $('.filter-condition-dropdown-string').css('display','inherit');
-
                         $('.filter-response-string').css('display','inherit');
                     }
                     else if(typeValue == 'boolean') {
                         //hide unwanted
                         $('.filter-condition-dropdown-string').css('display','none');
-
                         $('.filter-condition-dropdown-number').css('display','none');
-
                         $('.filter-condition-dropdown-datetime').css('display','none');
-
                         $('.filter-response-string').css('display','none');
-
                         $('.filter-response-number').css('display','none');
-
                         $('.filter-response-datetime').css('display','none');
 
                         //only true or false for that column is needed as input
@@ -114,37 +84,26 @@
                     else if(typeValue == 'datetime') {
                         //hide unwanted
                         $('.filter-condition-dropdown-string').css('display','none');
-
                         $('.filter-condition-dropdown-number').css('display','none');
-
                         $('.filter-response-string').css('display','none');
-
                         $('.filter-response-number').css('display','none');
-
                         $('.filter-response-boolean').css('display','none');
 
                         //show what is wanted
                         $('.filter-condition-dropdown-datetime').css('display','inherit');
-
                         $('.filter-response-datetime').css('display','inherit');
                     }
                     else if(typeValue == 'number') {
                         //hide unwanted
                         $('.filter-condition-dropdown-string').css('display','none');
-
                         $('.filter-condition-dropdown-datetime').css('display','none');
-
                         $('.filter-response-string').css('display','none');
-
                         $('.filter-response-datetime').css('display','none');
-
                         $('.filter-response-boolean').css('display','none');
 
                         //show what is wanted
                         $('.filter-condition-dropdown-number').css('display','inherit');
-
                         $('.filter-response-number').css('display','inherit');
-
                     }
 
                     $('.apply-filter').on('click',function() {
@@ -152,26 +111,19 @@
                         params = (new URL(document.location)).search;
 
                         if(typeValue == 'number') {
-
                             var conditionUsed = $('.filter-condition-dropdown-number').find(':selected').val();
-
                             var response = $('.response-number').val();
 
                             formURL(selectedColumn,conditionUsed,response,params,col_label);
                         }
                         if(typeValue == 'string') {
-
                             var conditionUsed = $('.filter-condition-dropdown-string').find(':selected').val();
-
                             var response = $('.response-string').val();
 
                             formURL(selectedColumn,conditionUsed,response,params,col_label);
-
                         }
                         if(typeValue == 'datetime') {
-
                             var conditionUsed = $('.filter-condition-dropdown-datetime').find(':selected').val();
-
                             var response = $('.response-datetime').val();
 
                             formURL(selectedColumn,conditionUsed,response,params,col_label);
@@ -217,22 +169,17 @@
                         });
 
                         $('.mass-action').css('display','');
-
                         $('.table-grid-header').css('display','none');
                         // $('.selected-items').html(id.toString());
-
                         $('#indexes').val(id);
                     }
                     else if($("input[id=mastercheckbox]").prop('checked') == false) {
-
                         $('.indexers').each(function(){ this.checked = false; });
 
                         id = [];
 
                         $('.mass-action').css('display','none');
-
                         $('.table-grid-header').css('display','');
-
                         $('#indexes').val('');
                     }
                 });
@@ -269,25 +216,18 @@
                     }
 
                     if(id.length>0) {
-
                         $('.mass-action').css('display','');
-
                         $('.table-grid-header').css('display','none');
-
                         $('#indexes').val(id);
 
                     }else if(id.length == 0) {
 
                         $('.mass-action').css('display','none');
-
                         $('.table-grid-header').css('display','');
-
                         $('#indexes').val('');
 
                         if($('#mastercheckbox').prop('checked')) {
-
                             $('#mastercheckbox').prop('checked',false);
-
                         }
                     }
                 });
@@ -296,10 +236,8 @@
 
             //make the url from the array and redirect
             function makeURL(repetition = false) {
-
                 if(allFilters.length>0 && repetition == false)
                 {
-
                     for(i=0;i<allFilters.length;i++) {
                         if(i==0){
                             url = '?' + allFilters[i].column + '[' + allFilters[i].cond + ']' + '=' + allFilters[i].val;
@@ -310,27 +248,22 @@
                     document.location = url;
 
                 } else if(allFilters.length>0 && repetition == true) {
-
                     //this is the case when the filter is being repeated on a single column with different condition and value
                     for(i=0;i<allFilters.length;i++) {
 
-                        if(i==0){
+                        if(i==0) {
                             url = '?' + allFilters[i].column + '[' + allFilters[i].cond + ']' + '=' + allFilters[i].val;
                         }
-                        else
+                        else {
                             url = url + '&' + allFilters[i].column + '[' + allFilters[i].cond + ']' + '=' + allFilters[i].val;
+                        }
                     }
-
                     document.location = url;
-
                 } else {
-
                     var uri = window.location.href.toString();
-
                     var clean_uri = uri.substring(0, uri.indexOf("?"));
 
                     document.location = clean_uri;
-
                 }
             }
 
@@ -338,72 +271,63 @@
             function arrayFromUrl(urlstring) {
 
                 var obj={};
-
                 t = urlstring.slice(0,urlstring.length);
-
                 splitted = [];
-
                 moreSplitted = [];
-
                 splitted = t.split('&');
-
                 for(i=0;i<splitted.length;i++) {
-
                     moreSplitted.push(splitted[i].split('='));
-
                 }
                 for(i=0;i<moreSplitted.length;i++) {
-
                     col = moreSplitted[i][0].replace(']','').split('[')[0];
-
                     cond = moreSplitted[i][0].replace(']','').split('[')[1]
-
                     val = moreSplitted[i][1];
-
                     obj.column = col;
-
                     obj.cond = cond;
-
                     obj.val = val;
 
                     if(col!=undefined && cond!=undefined && val!=undefined)
                         allFilters.push(obj);
-
                     obj = {};
-
                 }
                 makeTags();
             }
 
-            //use the label to prevent the display of column name on the body
+            //Use the label to prevent the display of column name on the body
             function makeTags() {
-
                 var filterRepeat = 0;
 
                 if(allFilters.length!=0)
                 for(var i = 0;i<allFilters.length;i++) {
 
                     if(allFilters[i].column == "sort") {
-
                         col_label_tag = $('li[data-name="'+allFilters[i].cond+'"]').text();
 
                         var filter_card = '<span class="filter-one" id="'+ i +'"><span class="filter-name">'+ col_label_tag +'</span><span class="filter-value"><span class="f-value">'+ allFilters[i].val +'</span><span class="icon cross-icon remove-filter"></span></span></span>';
+
+                        sorted_col = allFilters[i].cond;
+
+                        var apply_on_column = $('th[data-column-name="'+sorted_col+'"]').children('.icon');
+
+                        if(allFilters[i].val == "asc") {
+                            apply_on_column.addClass('sort-down-icon');
+                        } else {
+                            apply_on_column.addClass('sort-up-icon');
+                        }
+
                         $('.filter-row-two').append(filter_card);
 
                     } else if(allFilters[i].column == "search") {
-
                         col_label_tag = "Search";
 
                         var filter_card = '<span class="filter-one" id="'+ i +'"><span class="filter-name">'+ col_label_tag +'</span><span class="filter-value"><span class="f-value">'+ allFilters[i].val +'</span><span class="icon cross-icon remove-filter"></span></span></span>';
                         $('.filter-row-two').append(filter_card);
 
                     } else {
-
                         col_label_tag = $('li[data-name="'+allFilters[i].column+'"]').text().trim();
 
                         var filter_card = '<span class="filter-one" id="'+ i +'"><span class="filter-name">'+ col_label_tag +'</span><span class="filter-value"><span class="f-value">'+ allFilters[i].val +'</span><span class="icon cross-icon remove-filter"></span></span></span>';
                         $('.filter-row-two').append(filter_card);
-
                     }
 
                 }
@@ -414,13 +338,11 @@
 
                 /* validate the conditions here and do the replacements and
                 push here in the all filters array */
-
                 var obj1 = {};
 
                 console.log(allFilters.length);
 
                 if(column == "" || condition == "" || response == "") {
-
                     alert("Some of the required field is null, please check column, condition and value properly.");
 
                     return false;
@@ -441,11 +363,9 @@
 
                                     return false;
                                 } else if(allFilters[j].column == column) {
-
                                     filter_repeated = 1;
 
                                     allFilters[j].cond = condition;
-
                                     allFilters[j].val = response;
 
                                     makeURL(true);
@@ -454,84 +374,55 @@
                             if(filter_repeated == 0) {
 
                                 obj1.column = column;
-
                                 obj1.cond = condition;
-
                                 obj1.val = response;
-
                                 obj1.label = clabel;
 
                                 allFilters.push(obj1);
-
                                 obj1 = {};
 
                                 makeURL();
                             }
                         }
                         if(column == "sort") {
-
                             sort_exists = 0;
-
                             for(j=0;j<allFilters.length;j++) {
-
                                 if(allFilters[j].column == "sort") {
-
                                     if(allFilters[j].column==column && allFilters[j].cond==condition && allFilters[j].val==response) {
 
                                         if(response=="asc") {
-
                                             allFilters[j].column = column;
-
                                             allFilters[j].cond = condition;
-
                                             allFilters[j].val = "desc";
-
                                             allFilters[j].label = clabel;
 
                                             makeURL();
 
                                         }
                                         else {
-
                                             allFilters[j].column = column;
-
                                             allFilters[j].cond = condition;
-
                                             allFilters[j].val = "asc";
-
                                             allFilters[j].label = clabel;
 
                                             makeURL();
-
                                         }
-
                                     }
                                     else {
-
                                         allFilters[j].column = column;
-
                                         allFilters[j].cond = condition;
-
                                         allFilters[j].val = response;
-
                                         allFilters[j].label = clabel;
 
                                         makeURL();
-
                                     }
-
-
                                 }
                             }
                         }
                         if(column == "search") {
-
                             search_found = 0;
-
                             for(j=0;j<allFilters.length;j++) {
-
                                 if(allFilters[j].column == "search") {
-
                                     allFilters[j].column = column;
                                     allFilters[j].cond = condition;
                                     allFilters[j].val = response;
@@ -539,13 +430,11 @@
                                     makeURL();
                                 }
                             }
-
                             for(j=0;j<allFilters.length;j++) {
                                 if(allFilters[j].column == "search") {
                                     search_found = 1;
                                 }
                             }
-
                             if(search_found == 0) {
                                 obj1.column = column;
                                 obj1.cond = condition;
@@ -557,27 +446,21 @@
                             }
                         }
                     } else {
-
                         obj1.column = column;
-
                         obj1.cond = condition;
-
                         obj1.val = response;
-
                         obj1.label = clabel;
 
                         allFilters.push(obj1);
-
                         obj1 = {};
 
                         makeURL();
-
                     }
                 }
             }
             function confirm_click(message){
                 if (confirm(message)) {
-
+                    //do the action required
                 } else {
                     return false;
                 }
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/column.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/notused/column.blade.php
similarity index 100%
rename from packages/Webkul/Ui/src/Resources/views/datagrid/column.blade.php
rename to packages/Webkul/Ui/src/Resources/views/datagrid/notused/column.blade.php
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/pagination.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/pagination.blade.php
new file mode 100644
index 000000000..90116cf07
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/pagination.blade.php
@@ -0,0 +1,3 @@
+<div class="pagination">
+    {{ $results->links() }}
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
new file mode 100644
index 000000000..919898d73
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -0,0 +1,7 @@
+<div class="table">
+    <table class="{{ $css->table }}">
+        @include('ui::datagrid.table.head')
+        @include('ui::datagrid.table.body')
+    </table>
+    @include('ui::datagrid.pagination')
+</div>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php
new file mode 100644
index 000000000..b86a89991
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table/body.blade.php
@@ -0,0 +1,32 @@
+<tbody class="{{ $css->tbody }}">
+    @if(count($results) == 0)
+    <tr>
+        <td colspan="{{ count($columns)+1 }}" style="text-align: center;">
+            No Records Found.
+        </td>
+    </tr>
+    @endif
+    @foreach ($results as $result)
+    <tr>
+
+        <td class="">
+            <span class="checkbox">
+                <input type="checkbox" class="indexers" id="{{ $result->id }}" name="checkbox[]">
+                <label class="checkbox-view" for="checkbox1"></label>
+            </span>
+        </td>
+        @foreach ($columns as $column)
+            <td class="">{!! $column->render($result) !!}</td>
+        @endforeach
+
+        <td class="action">
+            @foreach($actions as $action)
+                <a @if($action['type'] == "Edit") href="{{ url()->current().'/edit/'.$result->id }}" @elseif($action['type']=="Delete") href="{{ url()->current().'/delete/'.$result->id }}" @endif  class="Action-{{ $action['type'] }}" id="{{ $result->id }}" onclick="return confirm_click('{{ $action['confirm_text'] }}');">
+                    <i class="{{ $action['icon'] }}"></i>
+                </a>
+            @endforeach
+        </td>
+
+    </tr>
+    @endforeach
+</tbody>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/default.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/default.blade.php
deleted file mode 100644
index 200d4da56..000000000
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table/default.blade.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<div class="table">
-
-    <table class="{{ $css->table }}">
-
-        <thead>
-
-            <tr class="mass-action" style="display: none; height:63px;">
-
-                <th colspan="{{ count($columns)+1 }}">
-
-                    <div class="mass-action-wrapper">
-
-                        <span class="massaction-remove">
-                            <span class="icon checkbox-dash-icon"></span>
-                        </span>
-
-                        @foreach($massoperations as $massoperation)
-
-                            @if($massoperation['type'] == "button")
-
-                            <form onsubmit="return confirm('Are You Sure?');"
-                                @if(strtoupper($massoperation[ 'method'])=="GET" || strtoupper($massoperation['method'])=="POST" )
-                                    method="{{ strtoupper($massoperation['method']) }}"
-                                @else
-                                    method="POST"
-                                @endif
-
-                                action="{{ $massoperation['route'] }}">
-
-                                {{ csrf_field() }}
-
-                                @if(strtoupper($massoperation['method'])!= "GET" && strtoupper($massoperation['method'])!= "POST")
-
-                                @method($massoperation['method'])
-
-                                @endif
-
-                                <input type="hidden" id="indexes" name="indexes" value="">
-
-                                <input class="btn btn-primary btn-sm" type="submit" value="Delete">
-
-                            </form>
-
-                            @elseif($massoperation['type'] == "select")
-
-                                <form
-                                    @if(strtoupper($massoperation[ 'method'])=="GET" || strtoupper($massoperation[ 'method'])=="POST" )
-
-                                        method="{{ strtoupper($massoperation['method']) }}"
-
-                                    @else
-                                        method="POST"
-
-                                        @endif
-
-                                    action="{{ $massoperation['route'] }}">
-                                        {{ csrf_field() }}
-                                    @if(strtoupper($massoperation['method'])!= "GET" && strtoupper($massoperation['method'])!= "POST")
-
-                                        @method($massoperation['method'])
-
-                                    @endif
-
-                                    <input type="hidden" id="indexes" name="indexes" value="">
-
-                                    <select name="choices">
-
-                                        @foreach($massoperation['options'] as $option)
-
-                                            <option>{{ $option }}</option>
-
-                                        @endforeach
-
-                                    </select>
-
-                                        <input class="btn btn-primary btn-sm" type="submit" value="Submit">
-
-                                </form>
-                            @endif
-                        @endforeach
-                    </div>
-                </th>
-            </tr>
-            <tr class="table-grid-header">
-                <th>
-                    <span class="checkbox">
-                        <input type="checkbox" id="mastercheckbox">
-                        <label class="checkbox-view" for="checkbox"></label>
-                    </span>
-                </th>
-                @foreach ($columns as $column)
-                    @if($column->sortable == "true")
-                        <th class="grid_head"
-                            @if(strpos($column->alias, ' as '))
-                                <?php $exploded_name = explode(' as ',$column->name); ?>
-                                data-column-name="{{ $exploded_name[0] }}"
-                            @else
-                                data-column-name="{{ $column->alias }}"
-                            @endif
-
-                            data-column-label="{{ $column->label }}"
-                                data-column-sort="asc">{!! $column->sorting() !!}<span class="icon sort-down-icon"></span>
-                        </th>
-                        @else
-                            <th class="grid_head" data-column-name="{{ $column->alias }}" data-column-label="{{ $column->label }}">{!! $column->sorting() !!}</th>
-                    @endif
-                @endforeach
-                {{-- @if(isset($attribute_columns))
-                    @foreach($attribute_columns as $key => $value)
-                        <th>
-                            {{ $value }}
-                        </th>
-                    @endforeach
-                @endif --}}
-                <th>
-                    Actions
-                </th>
-            </tr>
-        </thead>
-        <tbody class="{{ $css->tbody }}">
-            @if(count($results) == 0)
-            <tr>
-                <td colspan="{{ count($columns)+1 }}" style="text-align: center;">
-                    No Records Found.
-                </td>
-            </tr>
-            @endif
-            @foreach ($results as $result)
-            <tr>
-
-                <td class="">
-                    <span class="checkbox">
-                        <input type="checkbox" class="indexers" id="{{ $result->id }}" name="checkbox[]">
-                        <label class="checkbox-view" for="checkbox1"></label>
-                    </span>
-                </td>
-                @foreach ($columns as $column)
-                    <td class="">{!! $column->render($result) !!}</td>
-                @endforeach
-
-                {{-- @if(isset($attribute_columns))
-                @foreach ($attribute_columns as $atc)
-                    <td>{{ $result->{$atc} }}</td>
-                @endforeach
-                @endif --}}
-
-                <td class="action">
-                    @foreach($actions as $action)
-                        <a @if($action['type'] == "Edit") href="{{ url()->current().'/edit/'.$result->id }}" @elseif($action['type']=="Delete") href="{{ url()->current().'/delete/'.$result->id }}" @endif  class="Action-{{ $action['type'] }}" id="{{ $result->id }}" onclick="return confirm_click('{{ $action['confirm_text'] }}');">
-                            <i class="{{ $action['icon'] }}"></i>
-                        </a>
-                    @endforeach
-                </td>
-
-            </tr>
-            @endforeach
-        </tbody>
-    </table>
-    <div class="pagination">
-        {{ $results->links() }}
-    </div>
-</div>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php
new file mode 100644
index 000000000..b22d3e54e
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table/head.blade.php
@@ -0,0 +1,105 @@
+<thead>
+    <tr class="mass-action" style="display: none; height:63px;">
+        <th colspan="{{ count($columns)+1 }}">
+            <div class="mass-action-wrapper">
+
+                <span class="massaction-remove">
+                    <span class="icon checkbox-dash-icon"></span>
+                </span>
+
+                {{-- Mass operation implementation --}}
+                @foreach($massoperations as $massoperation)
+                    @if($massoperation['type'] == "button")
+
+                    <form onsubmit="return confirm('Are You Sure?');"
+                        @if(strtoupper($massoperation[ 'method'])=="GET" || strtoupper($massoperation['method'])=="POST" )
+                            method="{{ strtoupper($massoperation['method']) }}"
+                        @else
+                            method="POST"
+                        @endif
+
+                        action="{{ $massoperation['route'] }}">
+
+                        {{ csrf_field() }}
+
+                        @if(strtoupper($massoperation['method'])!= "GET" && strtoupper($massoperation['method'])!= "POST")
+
+                        @method($massoperation['method'])
+
+                        @endif
+
+                        <input type="hidden" id="indexes" name="indexes" value="">
+
+                        <input class="btn btn-primary btn-sm" type="submit" value="Delete">
+
+                    </form>
+
+                    @elseif($massoperation['type'] == "select")
+
+                        <form
+                            @if(strtoupper($massoperation[ 'method'])=="GET" || strtoupper($massoperation[ 'method'])=="POST" )
+
+                                method="{{ strtoupper($massoperation['method']) }}"
+
+                            @else
+                                method="POST"
+
+                                @endif
+
+                            action="{{ $massoperation['route'] }}">
+                                {{ csrf_field() }}
+                            @if(strtoupper($massoperation['method'])!= "GET" && strtoupper($massoperation['method'])!= "POST")
+
+                                @method($massoperation['method'])
+
+                            @endif
+
+                            <input type="hidden" id="indexes" name="indexes" value="">
+
+                            <select name="choices">
+                                @foreach($massoperation['options'] as $option)
+                                    <option>{{ $option }}</option>
+                                @endforeach
+                            </select>
+
+                            <input class="btn btn-primary btn-sm" type="submit" value="Submit">
+                        </form>
+                    @endif
+                @endforeach
+            </div>
+        </th>
+    </tr>
+    <tr class="table-grid-header">
+        <th>
+            <span class="checkbox">
+                <input type="checkbox" id="mastercheckbox">
+                <label class="checkbox-view" for="checkbox"></label>
+            </span>
+        </th>
+        @foreach ($columns as $column)
+            @if($column->sortable == "true")
+                <th class="grid_head sortable"
+                    @if(strpos($column->alias, ' as '))
+                        <?php $exploded_name = explode(' as ',$column->name); ?>
+                        data-column-name="{{ $exploded_name[0] }}"
+                    @else
+                        data-column-name="{{ $column->alias }}"
+                    @endif
+
+                    data-column-label="{{ $column->label }}"
+                    data-column-sort="asc">
+                    {!! $column->sorting() !!}<span class="icon"></span>
+                </th>
+                @else
+                    <th class="grid_head"
+                        data-column-name="{{ $column->alias }}"
+                        data-column-label="{{ $column->label }}">
+                        {!! $column->sorting() !!}
+                    </th>
+            @endif
+        @endforeach
+        <th>
+            {{ __('ui::app.datagrid.actions') }}
+        </th>
+    </tr>
+</thead>
\ No newline at end of file
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index d2b3e8cf9..13d58889c 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -15,8 +15,12 @@
   background-image: URL("../images/icon-menu-close.svg");
   width: 24px;
   height: 24px;
-  margin-left: auto;
-  margin-bottom: 2px;
+}
+
+.icon-menu-close-adj {
+  background-image: URL("../images/cross-icon-adj.svg");
+  width: 32px;
+  height: 32px;
 }
 
 .grid-view-icon {
@@ -121,6 +125,63 @@
   height: 18px;
 }
 
+.product-card .product-image {
+  max-height: 350px;
+  max-width: 280px;
+  margin-bottom: 10px;
+  background: #F2F2F2;
+}
+
+.product-card .product-image img {
+  display: block;
+  width: 100%;
+}
+
+.product-card .product-name {
+  margin-bottom: 14px;
+  width: 100%;
+  color: #242424;
+}
+
+.product-card .product-name a {
+  color: #242424;
+}
+
+.product-card .product-description {
+  display: none;
+}
+
+.product-card .product-ratings {
+  width: 100%;
+}
+
+.product-card .product-ratings .icon {
+  width: 16px;
+  height: 16px;
+}
+
+.product-card .cart-wish-wrap {
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: start;
+      -ms-flex-pack: start;
+          justify-content: flex-start;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  height: 40px;
+}
+
+.product-card .cart-wish-wrap .addtocart {
+  margin-right: 10px;
+  text-transform: uppercase;
+}
+
+.product-card .cart-wish-wrap .add-to-wishlist {
+  margin-top: 5px;
+}
+
 .product-grid-4 {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
@@ -163,56 +224,6 @@
   }
 }
 
-.product-card .product-image {
-  max-height: 350px;
-  max-width: 280px;
-  margin-bottom: 10px;
-  background: #F2F2F2;
-}
-
-.product-card .product-image img {
-  display: block;
-  width: 100%;
-}
-
-.product-card .product-name {
-  margin-bottom: 14px;
-  width: 100%;
-  color: #242424;
-}
-
-.product-card .product-name a {
-  color: #242424;
-}
-
-.product-card .product-description {
-  display: none;
-}
-
-.product-card .product-ratings {
-  width: 100%;
-}
-
-.product-card .product-ratings .icon {
-  width: 16px;
-  height: 16px;
-}
-
-.product-card .cart-fav-seg {
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-}
-
-.product-card .cart-fav-seg .addtocart {
-  margin-right: 10px;
-  text-transform: uppercase;
-  white-space: nowrap;
-}
-
 .add-to-wishlist .wishlist-icon:hover {
   background-image: url("../images/wishadd.svg");
 }
@@ -251,7 +262,7 @@
   text-align: left;
 }
 
-.account-head .account-edit {
+.account-head .account-action {
   font-size: 17px;
   margin-top: 1%;
   color: #0031F0;
@@ -1155,10 +1166,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   position: relative;
 }
 
-.header .header-bottom .nav a:first-child {
-  margin-left: 20px;
-}
-
 .header .header-bottom .nav li > .icon {
   display: none;
 }
@@ -2358,94 +2365,90 @@ section.review .review-layouter {
   display: flex;
   -webkit-box-orient: horizontal;
   -webkit-box-direction: normal;
-      -ms-flex-flow: row;
-          flex-flow: row;
-  margin-top: 20px;
+      -ms-flex-direction: row;
+          flex-direction: row;
 }
 
-section.review .review-layouter .product-info .image {
-  border: 1px solid red;
-}
-
-section.review .review-layouter .product-info .image img {
+section.review .review-layouter .product-info .product-image img {
+  display: block;
   height: 280px;
   width: 280px;
 }
 
-section.review .review-layouter .product-info .heading {
+section.review .review-layouter .product-info .product-name {
   margin-top: 20px;
 }
 
-section.review .review-layouter .product-info .heading span {
+section.review .review-layouter .product-info .product-name span {
   font-size: 24px;
 }
 
-section.review .review-layouter .product-info .price {
+section.review .review-layouter .product-info .product-price {
   margin-top: 10px;
 }
 
-section.review .review-layouter .product-info .price .pro-price {
+section.review .review-layouter .product-info .product-price .pro-price {
   font-size: 24px;
   color: #FF6472;
 }
 
-section.review .review-layouter .product-info .price .pro-price-not {
+section.review .review-layouter .product-info .product-price .pro-price-not {
   margin-left: 10px;
   color: #A5A5A5;
 }
 
-section.review .review-layouter .product-info .price .offer {
+section.review .review-layouter .product-info .product-price .offer {
   margin-left: 10px;
 }
 
-section.review .review-layouter .review-info {
+section.review .review-layouter .review-form {
   margin-left: 20px;
   width: 49%;
 }
 
-section.review .review-layouter .review-info .heading {
+section.review .review-layouter .review-form .heading {
   margin-top: 10px;
 }
 
-section.review .review-layouter .review-info .heading .btn.btn-primary.right {
+section.review .review-layouter .review-form .heading .btn.btn-primary.right {
   float: right;
   margin-top: -10px;
 }
 
-section.review .review-layouter .review-info .rating {
+section.review .review-layouter .review-form .rating {
   margin-top: 25px;
   color: #A5A5A5;
 }
 
-section.review .review-layouter .review-info .rating span {
+section.review .review-layouter .review-form .rating span {
   display: inline;
 }
 
-section.review .review-layouter .review-info .stars {
+section.review .review-layouter .review-form .stars {
   width: 270px;
   display: inline-block;
 }
 
-section.review .review-layouter .review-info .stars label.star {
+section.review .review-layouter .review-form .stars label.star {
   font-size: 36px;
   color: #d4d4d4;
   -webkit-transition: all .2s;
   transition: all .2s;
 }
 
-section.review .review-layouter .review-info .stars label.star:before {
+section.review .review-layouter .review-form .stars label.star:before {
   content: '\2605';
 }
 
-section.review .review-layouter .review-info .write-review {
+section.review .review-layouter .review-form .write-review {
   margin-top: 25px;
 }
 
-section.review .review-layouter .review-info .write-review .control-group {
+section.review .review-layouter .review-form .write-review .control-group {
   margin-bottom: 0px;
 }
 
-section.review .review-layouter .review-info .write-review .control-group textarea {
+section.review .review-layouter .review-form .write-review .control-group textarea {
   margin-top: 5px;
   border: 2px solid #E8E8E8;
   border-radius: 3px;
@@ -2453,11 +2456,11 @@ section.review .review-layouter .review-info .write-review .control-group textar
   height: 120px;
 }
 
-section.review .review-layouter .review-info .submit-button {
+section.review .review-layouter .review-form .submit-button {
   margin-top: 10px;
 }
 
-section.review .review-layouter .review-info .submit-button button {
+section.review .review-layouter .review-form .submit-button button {
   background: #0031F0;
   font-size: 14px;
   color: #F2F2F2;
@@ -2467,7 +2470,7 @@ section.review .review-layouter .review-info .submit-button button {
   border: none;
 }
 
-section.review .review-layouter .review-info .review-detail {
+section.review .review-layouter .review-form .review-detail {
   height: 150px;
   border: 1px solid firebrick;
   margin-top: 30px;
@@ -2480,18 +2483,18 @@ section.review .review-layouter .review-info .review-detail {
           flex-direction: row;
 }
 
-section.review .review-layouter .review-info .review-detail .rating-review {
+section.review .review-layouter .review-form .review-detail .rating-review {
   margin-top: 40px;
   margin-left: 20px;
   width: 48%;
 }
 
-section.review .review-layouter .review-info .review-detail .rating-review .avg-rating-count span {
+section.review .review-layouter .review-form .review-detail .rating-review .avg-rating-count span {
   font-size: 34px;
   text-align: center;
 }
 
-section.review .review-layouter .review-info .review-detail .rating-calculate .progress-only {
+section.review .review-layouter .review-form .review-detail .rating-calculate .progress-only {
   width: 20px;
   border: 1px solid blue;
 }
diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js
index e21cad741..9c193f217 100644
--- a/public/themes/default/assets/js/shop.js
+++ b/public/themes/default/assets/js/shop.js
@@ -11535,7 +11535,7 @@ return jQuery;
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(global, setImmediate) {/*!
- * Vue.js v2.5.17
+ * Vue.js v2.5.16
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -16624,7 +16624,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.5.17';
+Vue.version = '2.5.16';
 
 /*  */
 
@@ -31526,7 +31526,11 @@ if (false) {
 /* 50 */
 /***/ (function(module, exports, __webpack_require__) {
 
+<<<<<<< HEAD
+!function(t,e){ true?module.exports=e():"function"==typeof define&&define.amd?define("vue-slider-component",[],e):"object"==typeof exports?exports["vue-slider-component"]=e():t["vue-slider-component"]=e()}(this,function(){return function(t){function e(s){if(i[s])return i[s].exports;var r=i[s]={i:s,l:!1,exports:{}};return t[s].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var i={};return e.m=t,e.c=i,e.i=function(t){return t},e.d=function(t,i,s){e.o(t,i)||Object.defineProperty(t,i,{configurable:!1,enumerable:!0,get:s})},e.n=function(t){var i=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(i,"a",i),i},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=2)}([function(t,e,i){i(7);var s=i(5)(i(1),i(6),null,null);t.exports=s.exports},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=function(){var t="undefined"!=typeof window?window.devicePixelRatio||1:1;return function(e){return Math.round(e*t)/t}}();e.default={name:"VueSliderComponent",props:{width:{type:[Number,String],default:"auto"},height:{type:[Number,String],default:6},data:{type:Array,default:null},dotSize:{type:Number,default:16},dotWidth:{type:Number,required:!1},dotHeight:{type:Number,required:!1},min:{type:Number,default:0},max:{type:Number,default:100},interval:{type:Number,default:1},show:{type:Boolean,default:!0},disabled:{type:[Boolean,Array],default:!1},piecewise:{type:Boolean,default:!1},tooltip:{type:[String,Boolean],default:"always"},eventType:{type:String,default:"auto"},direction:{type:String,default:"horizontal"},reverse:{type:Boolean,default:!1},lazy:{type:Boolean,default:!1},clickable:{type:Boolean,default:!0},speed:{type:Number,default:.5},realTime:{type:Boolean,default:!1},stopPropagation:{type:Boolean,default:!1},value:{type:[String,Number,Array,Object],default:0},piecewiseLabel:{type:Boolean,default:!1},debug:{type:Boolean,default:!0},fixed:{type:Boolean,default:!1},processDragable:{type:Boolean,default:!1},useKeyboard:{type:Boolean,default:!1},actionsKeyboard:{type:Array,default:function(){return[function(t){return t-1},function(t){return t+1}]}},tooltipMerge:{type:Boolean,default:!0},startAnimation:{type:Boolean,default:!1},sliderStyle:[Array,Object,Function],focusStyle:[Array,Object,Function],tooltipDir:[Array,String],formatter:[String,Function],mergeFormatter:[String,Function],piecewiseStyle:Object,disabledStyle:Object,piecewiseActiveStyle:Object,processStyle:Object,bgStyle:Object,tooltipStyle:[Array,Object,Function],disabledDotStyle:[Array,Object,Function],labelStyle:Object,labelActiveStyle:Object},data:function(){return{flag:!1,keydownFlag:null,focusFlag:!1,processFlag:!1,processSign:null,size:0,fixedValue:0,focusSlider:0,currentValue:0,currentSlider:0,isComponentExists:!0,isMounted:!1}},computed:{dotWidthVal:function(){return"number"==typeof this.dotWidth?this.dotWidth:this.dotSize},dotHeightVal:function(){return"number"==typeof this.dotHeight?this.dotHeight:this.dotSize},flowDirection:function(){return"vue-slider-"+this.direction+(this.reverse?"-reverse":"")},tooltipMergedPosition:function(){if(!this.isMounted)return{};var t=this.tooltipDirection[0];if(this.$refs.dot0){if("vertical"===this.direction){var e={};return e[t]="-"+(this.dotHeightVal/2-this.width/2+9)+"px",e}var i={};return i[t]="-"+(this.dotWidthVal/2-this.height/2+9)+"px",i.left="50%",i}},tooltipDirection:function(){var t=this.tooltipDir||("vertical"===this.direction?"left":"top");return Array.isArray(t)?this.isRange?t:t[1]:this.isRange?[t,t]:t},tooltipStatus:function(){return"hover"===this.tooltip&&this.flag?"vue-slider-always":this.tooltip?"vue-slider-"+this.tooltip:""},tooltipClass:function(){return["vue-slider-tooltip-"+this.tooltipDirection,"vue-slider-tooltip"]},disabledArray:function(){return Array.isArray(this.disabled)?this.disabled:[this.disabled,this.disabled]},boolDisabled:function(){return this.disabledArray.every(function(t){return!0===t})},isDisabled:function(){return"none"===this.eventType||this.boolDisabled},disabledClass:function(){return this.boolDisabled?"vue-slider-disabled":""},stateClass:function(){return{"vue-slider-state-process-drag":this.processFlag,"vue-slider-state-drag":this.flag&&!this.processFlag&&!this.keydownFlag,"vue-slider-state-focus":this.focusFlag}},isRange:function(){return Array.isArray(this.value)},slider:function(){return this.isRange?[this.$refs.dot0,this.$refs.dot1]:this.$refs.dot},minimum:function(){return this.data?0:this.min},val:{get:function(){return this.data?this.isRange?[this.data[this.currentValue[0]],this.data[this.currentValue[1]]]:this.data[this.currentValue]:this.currentValue},set:function(t){if(this.data)if(this.isRange){var e=this.data.indexOf(t[0]),i=this.data.indexOf(t[1]);e>-1&&i>-1&&(this.currentValue=[e,i])}else{var s=this.data.indexOf(t);s>-1&&(this.currentValue=s)}else this.currentValue=t}},currentIndex:function(){return this.isRange?this.data?this.currentValue:[this.getIndexByValue(this.currentValue[0]),this.getIndexByValue(this.currentValue[1])]:this.getIndexByValue(this.currentValue)},indexRange:function(){return this.isRange?this.currentIndex:[0,this.currentIndex]},maximum:function(){return this.data?this.data.length-1:this.max},multiple:function(){var t=(""+this.interval).split(".")[1];return t?Math.pow(10,t.length):1},spacing:function(){return this.data?1:this.interval},total:function(){return this.data?this.data.length-1:(Math.floor((this.maximum-this.minimum)*this.multiple)%(this.interval*this.multiple)!=0&&this.printError("Prop[interval] is illegal, Please make sure that the interval can be divisible"),(this.maximum-this.minimum)/this.interval)},gap:function(){return this.size/this.total},position:function(){return this.isRange?[(this.currentValue[0]-this.minimum)/this.spacing*this.gap,(this.currentValue[1]-this.minimum)/this.spacing*this.gap]:(this.currentValue-this.minimum)/this.spacing*this.gap},limit:function(){return this.isRange?this.fixed?[[0,(this.total-this.fixedValue)*this.gap],[this.fixedValue*this.gap,this.size]]:[[0,this.position[1]],[this.position[0],this.size]]:[0,this.size]},valueLimit:function(){return this.isRange?this.fixed?[[this.minimum,this.maximum-this.fixedValue*(this.spacing*this.multiple)/this.multiple],[this.minimum+this.fixedValue*(this.spacing*this.multiple)/this.multiple,this.maximum]]:[[this.minimum,this.currentValue[1]],[this.currentValue[0],this.maximum]]:[this.minimum,this.maximum]},idleSlider:function(){return 0===this.currentSlider?1:0},wrapStyles:function(){return"vertical"===this.direction?{height:"number"==typeof this.height?this.height+"px":this.height,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}:{width:"number"==typeof this.width?this.width+"px":this.width,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}},sliderStyles:function(){return Array.isArray(this.sliderStyle)?this.isRange?this.sliderStyle:this.sliderStyle[1]:"function"==typeof this.sliderStyle?this.sliderStyle(this.val,this.currentIndex):this.isRange?[this.sliderStyle,this.sliderStyle]:this.sliderStyle},focusStyles:function(){return Array.isArray(this.focusStyle)?this.isRange?this.focusStyle:this.focusStyle[1]:"function"==typeof this.focusStyle?this.focusStyle(this.val,this.currentIndex):this.isRange?[this.focusStyle,this.focusStyle]:this.focusStyle},disabledDotStyles:function(){var t=this.disabledDotStyle;if(Array.isArray(t))return t;if("function"==typeof t){var e=t(this.val,this.currentIndex);return Array.isArray(e)?e:[e,e]}return t?[t,t]:[{backgroundColor:"#ccc"},{backgroundColor:"#ccc"}]},tooltipStyles:function(){return Array.isArray(this.tooltipStyle)?this.isRange?this.tooltipStyle:this.tooltipStyle[1]:"function"==typeof this.tooltipStyle?this.tooltipStyle(this.val,this.currentIndex):this.isRange?[this.tooltipStyle,this.tooltipStyle]:this.tooltipStyle},elemStyles:function(){return"vertical"===this.direction?{width:this.width+"px",height:"100%"}:{height:this.height+"px"}},dotStyles:function(){return"vertical"===this.direction?{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",left:-(this.dotWidthVal-this.width)/2+"px"}:{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",top:-(this.dotHeightVal-this.height)/2+"px"}},piecewiseDotStyle:function(){return"vertical"===this.direction?{width:this.width+"px",height:this.width+"px"}:{width:this.height+"px",height:this.height+"px"}},piecewiseDotWrap:function(){if(!this.piecewise&&!this.piecewiseLabel)return!1;for(var t=[],e=0;e<=this.total;e++){var i="vertical"===this.direction?{bottom:this.gap*e-this.width/2+"px",left:0}:{left:this.gap*e-this.height/2+"px",top:0},s=this.reverse?this.total-e:e,r=this.data?this.data[s]:this.spacing*s+this.min;t.push({style:i,label:this.formatter?this.formatting(r):r,inRange:s>=this.indexRange[0]&&s<=this.indexRange[1]})}return t}},watch:{value:function(t){this.flag||this.setValue(t,!0)},max:function(t){if(t<this.min)return this.printError("The maximum value can not be less than the minimum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},min:function(t){if(t>this.max)return this.printError("The minimum value can not be greater than the maximum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},show:function(t){var e=this;t&&!this.size&&this.$nextTick(function(){e.refresh()})},fixed:function(){this.computedFixedValue()}},methods:{bindEvents:function(){document.addEventListener("touchmove",this.moving,{passive:!1}),document.addEventListener("touchend",this.moveEnd,{passive:!1}),document.addEventListener("mousedown",this.blurSlider),document.addEventListener("mousemove",this.moving),document.addEventListener("mouseup",this.moveEnd),document.addEventListener("mouseleave",this.moveEnd),document.addEventListener("keydown",this.handleKeydown),document.addEventListener("keyup",this.handleKeyup),window.addEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.addEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.addEventListener("transitionend",this.handleOverlapTooltip))},unbindEvents:function(){document.removeEventListener("touchmove",this.moving),document.removeEventListener("touchend",this.moveEnd),document.removeEventListener("mousedown",this.blurSlider),document.removeEventListener("mousemove",this.moving),document.removeEventListener("mouseup",this.moveEnd),document.removeEventListener("mouseleave",this.moveEnd),document.removeEventListener("keydown",this.handleKeydown),document.removeEventListener("keyup",this.handleKeyup),window.removeEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.removeEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.removeEventListener("transitionend",this.handleOverlapTooltip))},handleKeydown:function(t){if(!this.useKeyboard||!this.focusFlag)return!1;switch(t.keyCode){case 37:case 40:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[0]);break;case 38:case 39:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[1])}},handleKeyup:function(){this.keydownFlag&&(this.keydownFlag=!1,this.flag=!1)},changeFocusSlider:function(t){var e=this;if(this.isRange){var i=this.currentIndex.map(function(i,s){if(s===e.focusSlider||e.fixed){var r=t(i),o=e.fixed?e.valueLimit[s]:[0,e.total];if(r<=o[1]&&r>=o[0])return r}return i});i[0]>i[1]&&(this.focusSlider=0===this.focusSlider?1:0,i=i.reverse()),this.setIndex(i)}else this.setIndex(t(this.currentIndex))},blurSlider:function(t){var e=this.isRange?this.$refs["dot"+this.focusSlider]:this.$refs.dot;if(!e||e===t.target)return!1;this.focusFlag=!1},formatting:function(t){return"string"==typeof this.formatter?this.formatter.replace(/\{value\}/,t):this.formatter(t)},mergeFormatting:function(t,e){return"string"==typeof this.mergeFormatter?this.mergeFormatter.replace(/\{(value1|value2)\}/g,function(i,s){return"value1"===s?t:e}):this.mergeFormatter(t,e)},getPos:function(t){return this.realTime&&this.getStaticData(),"vertical"===this.direction?this.reverse?t.pageY-this.offset:this.size-(t.pageY-this.offset):this.reverse?this.size-(t.clientX-this.offset):t.clientX-this.offset},processClick:function(t){this.fixed&&t.stopPropagation()},wrapClick:function(t){var e=this;if(this.isDisabled||!this.clickable||this.processFlag)return!1;var i=this.getPos(t);if(this.isRange)if(this.disabledArray.every(function(t){return!1===t}))this.currentSlider=i>(this.position[1]-this.position[0])/2+this.position[0]?1:0;else if(this.disabledArray[0]){if(i<this.position[0])return!1;this.currentSlider=1}else if(this.disabledArray[1]){if(i>this.position[1])return!1;this.currentSlider=0}if(this.disabledArray[this.currentSlider])return!1;if(this.setValueOnPos(i),this.isRange&&this.tooltipMerge){var s=setInterval(function(){return e.handleOverlapTooltip()},16.7);setTimeout(function(){return window.clearInterval(s)},1e3*this.speed)}},moveStart:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,i=arguments[2];if(this.disabledArray[e])return!1;if(this.stopPropagation&&t.stopPropagation(),this.isRange&&(this.currentSlider=e,i)){if(!this.processDragable)return!1;this.processFlag=!0,this.processSign={pos:this.position,start:this.getPos(t.targetTouches&&t.targetTouches[0]?t.targetTouches[0]:t)}}!i&&this.useKeyboard&&(this.focusFlag=!0,this.focusSlider=e),this.flag=!0,this.$emit("drag-start",this)},moving:function(t){if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;t.preventDefault(),t.targetTouches&&t.targetTouches[0]&&(t=t.targetTouches[0]),this.processFlag?(this.currentSlider=0,this.setValueOnPos(this.processSign.pos[0]+this.getPos(t)-this.processSign.start,!0),this.currentSlider=1,this.setValueOnPos(this.processSign.pos[1]+this.getPos(t)-this.processSign.start,!0)):this.setValueOnPos(this.getPos(t),!0),this.isRange&&this.tooltipMerge&&this.handleOverlapTooltip()},moveEnd:function(t){var e=this;if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;this.$emit("drag-end",this),this.lazy&&this.isDiff(this.val,this.value)&&this.syncValue(),this.flag=!1,window.setTimeout(function(){e.processFlag=!1},0),this.setPosition()},setValueOnPos:function(t,e){var i=this.isRange?this.limit[this.currentSlider]:this.limit,s=this.isRange?this.valueLimit[this.currentSlider]:this.valueLimit;if(t>=i[0]&&t<=i[1]){this.setTransform(t);var r=this.getValueByIndex(Math.round(t/this.gap));this.setCurrentValue(r,e),this.isRange&&this.fixed&&(this.setTransform(t+this.fixedValue*this.gap*(0===this.currentSlider?1:-1),!0),this.setCurrentValue((r*this.multiple+this.fixedValue*this.spacing*this.multiple*(0===this.currentSlider?1:-1))/this.multiple,e,!0))}else t<i[0]?(this.setTransform(i[0]),this.setCurrentValue(s[0]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][0],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][0],e,!0)):this.fixed||this.disabledArray[0]||1!==this.currentSlider||(this.focusSlider=0,this.currentSlider=0)):(this.setTransform(i[1]),this.setCurrentValue(s[1]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][1],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][1],e,!0)):this.fixed||this.disabledArray[1]||0!==this.currentSlider||(this.focusSlider=1,this.currentSlider=1))},isDiff:function(t,e){return Object.prototype.toString.call(t)!==Object.prototype.toString.call(e)||(Array.isArray(t)&&t.length===e.length?t.some(function(t,i){return t!==e[i]}):t!==e)},setCurrentValue:function(t,e,i){var s=i?this.idleSlider:this.currentSlider;if(t<this.minimum||t>this.maximum)return!1;this.isRange?this.isDiff(this.currentValue[s],t)&&(this.currentValue.splice(s,1,t),this.lazy&&this.flag||this.syncValue()):this.isDiff(this.currentValue,t)&&(this.currentValue=t,this.lazy&&this.flag||this.syncValue()),e||this.setPosition()},getValueByIndex:function(t){return(this.spacing*this.multiple*t+this.minimum*this.multiple)/this.multiple},getIndexByValue:function(t){return Math.round((t-this.minimum)*this.multiple)/(this.spacing*this.multiple)},setIndex:function(t){if(Array.isArray(t)&&this.isRange){var e=void 0;e=this.data?[this.data[t[0]],this.data[t[1]]]:[this.getValueByIndex(t[0]),this.getValueByIndex(t[1])],this.setValue(e)}else t=this.getValueByIndex(t),this.isRange&&(this.currentSlider=t>(this.currentValue[1]-this.currentValue[0])/2+this.currentValue[0]?1:0),this.setCurrentValue(t)},setValue:function(t,e,i){var s=this;if(this.isDiff(this.val,t)){var r=this.limitValue(t);this.val=this.isRange?r.concat():r,this.computedFixedValue(),this.syncValue(e)}this.$nextTick(function(){return s.setPosition(i)})},computedFixedValue:function(){if(!this.fixed)return this.fixedValue=0,!1;this.fixedValue=this.currentIndex[1]-this.currentIndex[0]},setPosition:function(t){this.flag||this.setTransitionTime(void 0===t?this.speed:t),this.isRange?(this.setTransform(this.position[0],1===this.currentSlider),this.setTransform(this.position[1],0===this.currentSlider)):this.setTransform(this.position),this.flag||this.setTransitionTime(0)},setTransform:function(t,e){var i=e?this.idleSlider:this.currentSlider,r=s(("vertical"===this.direction?this.dotHeightVal/2-t:t-this.dotWidthVal/2)*(this.reverse?-1:1)),o="vertical"===this.direction?"translateY("+r+"px)":"translateX("+r+"px)",n=this.fixed?this.fixedValue*this.gap+"px":(0===i?this.position[1]-t:t-this.position[0])+"px",l=this.fixed?(0===i?t:t-this.fixedValue*this.gap)+"px":(0===i?t:this.position[0])+"px";this.isRange?(this.slider[i].style.transform=o,this.slider[i].style.WebkitTransform=o,this.slider[i].style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=n,this.$refs.process.style[this.reverse?"top":"bottom"]=l):(this.$refs.process.style.width=n,this.$refs.process.style[this.reverse?"right":"left"]=l)):(this.slider.style.transform=o,this.slider.style.WebkitTransform=o,this.slider.style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=t+"px",this.$refs.process.style[this.reverse?"top":"bottom"]=0):(this.$refs.process.style.width=t+"px",this.$refs.process.style[this.reverse?"right":"left"]=0))},setTransitionTime:function(t){if(t||this.$refs.process.offsetWidth,this.isRange){for(var e=0;e<this.slider.length;e++)this.slider[e].style.transitionDuration=t+"s",this.slider[e].style.WebkitTransitionDuration=t+"s";this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"}else this.slider.style.transitionDuration=t+"s",this.slider.style.WebkitTransitionDuration=t+"s",this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"},limitValue:function(t){var e=this;if(this.data)return t;var i=function(i){return i<e.min?(e.printError("The value of the slider is "+t+", the minimum value is "+e.min+", the value of this slider can not be less than the minimum value"),e.min):i>e.max?(e.printError("The value of the slider is "+t+", the maximum value is "+e.max+", the value of this slider can not be greater than the maximum value"),e.max):i};return this.isRange?t.map(function(t){return i(t)}):i(t)},syncValue:function(t){var e=this.isRange?this.val.concat():this.val;this.$emit("input",e),t||this.$emit("callback",e)},getValue:function(){return this.val},getIndex:function(){return this.currentIndex},getStaticData:function(){this.$refs.elem&&(this.size="vertical"===this.direction?this.$refs.elem.offsetHeight:this.$refs.elem.offsetWidth,this.offset="vertical"===this.direction?this.$refs.elem.getBoundingClientRect().top+window.pageYOffset||document.documentElement.scrollTop:this.$refs.elem.getBoundingClientRect().left)},refresh:function(){this.$refs.elem&&(this.getStaticData(),this.computedFixedValue(),this.setPosition())},printError:function(t){this.debug&&console.error("[VueSlider error]: "+t)},handleOverlapTooltip:function(){var t=this.tooltipDirection[0]===this.tooltipDirection[1];if(this.isRange&&t){var e=this.reverse?this.$refs.tooltip1:this.$refs.tooltip0,i=this.reverse?this.$refs.tooltip0:this.$refs.tooltip1,s=e.getBoundingClientRect().right,r=i.getBoundingClientRect().left,o=e.getBoundingClientRect().y,n=i.getBoundingClientRect().y+i.getBoundingClientRect().height,l="horizontal"===this.direction&&s>r,a="vertical"===this.direction&&n>o;l||a?this.handleDisplayMergedTooltip(!0):this.handleDisplayMergedTooltip(!1)}},handleDisplayMergedTooltip:function(t){var e=this.$refs.tooltip0,i=this.$refs.tooltip1,s=this.$refs.process.getElementsByClassName("vue-merged-tooltip")[0];t?(e.style.visibility="hidden",i.style.visibility="hidden",s.style.visibility="visible"):(e.style.visibility="visible",i.style.visibility="visible",s.style.visibility="hidden")}},mounted:function(){var t=this;if(this.isComponentExists=!0,"undefined"==typeof window||"undefined"==typeof document)return this.printError("window or document is undefined, can not be initialization.");this.$nextTick(function(){t.isComponentExists&&(t.getStaticData(),t.setValue(t.limitValue(t.value),!0,t.startAnimation?t.speed:0),t.bindEvents())}),this.isMounted=!0},beforeDestroy:function(){this.isComponentExists=!1,this.unbindEvents()}}},function(t,e,i){"use strict";var s=i(0);t.exports=s},function(t,e,i){e=t.exports=i(4)(),e.push([t.i,'.vue-slider-component{position:relative;box-sizing:border-box;-ms-user-select:none;user-select:none;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none}.vue-slider-component.vue-slider-disabled{opacity:.5;cursor:not-allowed}.vue-slider-component.vue-slider-has-label{margin-bottom:15px}.vue-slider-component.vue-slider-disabled .vue-slider-dot{cursor:not-allowed}.vue-slider-component .vue-slider{position:relative;display:block;border-radius:15px;background-color:#ccc}.vue-slider-component .vue-slider:after{content:"";position:absolute;left:0;top:0;width:100%;height:100%;z-index:2}.vue-slider-component .vue-slider-process{position:absolute;border-radius:15px;background-color:#3498db;transition:all 0s;z-index:1}.vue-slider-component .vue-slider-process.vue-slider-process-dragable{cursor:pointer;z-index:3}.vue-slider-component.vue-slider-horizontal .vue-slider-process{width:0;height:100%;top:0;left:0;will-change:width}.vue-slider-component.vue-slider-vertical .vue-slider-process{width:100%;height:0;bottom:0;left:0;will-change:height}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-process{width:0;height:100%;top:0;right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-process{width:100%;height:0;top:0;left:0}.vue-slider-component .vue-slider-dot{position:absolute;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32);transition:all 0s;will-change:transform;cursor:pointer;z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-focus{box-shadow:0 0 2px 1px #3498db}.vue-slider-component .vue-slider-dot.vue-slider-dot-dragging{z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-disabled{z-index:4}.vue-slider-component.vue-slider-horizontal .vue-slider-dot{left:0}.vue-slider-component.vue-slider-vertical .vue-slider-dot{bottom:0}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-dot{right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-dot{top:0}.vue-slider-component .vue-slider-tooltip-wrap{display:none;position:absolute;z-index:9}.vue-slider-component .vue-slider-tooltip{display:block;font-size:14px;white-space:nowrap;padding:2px 5px;min-width:20px;text-align:center;color:#fff;border-radius:5px;border:1px solid #3498db;background-color:#3498db}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top{top:-9px;left:50%;transform:translate(-50%,-100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom{bottom:-9px;left:50%;transform:translate(-50%,100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left{top:50%;left:-9px;transform:translate(-100%,-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right{top:50%;right:-9px;transform:translate(100%,-50%)}.vue-slider-component .vue-slider-tooltip-top .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top .vue-slider-tooltip:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-top-color:inherit;transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-merged-tooltip{display:block;visibility:hidden}.vue-slider-component .vue-slider-tooltip-bottom .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom .vue-slider-tooltip:before{content:"";position:absolute;top:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-bottom-color:inherit;transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-left .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left .vue-slider-tooltip:before{content:"";position:absolute;top:50%;right:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-left-color:inherit;transform:translateY(-50%)}.vue-slider-component .vue-slider-tooltip-right .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right .vue-slider-tooltip:before{content:"";position:absolute;top:50%;left:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-right-color:inherit;transform:translateY(-50%)}.vue-slider-component .vue-slider-dot.vue-slider-hover:hover .vue-slider-tooltip-wrap{display:block}.vue-slider-component .vue-slider-dot.vue-slider-always .vue-slider-tooltip-wrap{display:block!important}.vue-slider-component .vue-slider-piecewise{position:absolute;width:100%;padding:0;margin:0;left:0;top:0;height:100%;list-style:none}.vue-slider-component .vue-slider-piecewise-item{position:absolute;width:8px;height:8px}.vue-slider-component .vue-slider-piecewise-dot{position:absolute;left:50%;top:50%;width:100%;height:100%;display:inline-block;background-color:rgba(0,0,0,.16);border-radius:50%;transform:translate(-50%,-50%);z-index:2;transition:all .3s}.vue-slider-component .vue-slider-piecewise-item:first-child .vue-slider-piecewise-dot,.vue-slider-component .vue-slider-piecewise-item:last-child .vue-slider-piecewise-dot{visibility:hidden}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-horizontal .vue-slider-piecewise-label{position:absolute;display:inline-block;top:100%;left:50%;white-space:nowrap;font-size:12px;color:#333;transform:translate(-50%,8px);visibility:visible}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-vertical .vue-slider-piecewise-label{position:absolute;display:inline-block;top:50%;left:100%;white-space:nowrap;font-size:12px;color:#333;transform:translate(8px,-50%);visibility:visible}.vue-slider-component .vue-slider-sr-only{clip:rect(1px,1px,1px,1px);height:1px;width:1px;overflow:hidden;position:absolute!important}',""])},function(t,e){t.exports=function(){var t=[];return t.toString=function(){for(var t=[],e=0;e<this.length;e++){var i=this[e];i[2]?t.push("@media "+i[2]+"{"+i[1]+"}"):t.push(i[1])}return t.join("")},t.i=function(e,i){"string"==typeof e&&(e=[[null,e,""]]);for(var s={},r=0;r<this.length;r++){var o=this[r][0];"number"==typeof o&&(s[o]=!0)}for(r=0;r<e.length;r++){var n=e[r];"number"==typeof n[0]&&s[n[0]]||(i&&!n[2]?n[2]=i:i&&(n[2]="("+n[2]+") and ("+i+")"),t.push(n))}},t}},function(t,e){t.exports=function(t,e,i,s){var r,o=t=t||{},n=typeof t.default;"object"!==n&&"function"!==n||(r=t,o=t.default);var l="function"==typeof o?o.options:o;if(e&&(l.render=e.render,l.staticRenderFns=e.staticRenderFns),i&&(l._scopeId=i),s){var a=Object.create(l.computed||null);Object.keys(s).forEach(function(t){var e=s[t];a[t]=function(){return e}}),l.computed=a}return{esModule:r,exports:o,options:l}}},function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"show",rawName:"v-show",value:t.show,expression:"show"}],ref:"wrap",class:["vue-slider-component",t.flowDirection,t.disabledClass,t.stateClass,{"vue-slider-has-label":t.piecewiseLabel}],style:[t.wrapStyles,t.boolDisabled?t.disabledStyle:null],on:{click:t.wrapClick}},[i("div",{ref:"elem",staticClass:"vue-slider",style:[t.elemStyles,t.bgStyle],attrs:{"aria-hidden":"true"}},[t.isRange?[i("div",{key:"dot0",ref:"dot0",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[0]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[0]?t.disabledDotStyles[0]:null,t.sliderStyles[0],t.focusFlag&&0===t.focusSlider?t.focusStyles[0]:null],on:{mousedown:function(e){t.moveStart(e,0)},touchstart:function(e){t.moveStart(e,0)}}},[i("div",{ref:"tooltip0",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[0]},[t._v(t._s(t.formatter?t.formatting(t.val[0]):t.val[0]))])],{value:t.val[0],index:0,disabled:!t.boolDisabled&&t.disabledArray[0]})],2)]),t._v(" "),i("div",{key:"dot1",ref:"dot1",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&1===t.focusSlider,"vue-slider-dot-dragging":t.flag&&1===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[1]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[1]?t.disabledDotStyles[1]:null,t.sliderStyles[1],t.focusFlag&&1===t.focusSlider?t.focusStyles[1]:null],on:{mousedown:function(e){t.moveStart(e,1)},touchstart:function(e){t.moveStart(e,1)}}},[i("div",{ref:"tooltip1",class:["vue-slider-tooltip-"+t.tooltipDirection[1],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[1]},[t._v(t._s(t.formatter?t.formatting(t.val[1]):t.val[1]))])],{value:t.val[1],index:1,disabled:!t.boolDisabled&&t.disabledArray[1]})],2)])]:[i("div",{key:"dot",ref:"dot",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider}],style:[t.dotStyles,t.sliderStyles,t.focusFlag&&0===t.focusSlider?t.focusStyles:null],on:{mousedown:t.moveStart,touchstart:t.moveStart}},[i("div",{class:["vue-slider-tooltip-"+t.tooltipDirection,"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v(t._s(t.formatter?t.formatting(t.val):t.val))])],{value:t.val})],2)])],t._v(" "),i("ul",{staticClass:"vue-slider-piecewise"},t._l(t.piecewiseDotWrap,function(e,s){return i("li",{key:s,staticClass:"vue-slider-piecewise-item",style:[t.piecewiseDotStyle,e.style]},[t._t("piecewise",[t.piecewise?i("span",{staticClass:"vue-slider-piecewise-dot",style:[t.piecewiseStyle,e.inRange?t.piecewiseActiveStyle:null]}):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange}),t._v(" "),t._t("label",[t.piecewiseLabel?i("span",{staticClass:"vue-slider-piecewise-label",style:[t.labelStyle,e.inRange?t.labelActiveStyle:null]},[t._v("\n            "+t._s(e.label)+"\n          ")]):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange})],2)})),t._v(" "),i("div",{ref:"process",class:["vue-slider-process",{"vue-slider-process-dragable":t.isRange&&t.processDragable}],style:t.processStyle,on:{click:t.processClick,mousedown:function(e){t.moveStart(e,0,!0)},touchstart:function(e){t.moveStart(e,0,!0)}}},[i("div",{ref:"mergedTooltip",staticClass:"vue-merged-tooltip",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"],style:t.tooltipMergedPosition},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v("\n            "+t._s(t.mergeFormatter?t.mergeFormatting(t.val[0],t.val[1]):t.formatter?t.val[0]===t.val[1]?t.formatting(t.val[0]):t.formatting(t.val[0])+" - "+t.formatting(t.val[1]):t.val[0]===t.val[1]?t.val[0]:t.val[0]+" - "+t.val[1])+"\n          ")])])],2)]),t._v(" "),t.isRange||t.data?t._e():i("input",{directives:[{name:"model",rawName:"v-model",value:t.val,expression:"val"}],staticClass:"vue-slider-sr-only",attrs:{type:"range",min:t.min,max:t.max},domProps:{value:t.val},on:{__r:function(e){t.val=e.target.value}}})],2)])},staticRenderFns:[]}},function(t,e,i){var s=i(3);"string"==typeof s&&(s=[[t.i,s,""]]),s.locals&&(t.exports=s.locals);i(8)("743d98f5",s,!0)},function(t,e,i){function s(t){for(var e=0;e<t.length;e++){var i=t[e],s=d[i.id];if(s){s.refs++;for(var r=0;r<s.parts.length;r++)s.parts[r](i.parts[r]);for(;r<i.parts.length;r++)s.parts.push(o(i.parts[r]));s.parts.length>i.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r<i.parts.length;r++)n.push(o(i.parts[r]));d[i.id]={id:i.id,refs:1,parts:n}}}}function r(){var t=document.createElement("style");return t.type="text/css",h.appendChild(t),t}function o(t){var e,i,s=document.querySelector('style[data-vue-ssr-id~="'+t.id+'"]');if(s){if(f)return v;s.parentNode.removeChild(s)}if(m){var o=p++;s=c||(c=r()),e=n.bind(null,s,o,!1),i=n.bind(null,s,o,!0)}else s=r(),e=l.bind(null,s),i=function(){s.parentNode.removeChild(s)};return e(t),function(s){if(s){if(s.css===t.css&&s.media===t.media&&s.sourceMap===t.sourceMap)return;e(t=s)}else i()}}function n(t,e,i,s){var r=i?"":s.css;if(t.styleSheet)t.styleSheet.cssText=g(e,r);else{var o=document.createTextNode(r),n=t.childNodes;n[e]&&t.removeChild(n[e]),n.length?t.insertBefore(o,n[e]):t.appendChild(o)}}function l(t,e){var i=e.css,s=e.media,r=e.sourceMap;if(s&&t.setAttribute("media",s),r&&(i+="\n/*# sourceURL="+r.sources[0]+" */",i+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(r))))+" */"),t.styleSheet)t.styleSheet.cssText=i;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(i))}}var a="undefined"!=typeof document;if("undefined"!=typeof DEBUG&&DEBUG&&!a)throw new Error("vue-style-loader cannot be used in a non-browser environment. Use { target: 'node' } in your Webpack config to indicate a server-rendering environment.");var u=i(9),d={},h=a&&(document.head||document.getElementsByTagName("head")[0]),c=null,p=0,f=!1,v=function(){},m="undefined"!=typeof navigator&&/msie [6-9]\b/.test(navigator.userAgent.toLowerCase());t.exports=function(t,e,i){f=i;var r=u(t,e);return s(r),function(e){for(var i=[],o=0;o<r.length;o++){var n=r[o],l=d[n.id];l.refs--,i.push(l)}e?(r=u(t,e),s(r)):r=[];for(var o=0;o<i.length;o++){var l=i[o];if(0===l.refs){for(var a=0;a<l.parts.length;a++)l.parts[a]();delete d[l.id]}}}};var g=function(){var t=[];return function(e,i){return t[e]=i,t.filter(Boolean).join("\n")}}()},function(t,e){t.exports=function(t,e){for(var i=[],s={},r=0;r<e.length;r++){var o=e[r],n=o[0],l=o[1],a=o[2],u=o[3],d={id:t+":"+r,css:l,media:a,sourceMap:u};s[n]?s[n].parts.push(d):i.push(s[n]={id:n,parts:[d]})}return i}}])});
+=======
 !function(t,e){ true?module.exports=e():"function"==typeof define&&define.amd?define("vue-slider-component",[],e):"object"==typeof exports?exports["vue-slider-component"]=e():t["vue-slider-component"]=e()}(this,function(){return function(t){function e(s){if(i[s])return i[s].exports;var r=i[s]={i:s,l:!1,exports:{}};return t[s].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var i={};return e.m=t,e.c=i,e.i=function(t){return t},e.d=function(t,i,s){e.o(t,i)||Object.defineProperty(t,i,{configurable:!1,enumerable:!0,get:s})},e.n=function(t){var i=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(i,"a",i),i},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=2)}([function(t,e,i){i(7);var s=i(5)(i(1),i(6),null,null);t.exports=s.exports},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=function(){var t="undefined"!=typeof window?window.devicePixelRatio||1:1;return function(e){return Math.round(e*t)/t}}();e.default={name:"VueSliderComponent",props:{width:{type:[Number,String],default:"auto"},height:{type:[Number,String],default:6},data:{type:Array,default:null},dotSize:{type:Number,default:16},dotWidth:{type:Number,required:!1},dotHeight:{type:Number,required:!1},min:{type:Number,default:0},max:{type:Number,default:100},interval:{type:Number,default:1},show:{type:Boolean,default:!0},disabled:{type:[Boolean,Array],default:!1},piecewise:{type:Boolean,default:!1},tooltip:{type:[String,Boolean],default:"always"},eventType:{type:String,default:"auto"},direction:{type:String,default:"horizontal"},reverse:{type:Boolean,default:!1},lazy:{type:Boolean,default:!1},clickable:{type:Boolean,default:!0},speed:{type:Number,default:.5},realTime:{type:Boolean,default:!1},stopPropagation:{type:Boolean,default:!1},value:{type:[String,Number,Array,Object],default:0},piecewiseLabel:{type:Boolean,default:!1},debug:{type:Boolean,default:!0},fixed:{type:Boolean,default:!1},processDragable:{type:Boolean,default:!1},useKeyboard:{type:Boolean,default:!1},actionsKeyboard:{type:Array,default:function(){return[function(t){return t-1},function(t){return t+1}]}},tooltipMerge:{type:Boolean,default:!0},sliderStyle:[Array,Object,Function],focusStyle:[Array,Object,Function],tooltipDir:[Array,String],formatter:[String,Function],mergeFormatter:[String,Function],piecewiseStyle:Object,disabledStyle:Object,piecewiseActiveStyle:Object,processStyle:Object,bgStyle:Object,tooltipStyle:[Array,Object,Function],disabledDotStyle:[Array,Object,Function],labelStyle:Object,labelActiveStyle:Object},data:function(){return{flag:!1,keydownFlag:null,focusFlag:!1,processFlag:!1,processSign:null,size:0,fixedValue:0,focusSlider:0,currentValue:0,currentSlider:0,isComponentExists:!0,isMounted:!1}},computed:{dotWidthVal:function(){return"number"==typeof this.dotWidth?this.dotWidth:this.dotSize},dotHeightVal:function(){return"number"==typeof this.dotHeight?this.dotHeight:this.dotSize},flowDirection:function(){return"vue-slider-"+this.direction+(this.reverse?"-reverse":"")},tooltipMergedPosition:function(){if(!this.isMounted)return{};var t=this.tooltipDirection[0];if(this.$refs.dot0){if("vertical"===this.direction){var e={};return e[t]="-"+(this.dotHeightVal/2-this.width/2+9)+"px",e}var i={};return i[t]="-"+(this.dotWidthVal/2-this.height/2+9)+"px",i.left="50%",i}},tooltipDirection:function(){var t=this.tooltipDir||("vertical"===this.direction?"left":"top");return Array.isArray(t)?this.isRange?t:t[1]:this.isRange?[t,t]:t},tooltipStatus:function(){return"hover"===this.tooltip&&this.flag?"vue-slider-always":this.tooltip?"vue-slider-"+this.tooltip:""},tooltipClass:function(){return["vue-slider-tooltip-"+this.tooltipDirection,"vue-slider-tooltip"]},disabledArray:function(){return Array.isArray(this.disabled)?this.disabled:[this.disabled,this.disabled]},boolDisabled:function(){return this.disabledArray.every(function(t){return!0===t})},isDisabled:function(){return"none"===this.eventType||this.boolDisabled},disabledClass:function(){return this.boolDisabled?"vue-slider-disabled":""},stateClass:function(){return{"vue-slider-state-process-drag":this.processFlag,"vue-slider-state-drag":this.flag&&!this.processFlag&&!this.keydownFlag,"vue-slider-state-focus":this.focusFlag}},isRange:function(){return Array.isArray(this.value)},slider:function(){return this.isRange?[this.$refs.dot0,this.$refs.dot1]:this.$refs.dot},minimum:function(){return this.data?0:this.min},val:{get:function(){return this.data?this.isRange?[this.data[this.currentValue[0]],this.data[this.currentValue[1]]]:this.data[this.currentValue]:this.currentValue},set:function(t){if(this.data)if(this.isRange){var e=this.data.indexOf(t[0]),i=this.data.indexOf(t[1]);e>-1&&i>-1&&(this.currentValue=[e,i])}else{var s=this.data.indexOf(t);s>-1&&(this.currentValue=s)}else this.currentValue=t}},currentIndex:function(){return this.isRange?this.data?this.currentValue:[this.getIndexByValue(this.currentValue[0]),this.getIndexByValue(this.currentValue[1])]:this.getIndexByValue(this.currentValue)},indexRange:function(){return this.isRange?this.currentIndex:[0,this.currentIndex]},maximum:function(){return this.data?this.data.length-1:this.max},multiple:function(){var t=(""+this.interval).split(".")[1];return t?Math.pow(10,t.length):1},spacing:function(){return this.data?1:this.interval},total:function(){return this.data?this.data.length-1:(Math.floor((this.maximum-this.minimum)*this.multiple)%(this.interval*this.multiple)!=0&&this.printError("Prop[interval] is illegal, Please make sure that the interval can be divisible"),(this.maximum-this.minimum)/this.interval)},gap:function(){return this.size/this.total},position:function(){return this.isRange?[(this.currentValue[0]-this.minimum)/this.spacing*this.gap,(this.currentValue[1]-this.minimum)/this.spacing*this.gap]:(this.currentValue-this.minimum)/this.spacing*this.gap},limit:function(){return this.isRange?this.fixed?[[0,(this.total-this.fixedValue)*this.gap],[this.fixedValue*this.gap,this.size]]:[[0,this.position[1]],[this.position[0],this.size]]:[0,this.size]},valueLimit:function(){return this.isRange?this.fixed?[[this.minimum,this.maximum-this.fixedValue*(this.spacing*this.multiple)/this.multiple],[this.minimum+this.fixedValue*(this.spacing*this.multiple)/this.multiple,this.maximum]]:[[this.minimum,this.currentValue[1]],[this.currentValue[0],this.maximum]]:[this.minimum,this.maximum]},idleSlider:function(){return 0===this.currentSlider?1:0},wrapStyles:function(){return"vertical"===this.direction?{height:"number"==typeof this.height?this.height+"px":this.height,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}:{width:"number"==typeof this.width?this.width+"px":this.width,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}},sliderStyles:function(){return Array.isArray(this.sliderStyle)?this.isRange?this.sliderStyle:this.sliderStyle[1]:"function"==typeof this.sliderStyle?this.sliderStyle(this.val,this.currentIndex):this.isRange?[this.sliderStyle,this.sliderStyle]:this.sliderStyle},focusStyles:function(){return Array.isArray(this.focusStyle)?this.isRange?this.focusStyle:this.focusStyle[1]:"function"==typeof this.focusStyle?this.focusStyle(this.val,this.currentIndex):this.isRange?[this.focusStyle,this.focusStyle]:this.focusStyle},disabledDotStyles:function(){var t=this.disabledDotStyle;if(Array.isArray(t))return t;if("function"==typeof t){var e=t(this.val,this.currentIndex);return Array.isArray(e)?e:[e,e]}return t?[t,t]:[{backgroundColor:"#ccc"},{backgroundColor:"#ccc"}]},tooltipStyles:function(){return Array.isArray(this.tooltipStyle)?this.isRange?this.tooltipStyle:this.tooltipStyle[1]:"function"==typeof this.tooltipStyle?this.tooltipStyle(this.val,this.currentIndex):this.isRange?[this.tooltipStyle,this.tooltipStyle]:this.tooltipStyle},elemStyles:function(){return"vertical"===this.direction?{width:this.width+"px",height:"100%"}:{height:this.height+"px"}},dotStyles:function(){return"vertical"===this.direction?{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",left:-(this.dotWidthVal-this.width)/2+"px"}:{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",top:-(this.dotHeightVal-this.height)/2+"px"}},piecewiseDotStyle:function(){return"vertical"===this.direction?{width:this.width+"px",height:this.width+"px"}:{width:this.height+"px",height:this.height+"px"}},piecewiseDotWrap:function(){if(!this.piecewise&&!this.piecewiseLabel)return!1;for(var t=[],e=0;e<=this.total;e++){var i="vertical"===this.direction?{bottom:this.gap*e-this.width/2+"px",left:0}:{left:this.gap*e-this.height/2+"px",top:0},s=this.reverse?this.total-e:e,r=this.data?this.data[s]:this.spacing*s+this.min;t.push({style:i,label:this.formatter?this.formatting(r):r,inRange:s>=this.indexRange[0]&&s<=this.indexRange[1]})}return t}},watch:{value:function(t){this.flag||this.setValue(t,!0)},max:function(t){if(t<this.min)return this.printError("The maximum value can not be less than the minimum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},min:function(t){if(t>this.max)return this.printError("The minimum value can not be greater than the maximum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},show:function(t){var e=this;t&&!this.size&&this.$nextTick(function(){e.refresh()})},fixed:function(){this.computedFixedValue()}},methods:{bindEvents:function(){document.addEventListener("touchmove",this.moving,{passive:!1}),document.addEventListener("touchend",this.moveEnd,{passive:!1}),document.addEventListener("mousedown",this.blurSlider),document.addEventListener("mousemove",this.moving),document.addEventListener("mouseup",this.moveEnd),document.addEventListener("mouseleave",this.moveEnd),document.addEventListener("keydown",this.handleKeydown),document.addEventListener("keyup",this.handleKeyup),window.addEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.addEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.addEventListener("transitionend",this.handleOverlapTooltip))},unbindEvents:function(){document.removeEventListener("touchmove",this.moving),document.removeEventListener("touchend",this.moveEnd),document.removeEventListener("mousedown",this.blurSlider),document.removeEventListener("mousemove",this.moving),document.removeEventListener("mouseup",this.moveEnd),document.removeEventListener("mouseleave",this.moveEnd),document.removeEventListener("keydown",this.handleKeydown),document.removeEventListener("keyup",this.handleKeyup),window.removeEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.removeEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.removeEventListener("transitionend",this.handleOverlapTooltip))},handleKeydown:function(t){if(!this.useKeyboard||!this.focusFlag)return!1;switch(t.keyCode){case 37:case 40:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[0]);break;case 38:case 39:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[1])}},handleKeyup:function(){this.keydownFlag&&(this.keydownFlag=!1,this.flag=!1)},changeFocusSlider:function(t){var e=this;if(this.isRange){var i=this.currentIndex.map(function(i,s){if(s===e.focusSlider||e.fixed){var r=t(i),o=e.fixed?e.valueLimit[s]:[0,e.total];if(r<=o[1]&&r>=o[0])return r}return i});i[0]>i[1]&&(this.focusSlider=0===this.focusSlider?1:0,i=i.reverse()),this.setIndex(i)}else this.setIndex(t(this.currentIndex))},blurSlider:function(t){var e=this.isRange?this.$refs["dot"+this.focusSlider]:this.$refs.dot;if(!e||e===t.target)return!1;this.focusFlag=!1},formatting:function(t){return"string"==typeof this.formatter?this.formatter.replace(/\{value\}/,t):this.formatter(t)},mergeFormatting:function(t,e){return"string"==typeof this.mergeFormatter?this.mergeFormatter.replace(/\{(value1|value2)\}/g,function(i,s){return"value1"===s?t:e}):this.mergeFormatter(t,e)},getPos:function(t){return this.realTime&&this.getStaticData(),"vertical"===this.direction?this.reverse?t.pageY-this.offset:this.size-(t.pageY-this.offset):this.reverse?this.size-(t.clientX-this.offset):t.clientX-this.offset},processClick:function(t){this.fixed&&t.stopPropagation()},wrapClick:function(t){var e=this;if(this.isDisabled||!this.clickable||this.processFlag)return!1;var i=this.getPos(t);if(this.isRange)if(this.disabledArray.every(function(t){return!1===t}))this.currentSlider=i>(this.position[1]-this.position[0])/2+this.position[0]?1:0;else if(this.disabledArray[0]){if(i<this.position[0])return!1;this.currentSlider=1}else if(this.disabledArray[1]){if(i>this.position[1])return!1;this.currentSlider=0}if(this.disabledArray[this.currentSlider])return!1;if(this.setValueOnPos(i),this.isRange&&this.tooltipMerge){var s=setInterval(function(){return e.handleOverlapTooltip()},16.7);setTimeout(function(){return window.clearInterval(s)},1e3*this.speed)}},moveStart:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,i=arguments[2];if(this.disabledArray[e])return!1;if(this.stopPropagation&&t.stopPropagation(),this.isRange&&(this.currentSlider=e,i)){if(!this.processDragable)return!1;this.processFlag=!0,this.processSign={pos:this.position,start:this.getPos(t.targetTouches&&t.targetTouches[0]?t.targetTouches[0]:t)}}!i&&this.useKeyboard&&(this.focusFlag=!0,this.focusSlider=e),this.flag=!0,this.$emit("drag-start",this)},moving:function(t){if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;t.preventDefault(),t.targetTouches&&t.targetTouches[0]&&(t=t.targetTouches[0]),this.processFlag?(this.currentSlider=0,this.setValueOnPos(this.processSign.pos[0]+this.getPos(t)-this.processSign.start,!0),this.currentSlider=1,this.setValueOnPos(this.processSign.pos[1]+this.getPos(t)-this.processSign.start,!0)):this.setValueOnPos(this.getPos(t),!0),this.isRange&&this.tooltipMerge&&this.handleOverlapTooltip()},moveEnd:function(t){var e=this;if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;this.$emit("drag-end",this),this.lazy&&this.isDiff(this.val,this.value)&&this.syncValue(),this.flag=!1,window.setTimeout(function(){e.processFlag=!1},0),this.setPosition()},setValueOnPos:function(t,e){var i=this.isRange?this.limit[this.currentSlider]:this.limit,s=this.isRange?this.valueLimit[this.currentSlider]:this.valueLimit;if(t>=i[0]&&t<=i[1]){this.setTransform(t);var r=this.getValueByIndex(Math.round(t/this.gap));this.setCurrentValue(r,e),this.isRange&&this.fixed&&(this.setTransform(t+this.fixedValue*this.gap*(0===this.currentSlider?1:-1),!0),this.setCurrentValue((r*this.multiple+this.fixedValue*this.spacing*this.multiple*(0===this.currentSlider?1:-1))/this.multiple,e,!0))}else t<i[0]?(this.setTransform(i[0]),this.setCurrentValue(s[0]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][0],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][0],e,!0)):this.fixed||this.disabledArray[0]||1!==this.currentSlider||(this.focusSlider=0,this.currentSlider=0)):(this.setTransform(i[1]),this.setCurrentValue(s[1]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][1],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][1],e,!0)):this.fixed||this.disabledArray[1]||0!==this.currentSlider||(this.focusSlider=1,this.currentSlider=1))},isDiff:function(t,e){return Object.prototype.toString.call(t)!==Object.prototype.toString.call(e)||(Array.isArray(t)&&t.length===e.length?t.some(function(t,i){return t!==e[i]}):t!==e)},setCurrentValue:function(t,e,i){var s=i?this.idleSlider:this.currentSlider;if(t<this.minimum||t>this.maximum)return!1;this.isRange?this.isDiff(this.currentValue[s],t)&&(this.currentValue.splice(s,1,t),this.lazy&&this.flag||this.syncValue()):this.isDiff(this.currentValue,t)&&(this.currentValue=t,this.lazy&&this.flag||this.syncValue()),e||this.setPosition()},getValueByIndex:function(t){return(this.spacing*this.multiple*t+this.minimum*this.multiple)/this.multiple},getIndexByValue:function(t){return Math.round((t-this.minimum)*this.multiple)/(this.spacing*this.multiple)},setIndex:function(t){if(Array.isArray(t)&&this.isRange){var e=void 0;e=this.data?[this.data[t[0]],this.data[t[1]]]:[this.getValueByIndex(t[0]),this.getValueByIndex(t[1])],this.setValue(e)}else t=this.getValueByIndex(t),this.isRange&&(this.currentSlider=t>(this.currentValue[1]-this.currentValue[0])/2+this.currentValue[0]?1:0),this.setCurrentValue(t)},setValue:function(t,e,i){var s=this;if(this.isDiff(this.val,t)){var r=this.limitValue(t);this.val=this.isRange?r.concat():r,this.computedFixedValue(),this.syncValue(e)}this.$nextTick(function(){return s.setPosition(i)})},computedFixedValue:function(){if(!this.fixed)return this.fixedValue=0,!1;this.fixedValue=this.currentIndex[1]-this.currentIndex[0]},setPosition:function(t){this.flag||this.setTransitionTime(void 0===t?this.speed:t),this.isRange?(this.setTransform(this.position[0],1===this.currentSlider),this.setTransform(this.position[1],0===this.currentSlider)):this.setTransform(this.position),this.flag||this.setTransitionTime(0)},setTransform:function(t,e){var i=e?this.idleSlider:this.currentSlider,r=s(("vertical"===this.direction?this.dotHeightVal/2-t:t-this.dotWidthVal/2)*(this.reverse?-1:1)),o="vertical"===this.direction?"translateY("+r+"px)":"translateX("+r+"px)",n=this.fixed?this.fixedValue*this.gap+"px":(0===i?this.position[1]-t:t-this.position[0])+"px",l=this.fixed?(0===i?t:t-this.fixedValue*this.gap)+"px":(0===i?t:this.position[0])+"px";this.isRange?(this.slider[i].style.transform=o,this.slider[i].style.WebkitTransform=o,this.slider[i].style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=n,this.$refs.process.style[this.reverse?"top":"bottom"]=l):(this.$refs.process.style.width=n,this.$refs.process.style[this.reverse?"right":"left"]=l)):(this.slider.style.transform=o,this.slider.style.WebkitTransform=o,this.slider.style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=t+"px",this.$refs.process.style[this.reverse?"top":"bottom"]=0):(this.$refs.process.style.width=t+"px",this.$refs.process.style[this.reverse?"right":"left"]=0))},setTransitionTime:function(t){if(t||this.$refs.process.offsetWidth,this.isRange){for(var e=0;e<this.slider.length;e++)this.slider[e].style.transitionDuration=t+"s",this.slider[e].style.WebkitTransitionDuration=t+"s";this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"}else this.slider.style.transitionDuration=t+"s",this.slider.style.WebkitTransitionDuration=t+"s",this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"},limitValue:function(t){var e=this;if(this.data)return t;var i=function(i){return i<e.min?(e.printError("The value of the slider is "+t+", the minimum value is "+e.min+", the value of this slider can not be less than the minimum value"),e.min):i>e.max?(e.printError("The value of the slider is "+t+", the maximum value is "+e.max+", the value of this slider can not be greater than the maximum value"),e.max):i};return this.isRange?t.map(function(t){return i(t)}):i(t)},syncValue:function(t){var e=this.isRange?this.val.concat():this.val;this.$emit("input",e),t||this.$emit("callback",e)},getValue:function(){return this.val},getIndex:function(){return this.currentIndex},getStaticData:function(){this.$refs.elem&&(this.size="vertical"===this.direction?this.$refs.elem.offsetHeight:this.$refs.elem.offsetWidth,this.offset="vertical"===this.direction?this.$refs.elem.getBoundingClientRect().top+window.pageYOffset||document.documentElement.scrollTop:this.$refs.elem.getBoundingClientRect().left)},refresh:function(){this.$refs.elem&&(this.getStaticData(),this.computedFixedValue(),this.setPosition())},printError:function(t){this.debug&&console.error("[VueSlider error]: "+t)},handleOverlapTooltip:function(){var t=this.tooltipDirection[0]===this.tooltipDirection[1];if(this.isRange&&t){var e=this.reverse?this.$refs.tooltip1:this.$refs.tooltip0,i=this.reverse?this.$refs.tooltip0:this.$refs.tooltip1,s=e.getBoundingClientRect().right,r=i.getBoundingClientRect().left,o=e.getBoundingClientRect().y,n=i.getBoundingClientRect().y+i.getBoundingClientRect().height,l="horizontal"===this.direction&&s>r,a="vertical"===this.direction&&n>o;l||a?this.handleDisplayMergedTooltip(!0):this.handleDisplayMergedTooltip(!1)}},handleDisplayMergedTooltip:function(t){var e=this.$refs.tooltip0,i=this.$refs.tooltip1,s=this.$refs.process.getElementsByClassName("vue-merged-tooltip")[0];t?(e.style.visibility="hidden",i.style.visibility="hidden",s.style.visibility="visible"):(e.style.visibility="visible",i.style.visibility="visible",s.style.visibility="hidden")}},mounted:function(){var t=this;if(this.isComponentExists=!0,"undefined"==typeof window||"undefined"==typeof document)return this.printError("window or document is undefined, can not be initialization.");this.$nextTick(function(){t.isComponentExists&&(t.getStaticData(),t.setValue(t.limitValue(t.value),!0,0),t.bindEvents())}),this.isMounted=!0},beforeDestroy:function(){this.isComponentExists=!1,this.unbindEvents()}}},function(t,e,i){"use strict";var s=i(0);t.exports=s},function(t,e,i){e=t.exports=i(4)(),e.push([t.i,'.vue-slider-component{position:relative;box-sizing:border-box;-ms-user-select:none;user-select:none;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none}.vue-slider-component.vue-slider-disabled{opacity:.5;cursor:not-allowed}.vue-slider-component.vue-slider-has-label{margin-bottom:15px}.vue-slider-component.vue-slider-disabled .vue-slider-dot{cursor:not-allowed}.vue-slider-component .vue-slider{position:relative;display:block;border-radius:15px;background-color:#ccc}.vue-slider-component .vue-slider:after{content:"";position:absolute;left:0;top:0;width:100%;height:100%;z-index:2}.vue-slider-component .vue-slider-process{position:absolute;border-radius:15px;background-color:#3498db;transition:all 0s;z-index:1}.vue-slider-component .vue-slider-process.vue-slider-process-dragable{cursor:pointer;z-index:3}.vue-slider-component.vue-slider-horizontal .vue-slider-process{width:0;height:100%;top:0;left:0;will-change:width}.vue-slider-component.vue-slider-vertical .vue-slider-process{width:100%;height:0;bottom:0;left:0;will-change:height}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-process{width:0;height:100%;top:0;right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-process{width:100%;height:0;top:0;left:0}.vue-slider-component .vue-slider-dot{position:absolute;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32);transition:all 0s;will-change:transform;cursor:pointer;z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-focus{box-shadow:0 0 2px 1px #3498db}.vue-slider-component .vue-slider-dot.vue-slider-dot-dragging{z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-disabled{z-index:4}.vue-slider-component.vue-slider-horizontal .vue-slider-dot{left:0}.vue-slider-component.vue-slider-vertical .vue-slider-dot{bottom:0}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-dot{right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-dot{top:0}.vue-slider-component .vue-slider-tooltip-wrap{display:none;position:absolute;z-index:9}.vue-slider-component .vue-slider-tooltip{display:block;font-size:14px;white-space:nowrap;padding:2px 5px;min-width:20px;text-align:center;color:#fff;border-radius:5px;border:1px solid #3498db;background-color:#3498db}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top{top:-9px;left:50%;-webkit-transform:translate(-50%,-100%);transform:translate(-50%,-100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom{bottom:-9px;left:50%;-webkit-transform:translate(-50%,100%);transform:translate(-50%,100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left{top:50%;left:-9px;-webkit-transform:translate(-100%,-50%);transform:translate(-100%,-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right{top:50%;right:-9px;-webkit-transform:translate(100%,-50%);transform:translate(100%,-50%)}.vue-slider-component .vue-slider-tooltip-top .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top .vue-slider-tooltip:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-top-color:inherit;-webkit-transform:translate(-50%);transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-merged-tooltip{display:block;visibility:hidden}.vue-slider-component .vue-slider-tooltip-bottom .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom .vue-slider-tooltip:before{content:"";position:absolute;top:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-bottom-color:inherit;-webkit-transform:translate(-50%);transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-left .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left .vue-slider-tooltip:before{content:"";position:absolute;top:50%;right:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-left-color:inherit;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.vue-slider-component .vue-slider-tooltip-right .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right .vue-slider-tooltip:before{content:"";position:absolute;top:50%;left:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-right-color:inherit;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.vue-slider-component .vue-slider-dot.vue-slider-hover:hover .vue-slider-tooltip-wrap{display:block}.vue-slider-component .vue-slider-dot.vue-slider-always .vue-slider-tooltip-wrap{display:block!important}.vue-slider-component .vue-slider-piecewise{position:absolute;width:100%;padding:0;margin:0;left:0;top:0;height:100%;list-style:none}.vue-slider-component .vue-slider-piecewise-item{position:absolute;width:8px;height:8px}.vue-slider-component .vue-slider-piecewise-dot{position:absolute;left:50%;top:50%;width:100%;height:100%;display:inline-block;background-color:rgba(0,0,0,.16);border-radius:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:2;transition:all .3s}.vue-slider-component .vue-slider-piecewise-item:first-child .vue-slider-piecewise-dot,.vue-slider-component .vue-slider-piecewise-item:last-child .vue-slider-piecewise-dot{visibility:hidden}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-horizontal .vue-slider-piecewise-label{position:absolute;display:inline-block;top:100%;left:50%;white-space:nowrap;font-size:12px;color:#333;-webkit-transform:translate(-50%,8px);transform:translate(-50%,8px);visibility:visible}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-vertical .vue-slider-piecewise-label{position:absolute;display:inline-block;top:50%;left:100%;white-space:nowrap;font-size:12px;color:#333;-webkit-transform:translate(8px,-50%);transform:translate(8px,-50%);visibility:visible}.vue-slider-component .vue-slider-sr-only{clip:rect(1px,1px,1px,1px);height:1px;width:1px;overflow:hidden;position:absolute!important}',""])},function(t,e){t.exports=function(){var t=[];return t.toString=function(){for(var t=[],e=0;e<this.length;e++){var i=this[e];i[2]?t.push("@media "+i[2]+"{"+i[1]+"}"):t.push(i[1])}return t.join("")},t.i=function(e,i){"string"==typeof e&&(e=[[null,e,""]]);for(var s={},r=0;r<this.length;r++){var o=this[r][0];"number"==typeof o&&(s[o]=!0)}for(r=0;r<e.length;r++){var n=e[r];"number"==typeof n[0]&&s[n[0]]||(i&&!n[2]?n[2]=i:i&&(n[2]="("+n[2]+") and ("+i+")"),t.push(n))}},t}},function(t,e){t.exports=function(t,e,i,s){var r,o=t=t||{},n=typeof t.default;"object"!==n&&"function"!==n||(r=t,o=t.default);var l="function"==typeof o?o.options:o;if(e&&(l.render=e.render,l.staticRenderFns=e.staticRenderFns),i&&(l._scopeId=i),s){var a=Object.create(l.computed||null);Object.keys(s).forEach(function(t){var e=s[t];a[t]=function(){return e}}),l.computed=a}return{esModule:r,exports:o,options:l}}},function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"show",rawName:"v-show",value:t.show,expression:"show"}],ref:"wrap",class:["vue-slider-component",t.flowDirection,t.disabledClass,t.stateClass,{"vue-slider-has-label":t.piecewiseLabel}],style:[t.wrapStyles,t.boolDisabled?t.disabledStyle:null],on:{click:t.wrapClick}},[i("div",{ref:"elem",staticClass:"vue-slider",style:[t.elemStyles,t.bgStyle],attrs:{"aria-hidden":"true"}},[t.isRange?[i("div",{key:"dot0",ref:"dot0",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[0]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[0]?t.disabledDotStyles[0]:null,t.sliderStyles[0],t.focusFlag&&0===t.focusSlider?t.focusStyles[0]:null],on:{mousedown:function(e){t.moveStart(e,0)},touchstart:function(e){t.moveStart(e,0)}}},[i("div",{ref:"tooltip0",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[0]},[t._v(t._s(t.formatter?t.formatting(t.val[0]):t.val[0]))])],{value:t.val[0],index:0,disabled:!t.boolDisabled&&t.disabledArray[0]})],2)]),t._v(" "),i("div",{key:"dot1",ref:"dot1",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&1===t.focusSlider,"vue-slider-dot-dragging":t.flag&&1===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[1]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[1]?t.disabledDotStyles[1]:null,t.sliderStyles[1],t.focusFlag&&1===t.focusSlider?t.focusStyles[1]:null],on:{mousedown:function(e){t.moveStart(e,1)},touchstart:function(e){t.moveStart(e,1)}}},[i("div",{ref:"tooltip1",class:["vue-slider-tooltip-"+t.tooltipDirection[1],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[1]},[t._v(t._s(t.formatter?t.formatting(t.val[1]):t.val[1]))])],{value:t.val[1],index:1,disabled:!t.boolDisabled&&t.disabledArray[1]})],2)])]:[i("div",{key:"dot",ref:"dot",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider}],style:[t.dotStyles,t.sliderStyles,t.focusFlag&&0===t.focusSlider?t.focusStyles:null],on:{mousedown:t.moveStart,touchstart:t.moveStart}},[i("div",{class:["vue-slider-tooltip-"+t.tooltipDirection,"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v(t._s(t.formatter?t.formatting(t.val):t.val))])],{value:t.val})],2)])],t._v(" "),i("ul",{staticClass:"vue-slider-piecewise"},t._l(t.piecewiseDotWrap,function(e,s){return i("li",{key:s,staticClass:"vue-slider-piecewise-item",style:[t.piecewiseDotStyle,e.style]},[t._t("piecewise",[t.piecewise?i("span",{staticClass:"vue-slider-piecewise-dot",style:[t.piecewiseStyle,e.inRange?t.piecewiseActiveStyle:null]}):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange}),t._v(" "),t._t("label",[t.piecewiseLabel?i("span",{staticClass:"vue-slider-piecewise-label",style:[t.labelStyle,e.inRange?t.labelActiveStyle:null]},[t._v("\n            "+t._s(e.label)+"\n          ")]):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange})],2)})),t._v(" "),i("div",{ref:"process",class:["vue-slider-process",{"vue-slider-process-dragable":t.isRange&&t.processDragable}],style:t.processStyle,on:{click:t.processClick,mousedown:function(e){t.moveStart(e,0,!0)},touchstart:function(e){t.moveStart(e,0,!0)}}},[i("div",{ref:"mergedTooltip",staticClass:"vue-merged-tooltip",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"],style:t.tooltipMergedPosition},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v("\n            "+t._s(t.mergeFormatter?t.mergeFormatting(t.val[0],t.val[1]):t.formatter?t.val[0]===t.val[1]?t.formatting(t.val[0]):t.formatting(t.val[0])+" - "+t.formatting(t.val[1]):t.val[0]===t.val[1]?t.val[0]:t.val[0]+" - "+t.val[1])+"\n          ")])])],2)]),t._v(" "),t.isRange||t.data?t._e():i("input",{directives:[{name:"model",rawName:"v-model",value:t.val,expression:"val"}],staticClass:"vue-slider-sr-only",attrs:{type:"range",min:t.min,max:t.max},domProps:{value:t.val},on:{__r:function(e){t.val=e.target.value}}})],2)])},staticRenderFns:[]}},function(t,e,i){var s=i(3);"string"==typeof s&&(s=[[t.i,s,""]]),s.locals&&(t.exports=s.locals);i(8)("743d98f5",s,!0)},function(t,e,i){function s(t){for(var e=0;e<t.length;e++){var i=t[e],s=d[i.id];if(s){s.refs++;for(var r=0;r<s.parts.length;r++)s.parts[r](i.parts[r]);for(;r<i.parts.length;r++)s.parts.push(o(i.parts[r]));s.parts.length>i.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r<i.parts.length;r++)n.push(o(i.parts[r]));d[i.id]={id:i.id,refs:1,parts:n}}}}function r(){var t=document.createElement("style");return t.type="text/css",h.appendChild(t),t}function o(t){var e,i,s=document.querySelector('style[data-vue-ssr-id~="'+t.id+'"]');if(s){if(f)return v;s.parentNode.removeChild(s)}if(m){var o=p++;s=c||(c=r()),e=n.bind(null,s,o,!1),i=n.bind(null,s,o,!0)}else s=r(),e=l.bind(null,s),i=function(){s.parentNode.removeChild(s)};return e(t),function(s){if(s){if(s.css===t.css&&s.media===t.media&&s.sourceMap===t.sourceMap)return;e(t=s)}else i()}}function n(t,e,i,s){var r=i?"":s.css;if(t.styleSheet)t.styleSheet.cssText=g(e,r);else{var o=document.createTextNode(r),n=t.childNodes;n[e]&&t.removeChild(n[e]),n.length?t.insertBefore(o,n[e]):t.appendChild(o)}}function l(t,e){var i=e.css,s=e.media,r=e.sourceMap;if(s&&t.setAttribute("media",s),r&&(i+="\n/*# sourceURL="+r.sources[0]+" */",i+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(r))))+" */"),t.styleSheet)t.styleSheet.cssText=i;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(i))}}var a="undefined"!=typeof document;if("undefined"!=typeof DEBUG&&DEBUG&&!a)throw new Error("vue-style-loader cannot be used in a non-browser environment. Use { target: 'node' } in your Webpack config to indicate a server-rendering environment.");var u=i(9),d={},h=a&&(document.head||document.getElementsByTagName("head")[0]),c=null,p=0,f=!1,v=function(){},m="undefined"!=typeof navigator&&/msie [6-9]\b/.test(navigator.userAgent.toLowerCase());t.exports=function(t,e,i){f=i;var r=u(t,e);return s(r),function(e){for(var i=[],o=0;o<r.length;o++){var n=r[o],l=d[n.id];l.refs--,i.push(l)}e?(r=u(t,e),s(r)):r=[];for(var o=0;o<i.length;o++){var l=i[o];if(0===l.refs){for(var a=0;a<l.parts.length;a++)l.parts[a]();delete d[l.id]}}}};var g=function(){var t=[];return function(e,i){return t[e]=i,t.filter(Boolean).join("\n")}}()},function(t,e){t.exports=function(t,e){for(var i=[],s={},r=0;r<e.length;r++){var o=e[r],n=o[0],l=o[1],a=o[2],u=o[3],d={id:t+":"+r,css:l,media:a,sourceMap:u};s[n]?s[n].parts.push(d):i.push(s[n]={id:n,parts:[d]})}return i}}])});
+>>>>>>> ea4a793edf6cf901f8b679514bae01f6c589a5a7
 
 /***/ }),
 /* 51 */