diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
index 6e0be521b..89837a79d 100755
--- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php
@@ -36,7 +36,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -45,7 +44,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -54,7 +52,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -63,7 +60,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'string',
             'sortable' => true,
             'searchable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -72,7 +68,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'boolean',
             'sortable' => true,
             'searchable' => false,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->is_required == 1)
                     return 'True';
@@ -87,7 +82,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'boolean',
             'sortable' => true,
             'searchable' => false,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->is_unique == 1)
                     return 'True';
@@ -102,7 +96,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'boolean',
             'sortable' => true,
             'searchable' => false,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->value_per_locale == 1)
                     return 'True';
@@ -117,7 +110,6 @@ class AttributeDataGrid extends DataGrid
             'type' => 'boolean',
             'sortable' => true,
             'searchable' => false,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->value_per_channel == 1)
                     return 'True';
diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php
index a0b8ef476..e661a6009 100755
--- a/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/AttributeFamilyDataGrid.php
@@ -34,7 +34,6 @@ class AttributeFamilyDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class AttributeFamilyDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class AttributeFamilyDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
index c7ca02e66..b488347c6 100755
--- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php
@@ -38,7 +38,6 @@ class CategoryDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -47,7 +46,6 @@ class CategoryDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -56,7 +54,6 @@ class CategoryDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => false,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -65,7 +62,6 @@ class CategoryDataGrid extends DataGrid
             'type' => 'boolean',
             'sortable' => true,
             'searchable' => true,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->status == 1)
                     return 'Active';
@@ -80,7 +76,6 @@ class CategoryDataGrid extends DataGrid
             'type' => 'boolean',
             'sortable' => true,
             'searchable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
index 55afd1c5b..106ed124c 100755
--- a/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ChannelDataGrid.php
@@ -34,7 +34,6 @@ class ChannelDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class ChannelDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class ChannelDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -61,7 +58,6 @@ class ChannelDataGrid extends DataGrid
             'type' => 'string',
             'sortable' => true,
             'searchable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php
index 6d806750d..db694db08 100755
--- a/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CurrencyDataGrid.php
@@ -34,7 +34,6 @@ class CurrencyDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class CurrencyDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class CurrencyDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
index e13c99cd6..b4ea36ff0 100755
--- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php
@@ -39,7 +39,6 @@ class CustomerDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -48,7 +47,6 @@ class CustomerDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -57,7 +55,6 @@ class CustomerDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -66,7 +63,6 @@ class CustomerDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => false,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php
index b3c26187f..c7960414c 100755
--- a/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomerGroupDataGrid.php
@@ -34,7 +34,6 @@ class CustomerGroupDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class CustomerGroupDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
index e5ff12be7..a33fc8e74 100755
--- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
@@ -39,7 +39,6 @@ class CustomerReviewDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -48,7 +47,6 @@ class CustomerReviewDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -57,7 +55,6 @@ class CustomerReviewDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -66,7 +63,6 @@ class CustomerReviewDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
diff --git a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php
index d814b168a..4a1535534 100755
--- a/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/ExchangeRatesDataGrid.php
@@ -36,7 +36,6 @@ class ExchangeRatesDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -45,7 +44,6 @@ class ExchangeRatesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -54,7 +52,6 @@ class ExchangeRatesDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
index 90a7d871b..3d3dc3b7a 100755
--- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php
@@ -34,7 +34,6 @@ class InventorySourcesDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class InventorySourcesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class InventorySourcesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -61,7 +58,6 @@ class InventorySourcesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -70,7 +66,6 @@ class InventorySourcesDataGrid extends DataGrid
             'type' => 'boolean',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->status == 1)
                     return 'Active';
diff --git a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php
index f8bdbec51..76cfe699e 100755
--- a/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/LocalesDataGrid.php
@@ -34,7 +34,6 @@ class LocalesDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class LocalesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class LocalesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
index 6790601c1..4cded8a4a 100755
--- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php
@@ -34,7 +34,6 @@ class NewsLetterDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class NewsLetterDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => false,
             'sortable' => true,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->is_subscribed == 1)
                     return 'True';
@@ -58,7 +56,6 @@ class NewsLetterDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
index 13d1d8499..3c4a8e4ed 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
@@ -36,7 +36,6 @@ class OrderDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -45,7 +44,6 @@ class OrderDataGrid extends DataGrid
             'type' => 'price',
             'searchable' => false,
             'sortable' => true,
