diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 1087cfa39..8537a5535 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -19,6 +19,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
+        \Illuminate\Session\Middleware\StartSession::class,
     ];
 
     /**
@@ -31,7 +32,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-            // \Illuminate\Session\Middleware\AuthenticateSession::class,
+            \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index 87b17815c..8b1484fd5 100644
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -40,27 +40,27 @@ Route::group(['middleware' => ['web']], function () {
             Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->name('admin.dashboard.index');
 
             //Customers Management Routes
-            Route::get('customer', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [
+            Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [
                 'view' => 'admin::customers.index'
             ])->name('admin.customer.index');
 
-            Route::get('customer/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[
+            Route::get('customers/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[
                 'view' => 'admin::customers.orders.index'
             ])->name('admin.customer.orders.index');
 
-            Route::get('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[
+            Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[
                 'view' => 'admin::customers.create'
             ])->name('admin.customer.create');
 
-            Route::post('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[
+            Route::post('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[
                 'redirect' => 'admin.customer.index'
             ])->name('admin.customer.store');
 
-            Route::get('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[
+            Route::get('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[
                 'view' => 'admin::customers.edit'
             ])->name('admin.customer.edit');
 
-            Route::put('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [
+            Route::put('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [
                 'redirect' => 'admin.customer.index'
             ])->name('admin.customer.update');
 
diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
index 7e1c6936c..2d2f410ff 100644
--- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
+++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
@@ -38,6 +38,15 @@ class AdminServiceProvider extends ServiceProvider
         );
     }
 
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
+
     /**
      * Bind the the data to the views
      *
@@ -76,19 +85,6 @@ class AdminServiceProvider extends ServiceProvider
         });
     }
 
-    /**
-     * Register services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        // $this->mergeConfigFrom(
-        //     __DIR__ . '/../Config/auth.php',
-        //     'auth'
-        // );
-    }
-
     /**
      * Merge the given configuration with the existing configuration.
      *
diff --git a/packages/Webkul/Admin/src/Resources/assets/images/logo.png b/packages/Webkul/Admin/src/Resources/assets/images/logo.png
deleted file mode 100644
index f3a6baf4d..000000000
Binary files a/packages/Webkul/Admin/src/Resources/assets/images/logo.png and /dev/null differ
diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
index 77b325653..43653f4a7 100644
--- a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
@@ -526,30 +526,6 @@ body {
     }
 }
     
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // customer oder css for admin start here
 .sale-container {
     .sale-section {
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
index a47db30c1..f1a786c9b 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
@@ -7,6 +7,8 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="csrf-token" content="{{ csrf_token() }}">
 
+        <link rel="icon" sizes="16x16" href="{{ asset('vendor/webkul/ui/assets/images/favicon.ico') }}" />
+
         <link rel="stylesheet" href="{{ asset('vendor/webkul/admin/assets/css/admin.css') }}">
         <link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
 
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
index a52a6a85d..36a6fc1bd 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php
@@ -14,7 +14,7 @@
                 <div class="dropdown-toggle">
                     <div style="display: inline-block; vertical-align: middle;">
                         <span class="name">
-                            {{--  {{ auth()->guard('admin')->user()->name }}  --}}
+                            {{ auth()->guard('admin')->user()->name }}
                         </span>
 
                         <span class="role">
diff --git a/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico b/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico
new file mode 100644
index 000000000..e9c217bb3
Binary files /dev/null and b/packages/Webkul/Shop/src/Resources/assets/images/favicon.ico differ
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue
index 286ff15cf..e82d91329 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-nav.vue
@@ -7,11 +7,6 @@
             :item="item"
             :parent="index">
         </category-item>
-
-        <li>
-            <img src="http://localhost/bagisto/public/vendor/webkul/shop/assets/images/offer-zone.svg"/>
-            <span>Offer Zone</span>
-        </li>
     </ul>
 </template>
 
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 8f5126ae1..29684f73f 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -17,7 +17,113 @@
         display: block;
     }
 
+    // product card, requires no changes for responsiveness.
+    .product-grid-4 {
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
+        grid-auto-rows: auto;
+        grid-column-gap: 48px;
+        grid-row-gap: 15px;
+    }
+
+    .product-grid-3 {
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
+        grid-gap: 27px;
+        grid-auto-rows: auto;
+    }
+
+    @media only screen and (max-width: 854px) {
+        .product-grid-4 {
+            grid-template-columns: 29.5% 29.5% 29.5%;
+            grid-column-gap: 35px;
+        }
+    }
+
+    @media only screen and (max-width: 653px) {
+        .product-grid-4 {
+            grid-template-columns: 48.5% 48.5%;
+            grid-column-gap: 17px;
+        }
+    }
+
+    .product-card {
+        position: relative;
+
+        .product-image {
+            max-height: 350px;
+            max-width: 280px;
+            margin-bottom: 10px;
+            background: #F2F2F2;
+
+            img {
+                display: block;
+                width: 100%;
+            }
+        }
+
+        .product-name {
+            margin-bottom: 14px;
+            width: 100%;
+            color: $font-color;
+
+            a {
+                color: $font-color;
+            }
+        }
+
+        .product-description {
+            display: none;
+        }
+
+        .product-ratings {
+            width: 100%;
+
+            .icon {
+                width: 16px;
+                height: 16px;
+            }
+        }
+
+        .cart-wish-wrap {
+            display: inline-flex;
+            justify-content: flex-start;
+            align-items: center;
+            height: 40px;
+
+            .addtocart {
+                margin-right: 10px;
+                text-transform: uppercase;
+            }
+
+            .add-to-wishlist {
+                margin-top: 5px;
+            }
+        }
+
+        .sticker {
+            border-radius: 100px;
+            position: absolute;
+            top: 10px;
+            left: 10px;
+            text-transform: uppercase;
+            padding: 4px 13px;
+            font-size: 14px;
+            color: #fff;
+
+            &.sale {
+                background: #FF6472;
+            }
+
+            &.new {
+                background: #2ED04C;
+            }
+        }
+    }
+
     .product-list {
+        min-height: 200px;
+
         .product-card {
             width: 100%;
             display: inline-block;
@@ -43,6 +149,12 @@
                 margin-bottom: 0;
             }
         }
+
+        &.empty {
+            h2 {
+                font-size: 20px;
+            }
+        }
     }
 
     section.featured-products {
@@ -182,11 +294,8 @@ section.slider-block {
 
 //responsive css for slider
 @media only screen and (max-width: 770px) {
-
     section.slider-block {
-
         div.slider-content {
-
             div.slider-control {
                 display: flex;
                 justify-content:space-between;
@@ -988,6 +1097,7 @@ section.product-detail {
                         width: 49%;
                         background: black;
                         white-space: nowrap;
+                        text-transform: uppercase;
                     }
 
                     .buynow {
@@ -995,6 +1105,7 @@ section.product-detail {
                         width: 49%;
                         float:right;
                         white-space: nowrap;
+                        text-transform: uppercase;
                     }
                 }
             }
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
index de24f9f32..b5259a317 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss
@@ -1,87 +1,3 @@
-.product-card {
-
-    .product-image {
-        max-height: 350px;
-        max-width: 280px;
-        margin-bottom: 10px;
-        background: #F2F2F2;
-
-        img {
-            display: block;
-            width: 100%;
-        }
-    }
-
-    .product-name {
-        margin-bottom: 14px;
-        width: 100%;
-        color: $font-color;
-
-        a {
-            color: $font-color;
-        }
-    }
-
-    .product-description {
-        display: none;
-    }
-
-    .product-ratings {
-        width: 100%;
-
-        .icon {
-            width: 16px;
-            height: 16px;
-        }
-    }
-
-    .cart-wish-wrap {
-        display: inline-flex;
-        justify-content: flex-start;
-        align-items: center;
-        height: 40px;
-
-        .addtocart {
-            margin-right: 10px;
-            text-transform: uppercase;
-        }
-
-        .add-to-wishlist {
-            margin-top: 5px;
-        }
-    }
-}
-
-// product card, requires no changes for responsiveness.
-.product-grid-4 {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
-    grid-auto-rows: auto;
-    grid-column-gap: 48px;
-    grid-row-gap: 15px;
-}
-
-.product-grid-3 {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
-    grid-gap: 27px;
-    grid-auto-rows: auto;
-}
-
-@media only screen and (max-width: 854px) {
-    .product-grid-4 {
-        grid-template-columns: 29.5% 29.5% 29.5%;
-        grid-column-gap: 35px;
-    }
-}
-
-@media only screen and (max-width: 653px) {
-    .product-grid-4 {
-        grid-template-columns: 48.5% 48.5%;
-        grid-column-gap: 17px;
-    }
-}
-
 @media only screen and (max-width: 425px) {
     .product-card {
         font-size: 90%;
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 894a5ab36..eba7c0777 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -4,11 +4,7 @@ return [
     'home' => [
         'page-title' => 'Bagisto - Home',
         'featured-products' => 'Featured Products',
-        'new-products' => 'New Products',
-
-        'product-card' => [
-            'add-to-cart' => 'ADD TO CART'
-        ]
+        'new-products' => 'New Products'
     ],
 
     'footer' => [
@@ -198,7 +194,13 @@ return [
         'up-sell-title' => 'We found other products you might like!',
         'reviews-title' => 'Ratings & Reviews',
         'write-review-btn' => 'Write Review',
-        'choose-option' => 'Choose an option'
+        'choose-option' => 'Choose an option',
+        'sale' => 'Sale',
+        'new' => 'New',
+        'empty' => 'No products available in this category.',
+        'add-to-cart' => 'Add To Cart',
+        'buy-now' => 'Buy Now',
+        'whoops' => 'Whoops!'
     ],
 
     'wishlist' => [
@@ -219,7 +221,8 @@ return [
             ],
 
             'title' => 'Shopping Cart',
-            'empty' => 'Shopping Cart Is Empty',
+            'empty' => 'Your shopping cart is empty.',
+            'update-cart' => 'Update Cart',
             'continue-shopping' => 'Continue Shopping',
             'proceed-to-checkout' => 'Proceed To Checkout',
             'remove' => 'Remove',
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
index 53ac65869..f8b072085 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
@@ -22,7 +22,9 @@
                     <form action="{{ route('shop.checkout.cart.update') }}" method="POST" @submit.prevent="onSubmit">
 
                         <div class="cart-item-list" style="margin-top: 0">
+
                             @csrf
+
                             @foreach($cart->items as $item)
 
                                 <?php
@@ -76,11 +78,14 @@
                                 </div>
                             @endforeach
                         </div>
+
                         <div class="misc-controls">
                             <a href="{{ route('shop.home.index') }}" class="link">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
 
                             <div>
-                                <input type="submit" class="btn btn-lg btn-primary" value="Update Cart" />
+                                <button type="submit" class="btn btn-lg btn-primary">
+                                    {{ __('shop::app.checkout.cart.update-cart') }}
+                                </button>
 
                                 @if (!cart()->hasError())
                                     <a href="{{ route('shop.checkout.onepage.index') }}" class="btn btn-lg btn-primary">
@@ -96,9 +101,21 @@
                     @include('shop::checkout.total.summary', ['cart' => $cart])
                 </div>
             </div>
+
         @else
+
             <div class="title">
-                {{ __('shop::app.checkout.cart.empty') }}
+                {{ __('shop::app.checkout.cart.title') }}
+            </div>
+
+            <div class="cart-content">
+                <p>
+                    {{ __('shop::app.checkout.cart.empty') }}
+                </p>
+
+                <p style="display: inline-block;">
+                    <a style="display: inline-block;" href="{{ route('shop.home.index') }}" class="btn btn-lg btn-primary">{{ __('shop::app.checkout.cart.continue-shopping') }}</a>
+                </p>
             </div>
 
         @endif
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index 2a7be34ab..2f0b3455d 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -1,11 +1,14 @@
-
 <div class="header" id="header">
     <div class="header-top">
         <div class="left-content">
             <ul class="logo-container">
                 <li>
                     <a href="{{ route('shop.home.index') }}">
-                        <img class="logo" src="{{ asset('vendor/webkul/shop/assets/images/logo.svg') }}" />
+                        @if ($logo = core()->getCurrentChannel()->logo_url)
+                            <img class="logo" src="{{ $logo }}" />
+                        @else
+                            <img class="logo" src="{{ bagisto_asset('images/logo.svg') }}" />
+                        @endif
                     </a>
                 </li>
             </ul>
@@ -13,6 +16,7 @@
             <ul class="search-container">
                 <li class="search-group">
                     <input type="search" class="search-field" placeholder="Search for products">
+
                     <div class="search-icon-wrapper">
                         <span class="icon icon-search"></span>
                     </div>
@@ -29,6 +33,7 @@
                             <i class="icon arrow-down-icon active"></i>
                         </div>
                     </div>
+
                     @guest('customer')
                         <div class="dropdown-list bottom-right" style="display: none;">
                             <div class="dropdown-container">
@@ -44,6 +49,7 @@
 
                         </div>
                     @endguest
+
                     @auth('customer')
                         <div class="dropdown-list bottom-right" style="display: none; max-width: 230px;">
                             <div class="dropdown-container">
@@ -70,6 +76,7 @@
                     @endauth
                 </li>
             </ul>
+
             <ul class="cart-dropdown-container">
 
                 <?php $cart = cart()->getCart(); ?>
@@ -79,27 +86,30 @@
                 <li class="cart-dropdown">
                     <span class="icon cart-icon"></span>
                     @if($cart)
-                        @php
-                            $items = $cart->items;
-                        @endphp
+                        <?php $items = $cart->items; ?>
+
                         <div class="dropdown-toggle">
                             <div style="display: inline-block; cursor: pointer;">
                                 @if($cart->items_qty - intval($cart->items_qty) > 0)
+
                                     <span class="name">
                                         Cart
                                         <span class="count"> ({{ $cart->items_qty }})</span>
                                     </span>
+
                                 @else
+
                                     <span class="name">
                                         Cart
                                         <span class="count"> ({{ intval($cart->items_qty) }})</span>
                                     </span>
+
                                 @endif
                             </div>
 
                             <i class="icon arrow-down-icon active"></i>
-
                         </div>
+
                         <div class="dropdown-list" style="display: none; top: 50px; right: 0px">
                             <div class="dropdown-container">
                                 <div class="dropdown-cart">
@@ -110,41 +120,45 @@
                                     <div class="dropdown-content">
                                         @foreach($items as $item)
                                             @if($item->type == "configurable")
-                                            <div class="item">
-                                                <div class="item-image" >
-                                                    @php
-                                                        $images = $productImageHelper->getProductBaseImage($item->child->product);
-                                                    @endphp
-                                                    <img src="{{ $images['small_image_url'] }}" />
+
+                                                <div class="item">
+                                                    <div class="item-image" >
+                                                        @php
+                                                            $images = $productImageHelper->getProductBaseImage($item->child->product);
+                                                        @endphp
+                                                        <img src="{{ $images['small_image_url'] }}" />
+                                                    </div>
+
+                                                    <div class="item-details">
+
+                                                        <div class="item-name">{{ $item->child->name }}</div>
+
+                                                        <div class="item-price">{{ $item->total }}</div>
+
+                                                        <div class="item-qty">Quantity - {{ $item->quantity }}</div>
+                                                    </div>
                                                 </div>
 
-                                                <div class="item-details">
-
-                                                    <div class="item-name">{{ $item->child->name }}</div>
-
-                                                    <div class="item-price">{{ $item->total }}</div>
-
-                                                    <div class="item-qty">Quantity - {{ $item->quantity }}</div>
-                                                </div>
-                                            </div>
                                             @else
-                                            <div class="item">
-                                                <div class="item-image" >
-                                                    @php
-                                                        $images = $productImageHelper->getProductBaseImage($item->product);
-                                                    @endphp
-                                                    <img src="{{ $images['small_image_url'] }}" />
+
+                                                <div class="item">
+                                                    <div class="item-image" >
+                                                        @php
+                                                            $images = $productImageHelper->getProductBaseImage($item->product);
+                                                        @endphp
+                                                        <img src="{{ $images['small_image_url'] }}" />
+                                                    </div>
+
+                                                    <div class="item-details">
+
+                                                        <div class="item-name">{{ $item->name }}</div>
+
+                                                        <div class="item-price">{{ $item->total }}</div>
+
+                                                        <div class="item-qty">Quantity - {{ $item->quantity }}</div>
+                                                    </div>
                                                 </div>
 
-                                                <div class="item-details">
-
-                                                    <div class="item-name">{{ $item->name }}</div>
-
-                                                    <div class="item-price">{{ $item->total }}</div>
-
-                                                    <div class="item-qty">Quantity - {{ $item->quantity }}</div>
-                                                </div>
-                                            </div>
                                             @endif
                                         @endforeach
                                     </div>
@@ -157,7 +171,9 @@
                                 </div>
                             </div>
                         </div>
+
                     @else
+
                         <div class="dropdown-toggle">
                             <div style="display: inline-block; cursor: pointer;">
 
@@ -193,6 +209,7 @@
                                 </div>
                             </div>
                         @endguest
+
                         @auth('customer')
                             <div class="dropdown-list bottom-right" style="display: none;">
                                 <div class="dropdown-container">
@@ -221,6 +238,7 @@
                         @endauth
                     </li>
                 </ul>
+
                 <ul class="resp-cart-dropdown-container">
 
                     <li class="cart-dropdown">
@@ -277,23 +295,23 @@
             hamMenu.addEventListener("click", header);
 
             // for header responsive icon
-            function header(){
+            function header() {
                 var className = document.getElementById(this.id).className;
-                if(className === 'icon icon-search' ){
+                if(className === 'icon icon-search' ) {
                     search.classList.remove("icon-search");
                     search.classList.add("icon-menu-close");
                     hamMenu.classList.remove("icon-menu-close");
                     hamMenu.classList.add("icon-menu");
                     searchResponsive.style.display = 'block';
                     navResponsive.style.display = 'none';
-                }else if(className === 'icon icon-menu'){
+                } else if(className === 'icon icon-menu') {
                     hamMenu.classList.remove("icon-menu");
                     hamMenu.classList.add("icon-menu-close");
                     search.classList.remove("icon-menu-close");
                     search.classList.add("icon-search");
                     searchResponsive.style.display = 'none';
                     navResponsive.style.display = 'block';
-                }else{
+                } else {
                     search.classList.remove("icon-menu-close");
                     search.classList.add("icon-search");
                     hamMenu.classList.remove("icon-menu-close");
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
index c158bcb57..e40ec3aef 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ config('app.locale') }}">
+<html lang="{{ app()->getLocale() }}">
 
 <head>
 
@@ -11,14 +11,23 @@
     <link rel="stylesheet" href="{{ bagisto_asset('css/shop.css') }}">
     <link rel="stylesheet" href="{{ asset('vendor/webkul/ui/assets/css/ui.css') }}">
 
+    @if ($favicon = core()->getCurrentChannel()->favicon_url)
+        <link rel="icon" sizes="16x16" href="{{ $favicon }}" />
+    @else
+        <link rel="icon" sizes="16x16" href="{{ bagisto_asset('images/favicon.ico') }}" />
+    @endif
+
     @yield('head')
 
+    @section('seo')
+        <meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
+    @show
+
     @yield('css')
 
 </head>
 
 <body>
-
     <div id="app">
         <flash-wrapper ref='flashes'></flash-wrapper>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
index 67e0e56fa..569ae11f4 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php
@@ -1 +1,3 @@
-<button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
\ No newline at end of file
+<button class="btn btn-lg btn-primary addtocart">
+    {{ __('shop::app.products.add-to-cart') }}
+</button>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
index a46559ed5..115754deb 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php
@@ -1 +1,3 @@
-<button class="btn btn-lg btn-primary buynow">BUY NOW!</button>
\ No newline at end of file
+<button class="btn btn-lg btn-primary buynow">
+    {{ __('shop::app.products.buy-now') }}
+</button>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
index e9eb00dc5..fa3a1c718 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php
@@ -1,40 +1,64 @@
 @extends('shop::layouts.master')
 
-@section('content-wrapper')
+@section('page_title')
+    {{ $category->meta_title ?? $category->name }}
+@stop
+
+@section('seo')
+    <meta name="description" content="{{ $category->meta_description }}"/>
+    <meta name="description" content="{{ $category->meta_keywords }}"/>
+@stop
+
+@section('content-wrapper')
+    @inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
 
-@inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository')
     <div class="main">
         <div class="category-container">
+
             @include ('shop::products.list.layered-navigation')
 
             <div class="category-block">
                 <div class="hero-image mb-35">
-                <img    src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
+                    <img src="https://images.pexels.com/photos/428338/pexels-photo-428338.jpeg?cs=srgb&dl=adolescent-casual-cute-428338.jpg&fm=jpg" />
                 </div>
 
                 <?php $products = $productRepository->findAllByCategory($category->id); ?>
+                
+                @if ($products->count())
 
-                @include ('shop::products.list.toolbar')
+                    @include ('shop::products.list.toolbar')
 
-                @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
+                    @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar')
 
-                @if ($toolbarHelper->getCurrentMode() == 'grid')
-                    <div class="product-grid-3">
-                        @foreach ($products as $product)
-                            @include ('shop::products.list.card', ['product' => $product])
-                        @endforeach
+                    @if ($toolbarHelper->getCurrentMode() == 'grid')
+                        <div class="product-grid-3">
+                            @foreach ($products as $product)
+                                @include ('shop::products.list.card', ['product' => $product])
+                            @endforeach
+                        </div>
+                    @else
+                        <div class="product-list">
+                            @foreach ($products as $product)
+                                @include ('shop::products.list.card', ['product' => $product])
+                            @endforeach
+                        </div>
+                    @endif
+
+                    <div class="bottom-toolbar">
+                        {{ $products->appends(request()->input())->links() }}
                     </div>
+
                 @else
-                    <div class="product-list">
-                        @foreach ($products as $product)
-                            @include ('shop::products.list.card', ['product' => $product])
-                        @endforeach
-                    </div>
-                @endif
 
-                <div class="bottom-toolbar">
-                    {{ $products->appends(request()->input())->links() }}
-                </div>
+                    <div class="product-list empty">
+                        <h2>{{ __('shop::app.products.whoops') }}</h2>
+
+                        <p>
+                            {{ __('shop::app.products.empty') }}
+                        </p>
+                    </div>
+
+                @endif
             </div>
         </div>
     </div>
@@ -48,42 +72,42 @@
             var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0];
             var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0];
 
-            if(sort && filter){
+            if(sort && filter) {
                 sort.addEventListener("click", sortFilter);
                 filter.addEventListener("click", sortFilter);
             }
 
-            function sortFilter(){
+            function sortFilter() {
                 var className = document.getElementById(this.id).className;
 
-                if(className === 'icon sort-icon'){
+                if(className === 'icon sort-icon') {
                     sort.classList.remove("sort-icon");
                     sort.classList.add("icon-menu-close-adj");
 
                     filter.classList.remove("icon-menu-close-adj");
                     filter.classList.add("filter-icon");
 
-                    sortLimit.style.display ="flex";
-                    sortLimit.style.justifyContent="space-between";
+                    sortLimit.style.display = "flex";
+                    sortLimit.style.justifyContent = "space-between";
                     layerFilter.style.display ="none";
-                }else if(className === 'icon filter-icon'){
+                } else if(className === 'icon filter-icon') {
                     filter.classList.remove("filter-icon");
                     filter.classList.add("icon-menu-close-adj");
 
                     sort.classList.remove("icon-menu-close-adj");
                     sort.classList.add("sort-icon");
 
-                    layerFilter.style.display ="block";
-                    sortLimit.style.display ="none";
-                }else{
+                    layerFilter.style.display = "block";
+                    sortLimit.style.display = "none";
+                } else {
                     sort.classList.remove("icon-menu-close-adj");
                     sort.classList.add("sort-icon");
 
                     filter.classList.remove("icon-menu-close-adj");
                     filter.classList.add("filter-icon");
 
-                    sortLimit.style.display ="none";
-                    layerFilter.style.display ="none";
+                    sortLimit.style.display = "none";
+                    layerFilter.style.display = "none";
                 }
             }
         });
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
index 7ab65e6eb..e3ed3934e 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/card.blade.php
@@ -4,6 +4,12 @@
 
     <?php $productBaseImage = $productImageHelper->getProductBaseImage($product); ?>
 
+    @if($product->new)
+        <div class="sticker new">
+            {{ __('shop::app.products.new') }}
+        </div>
+    @endif
+
     <div class="product-image">
         <a href="{{ route('shop.products.index', $product->url_key) }}" title="{{ $product->name }}">
             <img src="{{ $productBaseImage['medium_image_url'] }}" />
@@ -32,7 +38,7 @@
             @include ('shop::products.add-to', ['product' => $product])
         @else
             @if($product->type == "configurable")
-                <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</a>
+                <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">{{ __('shop::app.products.add-to-cart') }}</a>
                 @include('shop::products.wishlist')
             @else
                 <div class="cart-wish-wrap">
@@ -41,7 +47,7 @@
                         <input type="hidden" name="product" value="{{ $product->id }}">
                         <input type="hidden" name="quantity" value="1">
                         <input type="hidden" value="false" name="is_configurable">
-                        <button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.home.product-card.add-to-cart') }}</button>
+                        <button class="btn btn-lg btn-primary addtocart">{{ __('shop::app.products.add-to-cart') }}</button>
                     </form>
                     @include('shop::products.wishlist')
                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
index 9a17ee063..610cc632c 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/price.blade.php
@@ -12,6 +12,10 @@
 
         @if ($priceHelper->haveSpecialPrice($product))
 
+            <div class="sticker sale">
+                {{ __('shop::app.products.sale') }}
+            </div>
+
             <span class="regular-price">{{ core()->currency($product->price) }}</span>
 
             <span class="special-price">{{ core()->currency($priceHelper->getSpecialPrice($product)) }}</span>
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
index 6f392fc40..5a48e237e 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -1,14 +1,20 @@
 @extends('shop::layouts.master')
 
 @section('page_title')
-    {{ $product->name }}
+    {{ $product->meta_title ?? $product->name }}
+@stop
+
+@section('seo')
+    <meta name="description" content="{{ $product->meta_description }}"/>
+    <meta name="description" content="{{ $product->meta_keywords }}"/>
 @stop
 
 @section('content-wrapper')
     <section class="product-detail">
-        <div class="category-breadcrumbs">
+        <!--<div class="category-breadcrumbs">
             <span class="breadcrumb">Home</span> > <span class="breadcrumb">Men</span> > <span class="breadcrumb">Slit Open Jeans</span>
-        </div>
+        </div>-->
+        
         <div class="layouter">
             <form method="POST" action="{{ route('cart.add', $product->id) }}" @submit.prevent="onSubmit">
                 @csrf()
@@ -23,13 +29,12 @@
                         <span>{{ $product->name }}</span>
                     </div>
 
-                    {{-- @include ('shop::products.review', ['product' => $product]) --}}
+                    @include ('shop::products.review', ['product' => $product])
 
                     @include ('shop::products.price', ['product' => $product])
 
                     @include ('shop::products.view.stock')
 
-
                     <div class="description">
                         {{ $product->short_description }}
                     </div>
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/favicon.ico b/packages/Webkul/Ui/src/Resources/assets/images/favicon.ico
new file mode 100644
index 000000000..e9c217bb3
Binary files /dev/null and b/packages/Webkul/Ui/src/Resources/assets/images/favicon.ico differ
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 03e56a6be..304d4202b 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -574,7 +574,12 @@ h2 {
 }
 
 .accordian {
+    display: inline-block;
+    width: 100%;
+
     .accordian-header {
+        width: 100%;
+        display: inline-block;
         font-size: 18px;
         color: $font-color;
         border-bottom: solid 1px $border-color;
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index 607334527..b181cfa3e 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -120,92 +120,6 @@
   height: 18px;
 }
 
-.product-card .product-image {
-  max-height: 350px;
-  max-width: 280px;
-  margin-bottom: 10px;
-  background: #F2F2F2;
-}
-
-.product-card .product-image img {
-  display: block;
-  width: 100%;
-}
-
-.product-card .product-name {
-  margin-bottom: 14px;
-  width: 100%;
-  color: #242424;
-}
-
-.product-card .product-name a {
-  color: #242424;
-}
-
-.product-card .product-description {
-  display: none;
-}
-
-.product-card .product-ratings {
-  width: 100%;
-}
-
-.product-card .product-ratings .icon {
-  width: 16px;
-  height: 16px;
-}
-
-.product-card .cart-wish-wrap {
-  display: -webkit-inline-box;
-  display: -ms-inline-flexbox;
-  display: inline-flex;
-  -webkit-box-pack: start;
-      -ms-flex-pack: start;
-          justify-content: flex-start;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  height: 40px;
-}
-
-.product-card .cart-wish-wrap .addtocart {
-  margin-right: 10px;
-  text-transform: uppercase;
-}
-
-.product-card .cart-wish-wrap .add-to-wishlist {
-  margin-top: 5px;
-}
-
-.product-grid-4 {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
-  grid-auto-rows: auto;
-  grid-column-gap: 48px;
-  grid-row-gap: 15px;
-}
-
-.product-grid-3 {
-  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
-  grid-gap: 27px;
-  grid-auto-rows: auto;
-}
-
-@media only screen and (max-width: 854px) {
-  .product-grid-4 {
-    grid-template-columns: 29.5% 29.5% 29.5%;
-    grid-column-gap: 35px;
-  }
-}
-
-@media only screen and (max-width: 653px) {
-  .product-grid-4 {
-    grid-template-columns: 48.5% 48.5%;
-    grid-column-gap: 17px;
-  }
-}
-
 @media only screen and (max-width: 425px) {
   .product-card {
     font-size: 90%;
@@ -616,6 +530,119 @@ body {
   display: block;
 }
 
+.main-container-wrapper .product-grid-4 {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
+  grid-auto-rows: auto;
+  grid-column-gap: 48px;
+  grid-row-gap: 15px;
+}
+
+.main-container-wrapper .product-grid-3 {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(235px, 1fr));
+  grid-gap: 27px;
+  grid-auto-rows: auto;
+}
+
+@media only screen and (max-width: 854px) {
+  .main-container-wrapper .product-grid-4 {
+    grid-template-columns: 29.5% 29.5% 29.5%;
+    grid-column-gap: 35px;
+  }
+}
+
+@media only screen and (max-width: 653px) {
+  .main-container-wrapper .product-grid-4 {
+    grid-template-columns: 48.5% 48.5%;
+    grid-column-gap: 17px;
+  }
+}
+
+.main-container-wrapper .product-card {
+  position: relative;
+}
+
+.main-container-wrapper .product-card .product-image {
+  max-height: 350px;
+  max-width: 280px;
+  margin-bottom: 10px;
+  background: #F2F2F2;
+}
+
+.main-container-wrapper .product-card .product-image img {
+  display: block;
+  width: 100%;
+}
+
+.main-container-wrapper .product-card .product-name {
+  margin-bottom: 14px;
+  width: 100%;
+  color: #242424;
+}
+
+.main-container-wrapper .product-card .product-name a {
+  color: #242424;
+}
+
+.main-container-wrapper .product-card .product-description {
+  display: none;
+}
+
+.main-container-wrapper .product-card .product-ratings {
+  width: 100%;
+}
+
+.main-container-wrapper .product-card .product-ratings .icon {
+  width: 16px;
+  height: 16px;
+}
+
+.main-container-wrapper .product-card .cart-wish-wrap {
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-pack: start;
+      -ms-flex-pack: start;
+          justify-content: flex-start;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  height: 40px;
+}
+
+.main-container-wrapper .product-card .cart-wish-wrap .addtocart {
+  margin-right: 10px;
+  text-transform: uppercase;
+}
+
+.main-container-wrapper .product-card .cart-wish-wrap .add-to-wishlist {
+  margin-top: 5px;
+}
+
+.main-container-wrapper .product-card .sticker {
+  border-radius: 100px;
+  position: absolute;
+  top: 10px;
+  left: 10px;
+  text-transform: uppercase;
+  padding: 4px 13px;
+  font-size: 14px;
+  color: #fff;
+}
+
+.main-container-wrapper .product-card .sticker.sale {
+  background: #FF6472;
+}
+
+.main-container-wrapper .product-card .sticker.new {
+  background: #2ED04C;
+}
+
+.main-container-wrapper .product-list {
+  min-height: 200px;
+}
+
 .main-container-wrapper .product-list .product-card {
   width: 100%;
   display: inline-block;
@@ -642,6 +669,10 @@ body {
   margin-bottom: 0;
 }
 
+.main-container-wrapper .product-list.empty h2 {
+  font-size: 20px;
+}
+
 .main-container-wrapper section.featured-products {
   display: block;
   margin-bottom: 5%;
@@ -1685,6 +1716,7 @@ section.product-detail div.layouter form div.product-image-group .add-to-buttons
   width: 49%;
   background: black;
   white-space: nowrap;
+  text-transform: uppercase;
 }
 
 section.product-detail div.layouter form div.product-image-group .add-to-buttons .buynow {
@@ -1692,6 +1724,7 @@ section.product-detail div.layouter form div.product-image-group .add-to-buttons
   width: 49%;
   float: right;
   white-space: nowrap;
+  text-transform: uppercase;
 }
 
 section.product-detail div.layouter form .details {
diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js
index 52f027425..591136098 100644
--- a/public/themes/default/assets/js/shop.js
+++ b/public/themes/default/assets/js/shop.js
@@ -30693,11 +30693,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 //
 //
 //
-//
-//
-//
-//
-//
 
 // define the item component
 /* harmony default export */ __webpack_exports__["default"] = ({
@@ -30735,36 +30730,15 @@ var render = function() {
   return _c(
     "ul",
     { staticClass: "nav" },
-    [
-      _vm._l(_vm.items, function(item, index) {
-        return _c("category-item", {
-          key: index,
-          attrs: { url: _vm.url, item: item, parent: index }
-        })
-      }),
-      _vm._v(" "),
-      _vm._m(0)
-    ],
-    2
+    _vm._l(_vm.items, function(item, index) {
+      return _c("category-item", {
+        key: index,
+        attrs: { url: _vm.url, item: item, parent: index }
+      })
+    })
   )
 }
-var staticRenderFns = [
-  function() {
-    var _vm = this
-    var _h = _vm.$createElement
-    var _c = _vm._self._c || _h
-    return _c("li", [
-      _c("img", {
-        attrs: {
-          src:
-            "http://localhost/bagisto/public/vendor/webkul/shop/assets/images/offer-zone.svg"
-        }
-      }),
-      _vm._v(" "),
-      _c("span", [_vm._v("Offer Zone")])
-    ])
-  }
-]
+var staticRenderFns = []
 render._withStripped = true
 module.exports = { render: render, staticRenderFns: staticRenderFns }
 if (false) {