-            'width' => '100px',
         ]);
 
         $this->addColumn([
@@ -54,7 +52,6 @@ class OrderDataGrid extends DataGrid
             'type' => 'price',
             'searchable' => false,
             'sortable' => true,
-            'width' => '100px',
         ]);
 
         $this->addColumn([
@@ -63,7 +60,6 @@ class OrderDataGrid extends DataGrid
             'type' => 'datetime',
             'sortable' => true,
             'searchable' => false,
-            'width' => '100px',
         ]);
 
         $this->addColumn([
@@ -72,7 +68,6 @@ class OrderDataGrid extends DataGrid
             'type' => 'string',
             'sortable' => true,
             'searchable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -81,7 +76,6 @@ class OrderDataGrid extends DataGrid
             'type' => 'string',
             'sortable' => true,
             'searchable' => true,
-            'width' => '100px',
             'closure' => true,
             'wrapper' => function ($value) {
                 if ($value->status == 'processing')
@@ -107,7 +101,6 @@ class OrderDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
index 42751f6a8..c12dfd4ea 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
@@ -34,7 +34,6 @@ class OrderInvoicesDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class OrderInvoicesDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class OrderInvoicesDataGrid extends DataGrid
             'type' => 'price',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px',
         ]);
 
         $this->addColumn([
@@ -61,7 +58,6 @@ class OrderInvoicesDataGrid extends DataGrid
             'type' => 'datetime',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px',
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
index 32d53b0a7..5cfd5cad8 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
@@ -46,7 +46,6 @@ class OrderShipmentsDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -55,7 +54,6 @@ class OrderShipmentsDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -64,7 +62,6 @@ class OrderShipmentsDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '100px',
         ]);
 
         $this->addColumn([
@@ -73,7 +70,6 @@ class OrderShipmentsDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px',
         ]);
 
         $this->addColumn([
@@ -82,7 +78,6 @@ class OrderShipmentsDataGrid extends DataGrid
             'type' => 'datetime',
             'sortable' => true,
             'searchable' => false,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -91,7 +86,6 @@ class OrderShipmentsDataGrid extends DataGrid
             'type' => 'datetime',
             'sortable' => true,
             'searchable' => false,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -100,7 +94,6 @@ class OrderShipmentsDataGrid extends DataGrid
             'type' => 'string',
             'sortable' => true,
             'searchable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php
index 4fcafeaf4..47669cf56 100755
--- a/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/RolesDataGrid.php
@@ -43,7 +43,6 @@ class RolesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +51,6 @@ class RolesDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
index c2ef757a2..2c7eb4124 100755
--- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
@@ -38,7 +38,6 @@ class SliderDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -47,7 +46,6 @@ class SliderDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -56,7 +54,6 @@ class SliderDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php
index e646180f3..fedffa723 100755
--- a/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/TaxCategoryDataGrid.php
@@ -34,7 +34,6 @@ class TaxCategoryDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class TaxCategoryDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class TaxCategoryDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php
index b568ac58e..9a576f61f 100755
--- a/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/TaxRateDataGrid.php
@@ -34,7 +34,6 @@ class TaxRateDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -43,7 +42,6 @@ class TaxRateDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -52,7 +50,6 @@ class TaxRateDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -61,7 +58,6 @@ class TaxRateDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -70,7 +66,6 @@ class TaxRateDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
index 76818aed6..f594bfdbb 100755
--- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
@@ -38,7 +38,6 @@ class UserDataGrid extends DataGrid
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
-            'width' => '40px'
         ]);
 
         $this->addColumn([
@@ -47,7 +46,6 @@ class UserDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -56,7 +54,6 @@ class UserDataGrid extends DataGrid
             'type' => 'boolean',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px',
             'wrapper' => function($value) {
                 if ($value->status == 1) {
                     return 'Active';
@@ -72,7 +69,6 @@ class UserDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
 
         $this->addColumn([
@@ -81,7 +77,6 @@ class UserDataGrid extends DataGrid
             'type' => 'string',
             'searchable' => true,
             'sortable' => true,
-            'width' => '100px'
         ]);
     }
 
diff --git a/packages/Webkul/Admin/src/Exports/DataGridExport.php b/packages/Webkul/Admin/src/Exports/DataGridExport.php
index 1694abaa1..e670f2d4d 100755
--- a/packages/Webkul/Admin/src/Exports/DataGridExport.php
+++ b/packages/Webkul/Admin/src/Exports/DataGridExport.php
@@ -41,10 +41,21 @@ class DataGridExport implements FromView, ShouldAutoSize
     public function view(): View
     {
         $pagination = false;
+        $results = [];
+        $columns = [];
+
+        foreach($this->gridData as $key => $data) {
+            if ($key == 'collection') {
+                $results = $data['data'];
+            }
+            if ($key == 'columns') {
+               $columns = $data;
+            }
+        }
 
         return view('admin::export.export', [
-            'results' => $this->gridData->render($pagination)->results,
-            'columns' => $this->gridData->render($pagination)->columns,
+            'results' => $results,
+            'columns' => $columns,
         ]);
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
index 873a94bc9..5e22ccbf3 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
@@ -139,7 +139,7 @@ class ConfigurationController extends Controller
 
         Event::fire('core.configuration.save.after');
 
-        session()->flash('success', 'Shipping Method is created successfully');
+        session()->flash('success', trans('admin::app.configuration.save-message'));
 
         return redirect()->back();
     }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
index 59bd01ec5..bbb2bfaa6 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
@@ -117,7 +117,7 @@ class CustomerController extends Controller
 
         $this->customer->create($data);
 
-        session()->flash('success', trans('admin::app.customers.customers.created'));
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Customer']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -160,7 +160,7 @@ class CustomerController extends Controller
 
         $this->customer->update(request()->all(),$id);
 
-        session()->flash('success', trans('admin::app.customers.customers.updated'));
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -175,7 +175,7 @@ class CustomerController extends Controller
     {
         $this->customer->delete($id);
 
-        session()->flash('success', trans('admin::app.customers.customers.deleted'));
+        session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer']));
 
         return redirect()->back();
     }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
index 9c4b1224e..91f1f332c 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php
@@ -81,7 +81,7 @@ class CustomerGroupController extends Controller
 
         $this->customerGroup->create($data);
 
-        session()->flash('success', trans('admin::app.customers.customers.group-created'));
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Customer Group']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -114,7 +114,7 @@ class CustomerGroupController extends Controller
 
         $this->customerGroup->update(request()->all(),$id);
 
-        session()->flash('success', trans('admin::app.customers.customers.group-updated'));
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -132,7 +132,7 @@ class CustomerGroupController extends Controller
         if ($group->is_user_defined == 0) {
             session()->flash('warning', trans('admin::app.customers.customers.group-default'));
         } else {
-            session()->flash('success', trans('admin::app.customers.customers.group-deleted'));
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Customer Group']));
 
             $this->customerGroup->delete($id);
         }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php
index 6aae3d418..e7f37115d 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/ExportController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/ExportController.php
@@ -32,9 +32,13 @@ class ExportController extends Controller
     */
     public function export()
     {
-        $results = unserialize(request()->all()['gridData']);
+        $results = request()->all()['gridData'];
 
-        $file_name = class_basename($results);
+        $data = json_decode($results, true);
+
+        $results = (object) $data;
+
+        $file_name = request()->all()['file_name'];
 
         if (request()->all()['format'] == 'csv') {
             return Excel::download(new DataGridExport($results), $file_name.'.csv');
diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js
index cf717dd97..9950d2cee 100755
--- a/packages/Webkul/Admin/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Admin/src/Resources/assets/js/app.js
@@ -5,6 +5,8 @@ require("./bootstrap");
 
 Vue.use(VeeValidate);
 
+window.eventBus = new Vue();
+
 $(document).ready(function () {
     Vue.config.ignoredElements = [
         'option-wrapper',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 140cae30a..49c5c6f4c 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -214,7 +214,7 @@ return [
             'confirm-delete-title' => 'Confirm password before delete',
             'delete-last' => 'At least one admin is required.',
             'delete-success' => 'Success! User deleted',
-            'incorrect-password' => 'The password you entered is incorrect'
+            'incorrect-password' => 'The password you entered is incorrect',
         ],
 
         'sessions' => [
@@ -445,6 +445,7 @@ return [
     'configuration' => [
         'title' => 'Configuration',
         'save-btn-title' => 'Save',
+        'save-message' => 'Configuration saved successfully',
 
         'tax-categories' => [
             'title' => 'Tax Categories',
@@ -685,12 +686,6 @@ return [
             'male' => 'Male',
             'female' => 'Female',
             'phone' => 'Phone',
-            'created' => 'Customer created successfully.',
-            'updated' => 'Customer updated successfully.',
-            'deleted' => 'Customer deleted successfully.',
-            'group-created' => 'Customer Group created successfully.',
-            'group-updated' => 'Customer Group updated successfully.',
-            'group-deleted' => 'Customer Group deleted successfully.',
             'group-default' => 'Cannot delete the default group.',
         ],
         'reviews' => [
@@ -751,5 +746,15 @@ return [
        'download' => 'Download',
        'csv' => 'CSV',
        'xls' => 'XLS'
-    ]
+    ],
+
+    'response' => [
+        'create-success' => ':name created successfully.',
+        'update-success' => ':name updated successfully.',
+        'delete-success' => ':name deleted successfully.',
+        'last-delete-error' => 'At least one :name is required.',
+        'user-define-error' => 'Can not delete system :name',
+        'attribute-error' => ':name is used in configurable products.',
+        'attribute-product-error' => ':name is used in products.'
+    ],
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
index ba384ad15..9618d4ca6 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/families/edit.blade.php
@@ -21,20 +21,20 @@
             </div>
 
             <div class="page-content">
-                
+
                 <div class="form-container">
                     @csrf()
                     <input name="_method" type="hidden" value="PUT">
 
                     <accordian :title="'{{ __('admin::app.catalog.families.general') }}'" :active="true">
                         <div slot="body">
-                        
+
                             <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
                                 <input type="text" v-validate="'required'" name="code" class="control" id="code" value="{{ $attributeFamily->code }}" disabled="disabled" data-vv-as="&quot;{{ __('admin::app.catalog.families.code') }}&quot;" v-code/>
                                 <input type="hidden" name="code" value="{{ $attributeFamily->code }}"/>
                                 <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                             </div>
-                        
+
                             <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                                 <label for="name" class="required">{{ __('admin::app.catalog.families.name') }}</label>
                                 <input type="text" v-validate="'required'" class="control" id="name" name="name" value="{{ old('name') ?: $attributeFamily->name }}" data-vv-as="&quot;{{ __('admin::app.catalog.families.name') }}&quot;"/>
@@ -173,7 +173,7 @@
             </div>
         </accordian>
     </script>
-    
+
     <script>
         var groups = @json($attributeFamily->attribute_groups);
         var custom_attributes = @json($custom_attributes);
@@ -215,7 +215,7 @@
                                 groups.push(this.group);
 
                                 groups = this.sortGroups();
-                                
+
                                 this.group = {'groupName': '', 'position': '', 'custom_attributes': []};
 
                                 this.$parent.closeModal();
@@ -272,7 +272,7 @@
                 addAttributes (groupIndex, attributeIds) {
                     attributeIds.forEach(function(attributeId) {
                         var attribute = this.custom_attributes.filter(attribute => attribute.id == attributeId)
-                        
+
                         this.groups[groupIndex].custom_attributes.push(attribute[0]);
 
                         let index = this.custom_attributes.indexOf(attribute[0])
@@ -323,7 +323,7 @@
 
                     $(e.target).prev().find('li input').each(function() {
                         var attributeId = $(this).val();
-                        
+
                         if ($(this).is(':checked')) {
                             attributeIds.push(attributeId);
 
@@ -342,4 +342,4 @@
             }
         });
     </script>
-@endpush 
\ No newline at end of file
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index e692f34fe..7c88319c4 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -21,7 +21,6 @@
         $class = app(current($temp));
         $method = end($temp);
         $value = $class->$method();
-        $selectedOption = core()->getConfigData($name) ?? '';
     }
 
     $channel_locale = [];
@@ -60,11 +59,17 @@
 
             <select v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" data-vv-as="&quot;{{ $field['name'] }}&quot;" >
 
+                <?php
+                    $selectedOption = core()->getConfigData($name) ?? '';
+                ?>
+
                 @if (isset($field['repository']))
-                    @foreach ($value as $option)
-                        <option value="{{  $option['name'] }}" {{ $option['name'] == $selectedOption ? 'selected' : ''}}
-                        {{ trans($option['name']) }}
+                    @foreach ($value as $key => $option)
+
+                        <option value="{{  $value[$key] }}" {{ $value[$key] == $selectedOption ? 'selected' : ''}}>
+                           {{ trans($value[$key]) }}
                         </option>
+
                     @endforeach
                 @else
                     @foreach ($field['options'] as $option)
@@ -74,8 +79,6 @@
                             } else {
                                 $value = $option['value'];
                             }
-
-                            $selectedOption = core()->getConfigData($name) ?? '';
                         ?>
 
                         <option value="{{ $value }}" {{ $value == $selectedOption ? 'selected' : ''}}>
@@ -90,23 +93,33 @@
 
             <select v-validate="'{{ $validations }}'" class="control" id="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]" name="{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}][]" data-vv-as="&quot;{{ $field['name'] }}&quot;"  multiple>
 
-                @foreach ($field['options'] as $option)
+                <?php
+                    $selectedOption = core()->getConfigData($name) ?? '';
+                ?>
 
-                    <?php
-                        if ($option['value'] == false) {
-                            $value = 0;
-                        } else {
-                            $value = $option['value'];
-                        }
+                @if (isset($field['repository']))
+                    @foreach ($value as $key => $option)
 
-                        $selectedOption = core()->getConfigData($name) ?? '';
-                    ?>
+                        <option value="{{  $value[$key] }}" {{ in_array($value[$key], explode(',', $selectedOption)) ? 'selected' : ''}}>
+                            {{ trans($value[$key]) }}
+                        </option>
 
-                    <option value="{{ $value }}" {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}>
-                        {{ $option['title'] }}
-                    </option>
+                    @endforeach
+                @else
+                    @foreach ($field['options'] as $option)
+                        <?php
+                            if ($option['value'] == false) {
+                                $value = 0;
+                            } else {
+                                $value = $option['value'];
+                            }
+                        ?>
 
-                @endforeach
+                        <option value="{{ $value }}" {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}>
+                            {{ $option['title'] }}
+                        </option>
+                    @endforeach
+                @endif
 
             </select>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php
index a5e49369e..8253b414e 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/index.blade.php
@@ -12,12 +12,12 @@
                 <h1>{{ __('admin::app.customers.customers.title') }}</h1>
             </div>
             <div class="page-action">
-                {{-- <div class="export" @click="showModal('downloadDataGrid')">
+                <div class="export" @click="showModal('downloadDataGrid')">
                     <i class="export-icon"></i>
                     <span >
                         {{ __('admin::app.export.export') }}
                     </span>
-                </div> --}}
+                </div>
 
                 <a href="{{ route('admin.customer.create') }}" class="btn btn-lg btn-primary">
                     {{ __('admin::app.customers.customers.add-title') }}
@@ -25,32 +25,36 @@
             </div>
         </div>
 
-
         <div class="page-content">
             @inject('customer','Webkul\Admin\DataGrids\CustomerDataGrid')
             {!! $customer->render() !!}
         </div>
     </div>
 
-    {{-- <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
+    <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
         <h3 slot="header">{{ __('admin::app.export.download') }}</h3>
         <div slot="body">
             <export-form></export-form>
         </div>
-    </modal> --}}
+    </modal>
 
 @stop
 
 @push('scripts')
 
-{{-- <script type="text/x-template" id="export-form-template">
+<script type="text/x-template" id="export-form-template">
     <form method="POST" action="{{ route('admin.datagrid.export') }}">
 
         <div class="page-content">
             <div class="form-container">
                 @csrf()
 
-                <input type="hidden" name="gridData" value="{{serialize($customer)}}">
+                <?php
+                    $data = json_encode((array) $customer);
+                ?>
+
+                <input type="hidden" name="gridData" value="{{ $data }}">
+                <input type="hidden" name="file_name" value="Customer">
 
                 <div class="control-group">
                     <label for="format" class="required">
@@ -81,7 +85,7 @@
             }
         }
     });
-</script> --}}
+</script>
 
 @endpush
 
diff --git a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
index 659c27bc6..80473533b 100755
--- a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
@@ -2,7 +2,7 @@
     <thead>
         <tr>
             @foreach ($columns as $column)
-                <th>{{ $column->label }}</th>
+                <th>{{ $column['label'] }}</th>
             @endforeach
         </tr>
     </thead>
@@ -10,7 +10,7 @@
         @foreach ($results as $result)
         <tr>
             @foreach ($columns as $column)
-                <td class="">{!! $column->render($result) !!}</td>
+                <td class="">{{ $result[$column['index']] }} </td>
             @endforeach
         </tr>
         @endforeach
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php
index b85fb7296..28d419d94 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/index.blade.php
@@ -11,14 +11,14 @@
                 <h1>{{ __('admin::app.sales.invoices.title') }}</h1>
             </div>
 
-            {{-- <div class="page-action">
+            <div class="page-action">
                 <div class="export" @click="showModal('downloadDataGrid')">
                     <i class="export-icon"></i>
                     <span>
                         {{ __('admin::app.export.export') }}
                     </span>
                 </div>
-            </div> --}}
+            </div>
         </div>
 
         <div class="page-content">
@@ -27,25 +27,30 @@
         </div>
     </div>
 
-    {{-- <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
+    <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
         <h3 slot="header">{{ __('admin::app.export.download') }}</h3>
         <div slot="body">
             <export-form></export-form>
         </div>
-    </modal> --}}
+    </modal>
 
 @stop
 
 @push('scripts')
 
-{{-- <script type="text/x-template" id="export-form-template">
+<script type="text/x-template" id="export-form-template">
     <form method="POST" action="{{ route('admin.datagrid.export') }}">
 
         <div class="page-content">
             <div class="form-container">
                 @csrf()
 
-                <input type="hidden" name="gridData" value="{{serialize($orderInvoicesGrid)}}">
+                <?php
+                    $data = json_encode((array) $orderInvoicesGrid);
+                ?>
+
+                <input type="hidden" name="gridData" value="{{ $data }}">
+                <input type="hidden" name="file_name" value="Invoice">
 
                 <div class="control-group">
                     <label for="format" class="required">
@@ -76,6 +81,6 @@
             }
         }
     });
-</script> --}}
+</script>
 
 @endpush
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php
index 149b1eeff..994214274 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/index.blade.php
@@ -11,14 +11,14 @@
                 <h1>{{ __('admin::app.sales.orders.title') }}</h1>
             </div>
 
-            {{-- <div class="page-action">
+            <div class="page-action">
                 <div class="export" @click="showModal('downloadDataGrid')">
                     <i class="export-icon"></i>
                     <span>
                         {{ __('admin::app.export.export') }}
                     </span>
                 </div>
-            </div> --}}
+            </div>
         </div>
 
         <div class="page-content">
@@ -27,25 +27,30 @@
         </div>
     </div>
 
-    {{-- <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
+    <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
         <h3 slot="header">{{ __('admin::app.export.download') }}</h3>
         <div slot="body">
             <export-form></export-form>
         </div>
-    </modal> --}}
+    </modal>
 
 @stop
 
 @push('scripts')
 
-{{-- <script type="text/x-template" id="export-form-template">
+<script type="text/x-template" id="export-form-template">
     <form method="POST" action="{{ route('admin.datagrid.export') }}">
 
         <div class="page-content">
             <div class="form-container">
                 @csrf()
 
-                <input type="hidden" name="gridData" value="{{serialize($orderGrid)}}">
+                <?php
+                    $data = json_encode((array) $orderGrid);
+                ?>
+
+                <input type="hidden" name="gridData" value="{{ $data }}">
+                <input type="hidden" name="file_name" value="Order">
 
                 <div class="control-group">
                     <label for="format" class="required">
@@ -65,7 +70,7 @@
         </button>
 
     </form>
-</script> --}}
+</script>
 
 <script>
     Vue.component('export-form', {
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php
index 49bf5d112..cc1fcb856 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/index.blade.php
@@ -11,14 +11,14 @@
                 <h1>{{ __('admin::app.sales.shipments.title') }}</h1>
             </div>
 
-            {{-- <div class="page-action">
+            <div class="page-action">
                 <div class="export" @click="showModal('downloadDataGrid')">
                     <i class="export-icon"></i>
                     <span>
                         {{ __('admin::app.export.export') }}
                     </span>
                 </div>
-            </div> --}}
+            </div>
         </div>
 
         <div class="page-content">
@@ -27,25 +27,30 @@
         </div>
     </div>
 
-    {{-- <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
+    <modal id="downloadDataGrid" :is-open="modalIds.downloadDataGrid">
         <h3 slot="header">{{ __('admin::app.export.download') }}</h3>
         <div slot="body">
             <export-form></export-form>
         </div>
-    </modal> --}}
+    </modal>
 
 @stop
 
 @push('scripts')
 
-{{-- <script type="text/x-template" id="export-form-template">
+<script type="text/x-template" id="export-form-template">
     <form method="POST" action="{{ route('admin.datagrid.export') }}">
 
         <div class="page-content">
             <div class="form-container">
                 @csrf()
 
-                <input type="hidden" name="gridData" value="{{serialize($orderShipmentsGrid)}}">
+                <?php
+                    $data = json_encode((array) $orderShipmentsGrid);
+                ?>
+
+                <input type="hidden" name="gridData" value="{{ $data }}">
+                <input type="hidden" name="file_name" value="Shipment">
 
                 <div class="control-group">
                     <label for="format" class="required">
@@ -76,6 +81,6 @@
             }
         }
     });
-</script> --}}
+</script>
 
 @endpush
\ No newline at end of file
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
index 2efd95dd3..88afceba8 100755
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeController.php
@@ -131,8 +131,8 @@ class AttributeController extends Controller
     {
         $attribute = $this->attribute->findOrFail($id);
 
-        if (!$attribute->is_user_defined) {
-            session()->flash('error', 'Can not delete system attribute.');
+        if(!$attribute->is_user_defined) {
+            session()->flash('error', trans('admin::app.response.user-define-error', ['name' => 'attribute']));
         } else {
             try {
                 $this->attribute->delete($id);
@@ -141,7 +141,7 @@ class AttributeController extends Controller
 
                 Event::fire(after.attribute.deleted, $attribute);
             } catch(\Exception $e) {
-                session()->flash('error', 'Attribute is used in configurable products.');
+                session()->flash('error', trans('admin::app.response.attribute-error', ['name' => 'Attribute']));
             }
         }
 
diff --git a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php
index 96844dff2..eeacce85f 100755
--- a/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php
+++ b/packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php
@@ -82,7 +82,7 @@ class AttributeFamilyController extends Controller
 
         $attributeFamily = $this->attributeFamily->create(request()->all());
 
-        session()->flash('success', 'Family created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Family']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -119,7 +119,7 @@ class AttributeFamilyController extends Controller
 
         $attributeFamily = $this->attributeFamily->update(request()->all(), $id);
 
-        session()->flash('success', 'Family updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Family']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -135,13 +135,13 @@ class AttributeFamilyController extends Controller
         $attributeFamily = $this->attributeFamily->find($id);
 
         if ($this->attributeFamily->count() == 1) {
-            session()->flash('error', 'At least one family is required.');
+            session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Family']));
         } else if ($attributeFamily->products()->count()) {
-            session()->flash('error', 'Attribute family is used in products.');
+            session()->flash('error', trans('admin::app.response.attribute-product-error', ['name' => 'Attribute family']));
         } else {
             $this->attributeFamily->delete($id);
 
-            session()->flash('success', 'Family deleted successfully.');
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Family']));
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
index 2ce736bad..8147b6a9e 100755
--- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
+++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php
@@ -78,7 +78,7 @@ class CategoryController extends Controller
 
         $category = $this->category->create(request()->all());
 
-        session()->flash('success', 'Category created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Category']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -121,7 +121,7 @@ class CategoryController extends Controller
 
         $this->category->update(request()->all(), $id);
 
-        session()->flash('success', 'Category updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Category']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -140,7 +140,7 @@ class CategoryController extends Controller
 
         Event::fire('catalog.category.delete.after', $id);
 
-        session()->flash('success', 'Category deleted successfully.');
+        session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Category']));
 
         return redirect()->back();
     }
diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
index d58867b76..54292db2c 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php
@@ -88,7 +88,7 @@ class ChannelController extends Controller
 
         Event::fire('core.channel.create.after', $channel);
 
-        session()->flash('success', 'Channel created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Channel']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -134,7 +134,7 @@ class ChannelController extends Controller
 
         Event::fire('core.channel.update.after', $channel);
 
-        session()->flash('success', 'Channel updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Channel']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -156,7 +156,7 @@ class ChannelController extends Controller
 
             Event::fire('core.channel.delete.after', $id);
 
-            session()->flash('success', 'Channel deleted successfully.');
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Channel']));
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
index 634e7862d..352f9079e 100755
--- a/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/CurrencyController.php
@@ -81,7 +81,7 @@ class CurrencyController extends Controller
 
         Event::fire('core.currency.create.after', $currency);
 
-        session()->flash('success', 'Currency created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Currency']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -119,7 +119,7 @@ class CurrencyController extends Controller
 
         Event::fire('core.currency.update.after', $currency);
 
-        session()->flash('success', 'Currency updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Currency']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -139,10 +139,10 @@ class CurrencyController extends Controller
 
             Event::fire('core.currency.delete.after', $id);
 
-            if ($result)
-                session()->flash('success', 'Currency deleted successfully.');
+            if($result)
+                session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Currency']));
             else
-                session()->flash('error', 'At least one currency is required.');
+                session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Currency']));
         } catch (\Exception $e) {
             session()->flash('error', $e->getMessage());
         }
diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
index f5bb8307b..e19ce60ac 100755
--- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php
@@ -94,7 +94,7 @@ class ExchangeRateController extends Controller
 
         Event::fire('core.exchange_rate.create.after', $exchangeRate);
 
-        session()->flash('success', 'Exchange rate created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Exchange rate']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -134,7 +134,7 @@ class ExchangeRateController extends Controller
 
         Event::fire('core.exchange_rate.update.after', $exchangeRate);
 
-        session()->flash('success', 'Exchange rate updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Exchange rate']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -147,8 +147,8 @@ class ExchangeRateController extends Controller
      */
     public function destroy($id)
     {
-        if ($this->exchangeRate->count() == 1) {
-            session()->flash('error', 'At least one Exchange rate is required.');
+        if($this->exchangeRate->count() == 1) {
+            session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Exchange rate']));
         } else {
             Event::fire('core.exchange_rate.delete.before', $id);
 
@@ -156,7 +156,7 @@ class ExchangeRateController extends Controller
 
             Event::fire('core.exchange_rate.delete.after', $id);
 
-            session()->flash('success', 'Exchange rate deleted successfully.');
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Exchange rate']));
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
index 478601a9e..40f8bef93 100755
--- a/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/LocaleController.php
@@ -81,7 +81,7 @@ class LocaleController extends Controller
 
         Event::fire('core.locale.create.after', $locale);
 
-        session()->flash('success', 'Locale created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Locale']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -119,7 +119,7 @@ class LocaleController extends Controller
 
         Event::fire('core.locale.update.after', $locale);
 
-        session()->flash('success', 'Locale updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Locale']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -132,8 +132,8 @@ class LocaleController extends Controller
      */
     public function destroy($id)
     {
-        if ($this->locale->count() == 1) {
-            session()->flash('error', 'At least one locale is required.');
+        if($this->locale->count() == 1) {
+            session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Locale']));
         } else {
             Event::fire('core.locale.delete.before', $id);
 
@@ -141,7 +141,7 @@ class LocaleController extends Controller
 
             Event::fire('core.locale.delete.after', $id);
 
-            session()->flash('success', 'Locale deleted successfully.');
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Locale']));
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
index 72a4ff609..66910c823 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/AddressController.php
@@ -88,12 +88,12 @@ class AddressController extends Controller
             $data['default_address'] = 1;
         }
 
-        if ($this->address->create($data)) {
-            session()->flash('success', 'Address have been successfully added.');
+        if($this->address->create($data)) {
+            session()->flash('success', trans('shop::app.customer.account.address.create.success'));
 
             return redirect()->route($this->_config['redirect']);
         } else {
-            session()->flash('error', 'Address cannot be added.');
+            session()->flash('error', trans('shop::app.customer.account.address.create.error'));
 
             return redirect()->back();
         }
@@ -131,7 +131,7 @@ class AddressController extends Controller
 
         $this->address->update($data, $id);
 
-        Session()->flash('success','Address Updated Successfully.');
+        session()->flash('success', trans('shop::app.customer.account.address.edit.success'));
 
         return redirect()->route('customer.address.index');
     }
@@ -150,7 +150,7 @@ class AddressController extends Controller
         if ($address = $this->address->find($id)) {
             $address->update(['default_address' => 1]);
         } else {
-            session()->flash('success', 'Default Cannot Be Address Changed');
+            session()->flash('success', trans('shop::app.customer.account.address.index.default-delete'));
         }
 
         return redirect()->back();
@@ -167,7 +167,7 @@ class AddressController extends Controller
     {
         $this->address->delete($id);
 
-        session()->flash('success', trans('shop::app.address.delete.success'));
+        session()->flash('success', trans('shop::app.customer.account.address.delete.success'));
 
         return redirect()->back();
     }
diff --git a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
index aaeb980f9..56bc7ee91 100755
--- a/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
+++ b/packages/Webkul/Inventory/src/Http/Controllers/InventorySourceController.php
@@ -21,7 +21,7 @@ class InventorySourceController extends Controller
      * @var array
      */
     protected $_config;
-    
+
     /**
      * InventorySourceRepository object
      *
@@ -92,7 +92,7 @@ class InventorySourceController extends Controller
 
         Event::fire('inventory.inventory_source.create.after', $inventorySource);
 
-        session()->flash('success', 'Inventory source created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Inventory source']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -142,7 +142,7 @@ class InventorySourceController extends Controller
 
         Event::fire('inventory.inventory_source.update.after', $inventorySource);
 
-        session()->flash('success', 'Inventory source updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Inventory source']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -155,8 +155,8 @@ class InventorySourceController extends Controller
      */
     public function destroy($id)
     {
-        if ($this->inventorySource->count() == 1) {
-            session()->flash('error', 'At least one inventory source is required.');
+        if($this->inventorySource->count() == 1) {
+            session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Inventory source']));
         } else {
             Event::fire('inventory.inventory_source.delete.before', $id);
 
@@ -164,7 +164,7 @@ class InventorySourceController extends Controller
 
             Event::fire('inventory.inventory_source.delete.after', $id);
 
-            session()->flash('success', 'Inventory source deleted successfully.');
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Inventory source']));
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
index 1cfc247bf..fe902615b 100755
--- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php
@@ -145,7 +145,7 @@ class ProductController extends Controller
 
         $product = $this->product->create(request()->all());
 
-        session()->flash('success', 'Product created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Product']));
 
         return redirect()->route($this->_config['redirect'], ['id' => $product->id]);
     }
@@ -178,7 +178,7 @@ class ProductController extends Controller
     {
         $product = $this->product->update(request()->all(), $id);
 
-        session()->flash('success', 'Product updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Product']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -193,7 +193,7 @@ class ProductController extends Controller
     {
         $this->product->delete($id);
 
-        session()->flash('success', 'Product deleted successfully.');
+        session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Product']));
 
         return redirect()->back();
     }
diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
index c0c24a504..32fbffd5f 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
@@ -92,7 +92,7 @@ class ReviewController extends Controller
 
         $this->productReview->create($data);
 
-        session()->flash('success', 'Review submitted successfully.');
+        session()->flash('success', trans('shop::app.response.submit-success', ['name' => 'Product Review']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -119,7 +119,7 @@ class ReviewController extends Controller
     {
         $this->productReview->delete($id);
 
-        session()->flash('success', 'Product Review Successfully Deleted');
+        session()->flash('success', trans('shop::app.response.delete-success', ['name' => 'Product Review']));
 
         return redirect()->back();
     }
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js
index edba5a41f..a5a211b4b 100755
--- a/packages/Webkul/Shop/src/Resources/assets/js/app.js
+++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js
@@ -7,6 +7,8 @@ require("./bootstrap");
 Vue.use(VeeValidate);
 Vue.prototype.$http = axios
 
+window.eventBus = new Vue();
+
 Vue.component("category-nav", require("./components/category-nav.vue"));
 Vue.component("category-item", require("./components/category-item.vue"));
 Vue.component("image-slider", require("./components/image-slider.vue"));
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index bffdd60b5..6c637c0da 100755
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -3068,36 +3068,9 @@ section.review {
         .account-items-list , .edit-form {
             margin-top: 20px;
 
-            .table {
-                display: none;
-            }
-
             .responsive-empty {
                 display: block;
             }
-
-            .responsive-table {
-                border: 1px solid $border-color;
-                margin-top: 5px;
-                width: 100%;
-                display: block;
-
-                tbody td {
-                    padding: 8px 5px;
-
-                    &:first-child {
-                        width: 25%;
-                    }
-
-                    &:last-child {
-                        padding-left: 10px;
-                    }
-                }
-            }
-        }
-
-        .account-items-list.table {
-            display: none;
         }
 
         .control-group .control {
@@ -3217,29 +3190,6 @@ section.review {
                     }
                 }
 
-                .table{
-                    display: none;
-                }
-
-                .responsive-table {
-                    border: 1px solid $border-color;
-                    margin-top: 5px;
-                    width: 100%;
-                    display: block;
-
-                    tbody td {
-                        padding: 8px 5px;
-
-                        &:first-child {
-                            width: 35%;
-                        }
-
-                        &:last-child {
-                            padding-left: 10px;
-                        }
-                    }
-                }
-
                 .totals {
                     .sale-summary {
                         width: 100%;
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 96221b69a..02ad440d3 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -191,7 +191,8 @@ return [
                     'make-default' => 'Make Default',
                     'default' => 'Default',
                     'contact' => 'Contact',
-                    'confirm-delete' =>  'Do you really want to delete this address?'
+                    'confirm-delete' =>  'Do you really want to delete this address?',
+                    'default-delete' => 'Default Address Cannot Be Changed'
                 ],
 
                 'create' => [
@@ -205,13 +206,16 @@ return [
                     'city' => 'City',
                     'postcode' => 'Postal Code',
                     'phone' => 'Phone',
-                    'submit' => 'Save Address'
+                    'submit' => 'Save Address',
+                    'success' => 'Address have been successfully added.',
+                    'error' => 'Address cannot be added.'
                 ],
 
                 'edit' => [
                     'page-title' => 'Customer - Edit Address',
                     'title' => 'Edit Address',
-                    'submit' => 'Save Address'
+                    'submit' => 'Save Address',
+                    'success' => 'Address Updated Successfully.'
                 ],
                 'delete' => [
                     'success' => 'Address Successfully Deleted',
@@ -480,5 +484,12 @@ return [
 
     'webkul' => [
         'copy-right' => '© Copyright 2018 Webkul Software, All rights reserved'
-    ]
+    ],
+
+    'response' => [
+        'create-success' => ':name created successfully.',
+        'update-success' => ':name updated successfully.',
+        'delete-success' => ':name deleted successfully.',
+        'submit-success' => ':name submitted successfully.'
+    ],
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
index f4836d8c3..23c784638 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php
@@ -39,20 +39,20 @@
                             @foreach ($orders as $order)
 
                                 <tr>
-                                    <td>
+                                    <td data-value="{{  __('shop::app.customer.account.order.index.order_id') }}">
                                         <a href="{{ route('customer.orders.view', $order->id) }}">
                                             #{{ $order->id }}
                                         </a>
                                     </td>
 
-                                    <td>{{ core()->formatDate($order->created_at, 'd M Y') }}</td>
+                                    <td data-value="{{ __('shop::app.customer.account.order.index.date') }}">{{ core()->formatDate($order->created_at, 'd M Y') }}</td>
 
-                                    <td>
+                                    <td data-value="{{ __('shop::app.customer.account.order.index.total') }}">
                                         {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
                                     </td>
 
-                                    <td>
-                                        @if ($order->status == 'processing')
+                                    <td data-value="{{  __('shop::app.customer.account.order.index.status') }}">
+                                        @if($order->status == 'processing')
                                             <span class="badge badge-md badge-success">Processing</span>
                                         @elseif ($order->status == 'completed')
                                             <span class="badge badge-md badge-success">Completed</span>
@@ -81,46 +81,7 @@
                     </table>
                 </div>
 
-                @foreach ($orders as $order)
-                    <table class="responsive-table">
-                        <tbody>
-                            <tr>
-                                <td>
-                                    {{ __('shop::app.customer.account.order.index.order_id') }}
-                                </td>
-                                <td>
-                                    <a href="{{ route('customer.orders.view', $order->id) }}">
-                                        #{{ $order->id }}
-                                    </a>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    {{ __('shop::app.customer.account.order.index.date')  }}
-                                </td>
-                                <td>{{ core()->formatDate($order->created_at, 'd M Y') }}</td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    {{ __('shop::app.customer.account.order.index.total')  }}
-                                </td>
-                                <td>
-                                    {{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    {{ __('shop::app.customer.account.order.index.status')  }}
-                                </td>
-                                <td>
-                                    <span class="order-status {{ $order->status }}">{{ $order->status_label }}</span>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                @endforeach
-
-                @if (! $orders->count())
+                @if (!$orders->count())
                     <div class="responsive-empty">{{ __('admin::app.common.no-result-found') }}</div>
                 @endif
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index a6be5135d..83686f93c 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -65,12 +65,12 @@
 
                                             @foreach ($order->items as $item)
                                                 <tr>
-                                                    <td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
                                                         {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }}
                                                     </td>
-                                                    <td>{{ $item->name }}</td>
-                                                    <td>{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
-                                                    <td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
                                                         <span class="qty-row">
                                                             {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
                                                         </span>
@@ -87,10 +87,10 @@
                                                             {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
                                                         </span>
                                                     </td>
-                                                    <td>{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
-                                                    <td>{{ number_format($item->tax_percent, 2) }}%</td>
-                                                    <td>{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
-                                                    <td>{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">{{ number_format($item->tax_percent, 2) }}%</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
                                                 </tr>
                                             @endforeach
                                         </tbody>
@@ -98,89 +98,6 @@
                                     </table>
                                 </div>
 
-                                @foreach ($order->items as $item)
-                                    <table class="responsive-table">
-                                        <tbody>
-                                            <tr>
-                                                <td>
-                                                    {{ __('shop::app.customer.account.order.view.SKU') }}
-                                                </td>
-                                                <td>
-                                                    {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }}
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    {{ __('shop::app.customer.account.order.view.product-name') }}
-                                                </td>
-                                                <td>{{ $item->name }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    {{ __('shop::app.customer.account.order.view.price') }}
-                                                </td>
-                                                <td>
-                                                    {{ core()->formatPrice($item->price, $order->order_currency_code) }}
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                {{ __('shop::app.customer.account.order.view.item-status') }}
-                                                </td>
-                                                <td>
-                                                    <span class="qty-row">
-                                                        {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
-                                                    </span>
-
-                                                    <span class="qty-row">
-                                                        {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
-                                                    </span>
-
-                                                    <span class="qty-row">
-                                                        {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
-                                                    </span>
-
-                                                    <span class="qty-row">
-                                                        {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
-                                                    </span>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    {{ __('shop::app.customer.account.order.view.subtotal') }}
-                                                </td>
-                                                <td>
-                                                    {{ core()->formatPrice($item->total, $order->order_currency_code) }}
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    {{ __('shop::app.customer.account.order.view.tax-percent') }}
-                                                </td>
-                                                <td>
-                                                    {{ number_format($item->tax_percent, 2) }}%
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    {{ __('shop::app.customer.account.order.view.tax-amount') }}
-                                                </td>
-                                                <td>
-                                                    {{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td>
-                                                    {{ __('shop::app.customer.account.order.view.grand-total') }}
-                                                </td>
-                                                <td>
-                                                    {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                @endforeach
-
                                 <div class="totals">
                                     <table class="sale-summary">
                                         <tbody>
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
index 233dae041..e5759416a 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php
@@ -13,7 +13,7 @@
         <script type="text/x-template" id="product-options-template">
             <div class="attributes">
 
-                <input type="hidden" name="selected_configurable_option" :value="selectedProductId">
+                <input type="hidden" id="selected_configurable_option" name="selected_configurable_option" :value="selectedProductId">
 
                 <div v-for='(attribute, index) in childAttributes' class="attribute control-group" :class="[errors.has('super_attribute[' + attribute.id + ']') ? 'has-error' : '']">
                     <label class="required">@{{ attribute.label }}</label>
@@ -101,25 +101,6 @@
                                 this.selectedProductId = attribute.options[attribute.selectedIndex].allowedProducts[0];
                             }
 
-                            //wishlist anchor href changer with options
-                            // @auth('customer')
-                            //     var wishlistLink = $('#wishlist-changer').attr('data-href');
-
-                            //     if (this.selectedProductId != '') {
-                            //         var splitted = wishlistLink.split("/");
-
-                            //         var lastItem = splitted.pop();
-
-                            //         lastItem = this.selectedProductId;
-
-                            //         var joined = splitted.join('/');
-
-                            //         var newWishlistUrl = joined + '/' + lastItem;
-
-                            //         $('#wishlist-changer').attr('data-href', newWishlistUrl);
-                            //     }
-                            // @endauth
-
                             //buy now anchor href changer with options
                             var buyNowLink = $('.btn.buynow').attr('data-href');
 
@@ -156,7 +137,6 @@
                                 selectedIndex = index;
                             }
                         })
-
                         return selectedIndex;
                     },
 
@@ -266,10 +246,14 @@
                             priceLabelElement.style.display = 'none';
 
                             priceElement.innerHTML = this.config.variant_prices[this.simpleProduct].final_price.formated_price;
+
+                            eventBus.$emit('configurable-variant-selected-event', this.simpleProduct)
                         } else {
                             priceLabelElement.style.display = 'inline-block';
 
                             priceElement.innerHTML = this.config.regular_price.formated_price;
+
+                            eventBus.$emit('configurable-variant-selected-event', 0)
                         }
                     },
 
diff --git a/packages/Webkul/Shop/webpack.mix.js b/packages/Webkul/Shop/webpack.mix.js
index acf0d5b90..cc2d629f2 100755
--- a/packages/Webkul/Shop/webpack.mix.js
+++ b/packages/Webkul/Shop/webpack.mix.js
@@ -1,8 +1,8 @@
 const { mix } = require("laravel-mix");
 require("laravel-mix-merge-manifest");
 
-var publicPath = 'publishable/assets';
-// var publicPath = "../../../public/themes/default/assets";
+// var publicPath = 'publishable/assets';
+var publicPath = "../../../public/themes/default/assets";
 
 mix.setPublicPath(publicPath).mergeManifest();
 mix.disableNotifications();
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue
index 25924a3d7..febc6d92d 100755
--- a/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue
+++ b/packages/Webkul/Ui/src/Resources/assets/js/components/date.vue
@@ -17,7 +17,7 @@
 
 		data () {
 			return {
-				datepicker: null              
+				datepicker: null
 			}
 		},
 
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index aec5755a6..109fce83e 100755
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -276,6 +276,13 @@ h2 {
             &.empty {
                 text-align: center;
             }
+
+            tr {
+
+                td {
+                    border: 1px solid red;
+                }
+            }
         }
 
         tbody tr:last-child td {
@@ -294,6 +301,32 @@ h2 {
     }
 }
 
+@media only screen and (max-width: 770px) {
+    .table {
+        table thead {
+            display: none;
+        }
+
+        table tbody {
+            tr td:before {
+                content: attr(data-value);
+                    font-size: 15px;
+                    font-weight: 600;
+                    margin-right: 20px;
+            }
+
+            td {
+                border-bottom: none;
+                display: block;
+            }
+
+            tr {
+                border: 1px solid #C7C7C7;
+            }
+        }
+    }
+}
+
 .dropdown-btn {
     min-width: 150px;
     text-align: left;
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
index 8645199b4..bbacf3ddf 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php
@@ -39,7 +39,7 @@
                 @endforeach
 
                 @if ($enableActions)
-                    <td style="width: 50px;">
+                    <td>
                         <div class="actions">
                             @foreach ($actions as $action)
                                 <a href="{{ route($action['route'], $record->{$index}) }}">
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
index 4efa7b665..643b920be 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -148,11 +148,11 @@
                     </span>
                 </div>
 
-                <table>
+                <table class="table">
                     <thead v-if="massActionsToggle">
                         @if (isset($results['massactions']))
-                            <tr class="mass-action" v-if="massActionsToggle">
-                                <th>
+                            <tr class="mass-action" v-if="massActionsToggle" style="height: 65px;">
+                                <th colspan="100%">
                                     <div class="mass-action-wrapper" style="display: flex; flex-direction: row; align-items: center; justify-content: flex-start;">
 
                                         <span class="massaction-remove" v-on:click="removeMassActions" style="margin-right: 10px;">
@@ -165,18 +165,18 @@
                                             <input type="hidden" id="indexes" name="indexes" v-model="dataIds">
 
                                             <div class="control-group">
-                                                <select class="control" v-model="massActionType" @change="changeMassActionTarget" name="massaction-type" required style="height: 30px;">
+                                                <select class="control" v-model="massActionType" @change="changeMassActionTarget" name="massaction-type" required>
                                                     <option v-for="(massAction, index) in massActions" :key="index" :value="massAction.type">@{{ massAction.label }}</option>
                                                 </select>
                                             </div>
 
                                             <div class="control-group" style="margin-left: 10px;" v-if="massActionType == 'update'">
-                                                <select class="control" v-model="massActionUpdateValue" name="update-options" required style="height: 30px;">
+                                                <select class="control" v-model="massActionUpdateValue" name="update-options" required>
                                                     <option v-for="(massActionValue, id) in massActionValues" :value="massActionValue">@{{ id }}</option>
                                                 </select>
                                             </div>
 
-                                            <input type="submit" class="btn btn-sm btn-primary" style="margin-left: 10px; height: 28px;">
+                                            <input type="submit" class="btn btn-sm btn-primary" style="margin-left: 10px;">
                                         </form>
                                     </div>
                                 </th>
@@ -185,7 +185,7 @@
                     </thead>
 
                     <thead v-if="massActionsToggle == false">
-                        <tr>
+                        <tr style="height: 65px;">
                             @if (count($results['records']) && $results['enableMassActions'])
                                 <th class="grid_head" id="mastercheckbox" style="width: 50px;">
                                     <span class="checkbox">
diff --git a/packages/Webkul/User/src/Http/Controllers/RoleController.php b/packages/Webkul/User/src/Http/Controllers/RoleController.php
index b1e93cb68..dca237ca0 100755
--- a/packages/Webkul/User/src/Http/Controllers/RoleController.php
+++ b/packages/Webkul/User/src/Http/Controllers/RoleController.php
@@ -83,7 +83,7 @@ class RoleController extends Controller
 
         Event::fire('user.role.create.after', $role);
 
-        session()->flash('success', 'Role created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Role']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -121,7 +121,7 @@ class RoleController extends Controller
 
         Event::fire('user.role.update.after', $role);
 
-        session()->flash('success', 'Role updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Role']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -143,7 +143,7 @@ class RoleController extends Controller
 
             Event::fire('user.role.delete.after', $id);
 
-            session()->flash('success', 'Role source deleted successfully.');
+            session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Role']));
         }
 
         return redirect()->back();
diff --git a/packages/Webkul/User/src/Http/Controllers/UserController.php b/packages/Webkul/User/src/Http/Controllers/UserController.php
index c335c1d75..b2cc61fe6 100755
--- a/packages/Webkul/User/src/Http/Controllers/UserController.php
+++ b/packages/Webkul/User/src/Http/Controllers/UserController.php
@@ -98,7 +98,7 @@ class UserController extends Controller
 
         Event::fire('user.admin.delete.after', $admin);
 
-        session()->flash('success', 'User created successfully.');
+        session()->flash('success', trans('admin::app.response.create-success', ['name' => 'User']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -146,7 +146,7 @@ class UserController extends Controller
 
         Event::fire('user.admin.update.after', $admin);
 
-        session()->flash('success', 'User updated successfully.');
+        session()->flash('success', trans('admin::app.response.update-success', ['name' => 'User']));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -172,7 +172,7 @@ class UserController extends Controller
 
             Event::fire('user.admin.delete.after', $id);
 
-            session()->flash('success', 'Admin source deleted successfully.');
+            session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Admin source']));
         }
 
         return redirect()->back();
diff --git a/public/installer/AdminConfig.php b/public/installer/AdminConfig.php
index f435502fd..6d76bd0d4 100755
--- a/public/installer/AdminConfig.php
+++ b/public/installer/AdminConfig.php
@@ -30,7 +30,8 @@ $data    = array();      // array to pass back data
         $data['errors']  = $errors;
 
     } else {
-        $currentLocation = explode("/", getcwd());
+        $location = str_replace('\\', '/', getcwd());
+        $currentLocation = explode("/", $location);
         array_pop($currentLocation);
         array_pop($currentLocation);
         $desiredLocation = implode("/", $currentLocation);
@@ -66,7 +67,7 @@ $data    = array();      // array to pass back data
 
         if ($connection == 'mysql' ) {
             // Create connection
-            $conn = new mysqli($servername, $username, $password, $dbname);
+            @$conn = new mysqli($servername, $username, $password, $dbname);
 
             // check connection
             if ($conn->connect_error) {
diff --git a/public/installer/Classes/Permission.php b/public/installer/Classes/Permission.php
index d85405240..f39a83edf 100755
--- a/public/installer/Classes/Permission.php
+++ b/public/installer/Classes/Permission.php
@@ -57,13 +57,11 @@ class Permission {
      */
     private function getPermission($folder)
     {
-        $currentLocation = explode("/", getcwd());
-
+        $location = str_replace('\\', '/', getcwd());
+        $currentLocation = explode("/", $location);
         array_pop($currentLocation);
         array_pop($currentLocation);
-
         $desiredLocation = implode("/", $currentLocation);
-
         $fileLocation = $desiredLocation . '/' .$folder;
 
         return substr(sprintf('%o', fileperms($fileLocation)), -4);
diff --git a/public/installer/Classes/Requirement.php b/public/installer/Classes/Requirement.php
index a635936e4..4c7327667 100755
--- a/public/installer/Classes/Requirement.php
+++ b/public/installer/Classes/Requirement.php
@@ -124,23 +124,23 @@ class Requirement {
     private static function composerInstall()
     {
         putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
-        $command = 'composer -v 2>&1';
+        $command = 'composer --version 2>&1';
         exec($command, $data['composer'], $data['composer_install']);
 
         return $data['composer_install'];
     }
 
-    /**
-     * check installation for composer
-     * @return boolean
-    */
-    private static function nodeInstall()
-    {
-        $command = 'npm -v 2>&1';
-        exec($command, $data['npm'], $data['npm_install']);
+    // /**
+    //  * check installation for composer
+    //  * @return boolean
+    // */
+    // private static function nodeInstall()
+    // {
+    //     $command = 'npm -v 2>&1';
+    //     exec($command, $data['npm'], $data['npm_install']);
 
-        return $data['npm_install'];
-    }
+    //     return $data['npm_install'];
+    // }
 
     /**
      * Render view for class.
@@ -154,7 +154,7 @@ class Requirement {
 
         $composerInstall = $this->composerInstall();
 
-        $nodeInstall = $this->nodeInstall();
+        // $nodeInstall = $this->nodeInstall();
 
         ob_start();
 
diff --git a/public/installer/Classes/vendor/bin/composer/.htaccess b/public/installer/Classes/vendor/bin/composer/.htaccess
deleted file mode 100644
index 14249c50b..000000000
--- a/public/installer/Classes/vendor/bin/composer/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
\ No newline at end of file
diff --git a/public/installer/Classes/vendor/bin/composer/cache/.htaccess b/public/installer/Classes/vendor/bin/composer/cache/.htaccess
deleted file mode 100644
index 14249c50b..000000000
--- a/public/installer/Classes/vendor/bin/composer/cache/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-Deny from all
\ No newline at end of file
diff --git a/public/installer/EnvConfig.php b/public/installer/EnvConfig.php
index 3ea175d73..faa5851ef 100755
--- a/public/installer/EnvConfig.php
+++ b/public/installer/EnvConfig.php
@@ -61,7 +61,8 @@ $data    = array();      // array to pass back data
         // if there are no errors process our form, then return a message
 
         // getting env file location
-        $currentLocation = explode("/", getcwd());
+        $location = str_replace('\\', '/', getcwd());
+        $currentLocation = explode("/", $location);
         array_pop($currentLocation);
         array_pop($currentLocation);
         $desiredLocation = implode("/", $currentLocation);
@@ -119,7 +120,7 @@ $data    = array();      // array to pass back data
         // checking database connection(mysql only)
         if ($_POST["database_connection"] == 'mysql') {
             // Create connection
-            $conn = new mysqli($_POST["host_name"], $_POST["user_name"], $_POST["user_password"], $_POST["database_name"]);
+            @$conn = new mysqli($_POST["host_name"], $_POST["user_name"], $_POST["user_password"], $_POST["database_name"]);
 
             // check connection
             if ($conn->connect_error) {
diff --git a/public/installer/Views/requirements.blade.php b/public/installer/Views/requirements.blade.php
index 24ffa5ead..875b3e6b8 100755
--- a/public/installer/Views/requirements.blade.php
+++ b/public/installer/Views/requirements.blade.php
@@ -47,7 +47,7 @@
                             <img src="<?php echo $src ?>">
                         <?php endif; ?>
                         <span style="margin-left: 10px"><b>Composer</b></span>
-                        <span>(1.6.5 or higher)</span>
+
                     </div>
 
                     <div style="margin-left: 30%;">
@@ -56,18 +56,6 @@
                         <?php endif; ?>
                     </div>
 
-                    <div class="check" style="margin-left: 25%;">
-                        <?php if(($nodeInstall == 0) ? $src = 'Images/green-check.svg' : $src = 'Images/red-check.svg' ): ?>
-                            <img src="<?php echo $src ?>">
-                        <?php endif; ?>
-                        <span style="margin-left: 10px"><b>Node</b></span>
-                        <span>(8.11.3 LTS or higher)</span>
-                    </div>
-                    <div style="margin-left: 30%;">
-                        <?php if(!($nodeInstall == 0)): ?>
-                            <a href="https://nodejs.org/en/" style="color: #0041FF; font-size: 16px">https://nodejs.org/en/</a>
-                        <?php endif; ?>
-                    </div>
                 </div>
 
                 <?php if(!isset($requirements['errors']) && $phpVersion['supported'] && ($nodeInstall == 0) && ($composerInstall == 0) ): ?>
diff --git a/public/installer/index.php b/public/installer/index.php
index 4bd91ff39..bf2822295 100755
--- a/public/installer/index.php
+++ b/public/installer/index.php
@@ -1,6 +1,7 @@
 <?php
     // getting env file
-    $currentLocation = explode("/", getcwd());
+    $location = str_replace('\\', '/', getcwd());
+    $currentLocation = explode("/", $location);
     array_pop($currentLocation);
     array_pop($currentLocation);
     $desiredLocation = implode("/", $currentLocation);
@@ -39,7 +40,7 @@
         $connection = $databaseData['DB_CONNECTION'];
 
         if ($connection == 'mysql') {
-            $conn = new mysqli($servername, $username, $password, $dbname);
+            @$conn = new mysqli($servername, $username, $password, $dbname);
 
             if (!$conn->connect_error) {
                 // retrieving admin entry
diff --git a/public/installer/install.php b/public/installer/install.php
index 14c7b5a24..c763cf083 100755
--- a/public/installer/install.php
+++ b/public/installer/install.php
@@ -1,6 +1,7 @@
 <?php
     // getting env file
-    $currentLocation = explode("/", getcwd());
+    $location = str_replace('\\', '/', getcwd());
+    $currentLocation = explode("/", $location);
     array_pop($currentLocation);
     $desiredLocation = implode("/", $currentLocation);
     $envFile = $desiredLocation . '/' . '.env';
@@ -38,7 +39,7 @@
         $connection = $databaseData['DB_CONNECTION'];
 
         if ($connection == 'mysql') {
-            $conn = new mysqli($servername, $username, $password, $dbname);
+            @$conn = new mysqli($servername, $username, $password, $dbname);
 
             if (!$conn->connect_error) {
                 // retrieving admin entry