diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php
new file mode 100644
index 000000000..918aca539
--- /dev/null
+++ b/packages/Webkul/Admin/src/Exceptions/Handler.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Webkul\Admin\Exceptions;
+
+use Exception;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class Handler extends ExceptionHandler
+{
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Exception  $exception
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request, Exception $exception)
+    {
+
+        if ($exception instanceof HttpException) {
+            $statusCode = $exception->getStatusCode();
+
+            if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false){
+                return response(view('admin::errors.'.$statusCode, [
+                    'msg' => $exception->getMessage(),
+                    'code' => $statusCode
+                ]), $statusCode);
+            }else {
+                return response(view('shop::errors.'.$statusCode, [
+                    'msg' => $exception->getMessage(),
+                    'code' => $statusCode
+                ]), $statusCode);
+            }
+
+        }
+
+        return parent::render($request, $exception);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Http/Controllers/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
similarity index 98%
rename from packages/Webkul/Core/src/Http/Controllers/CustomerController.php
rename to packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
index 17c8ead1d..f883e4283 100644
--- a/packages/Webkul/Core/src/Http/Controllers/CustomerController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Webkul\Core\Http\Controllers;
+namespace Webkul\Admin\Http\Controllers\Customer;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index fc4fc2d19..0823264c1 100644
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -41,27 +41,27 @@ Route::group(['middleware' => ['web']], function () {
 
             //Customers Management Routes
 
-            Route::get('customers', 'Webkul\Core\Http\Controllers\CustomerController@index')->defaults('_config', [
+            Route::get('customer', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [
                 'view' => 'admin::customers.index'
             ])->name('admin.customer.index');
 
-            Route::get('customers/orders', 'Webkul\Core\Http\Controllers\CustomerController@index')->defaults('_config',[
+            Route::get('customer/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[
                 'view' => 'admin::customers.orders.index'
             ])->name('admin.customer.orders.index');
 
-            Route::get('customers/create', 'Webkul\Core\Http\Controllers\CustomerController@create')->defaults('_config',[
+            Route::get('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[
                 'view' => 'admin::customers.create'
             ])->name('admin.customer.create');
 
-            Route::post('customers/create', 'Webkul\Core\Http\Controllers\CustomerController@store')->defaults('_config',[
+            Route::post('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[
                 'redirect' => 'admin.customer.index'
             ])->name('admin.customer.store');
 
-            Route::get('customers/edit/{id}', 'Webkul\Core\Http\Controllers\CustomerController@edit')->defaults('_config',[
+            Route::get('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[
                 'view' => 'admin::customers.edit'
             ])->name('admin.customer.edit');
 
-            Route::put('customers/edit/{id}', 'Webkul\Core\Http\Controllers\CustomerController@update')->defaults('_config', [
+            Route::put('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [
                 'redirect' => 'admin.customer.index'
             ])->name('admin.customer.update');
 
@@ -371,8 +371,6 @@ Route::group(['middleware' => ['web']], function () {
                 'redirect' => 'admin.channels.index'
             ])->name('admin.channels.update');
 
-
-
             // Admin Profile route
             Route::get('/account', 'Webkul\User\Http\Controllers\AccountController@edit')->defaults('_config', [
                 'view' => 'admin::account.edit'
diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
index 5e94fd48d..1fe463fbb 100644
--- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
+++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php
@@ -6,6 +6,8 @@ use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Blade;
 use Webkul\Admin\Providers\EventServiceProvider;
+use Illuminate\Contracts\Debug\ExceptionHandler;
+use Webkul\Admin\Exceptions\Handler;
 
 class AdminServiceProvider extends ServiceProvider
 {
@@ -29,6 +31,11 @@ class AdminServiceProvider extends ServiceProvider
         $this->composeView();
 
         $this->app->register(EventServiceProvider::class);
+
+        $this->app->bind(
+            ExceptionHandler::class,
+            Handler::class
+        );
     }
 
     /**
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
index 223923435..4c26d509b 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
@@ -6,8 +6,8 @@
 
 @section('content')
     <div class="content">
-        
-        <form method="POST" action="{{ route('admin.catalog.categories.store') }}" @submit.prevent="onSubmit">
+
+        <form method="POST" action="{{ route('admin.catalog.categories.store') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
 
             <div class="page-header">
                 <div class="page-title">
@@ -108,7 +108,7 @@
 
                 </div>
             </div>
-        
+
         </form>
     </div>
 @stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
new file mode 100644
index 000000000..b351a4191
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
@@ -0,0 +1,30 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+
+@stop
+
+@section('content')
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E"> {{ $code }}</div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">Page Not Found</div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.</div>
+
+                <a href="{{ route('admin.dashboard.index') }}">GO TO HOME</a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+@stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
index 3a46d37a5..b351a4191 100644
--- a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
@@ -1,13 +1,30 @@
 @extends('admin::layouts.content')
 
 @section('page_title')
-    {{ __('admin::app.catalog.categories.edit-title') }}
+
 @stop
 
 @section('content')
-    <div class="content">
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
 
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
 
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E"> {{ $code }}</div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">Page Not Found</div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.</div>
+
+                <a href="{{ route('admin.dashboard.index') }}">GO TO HOME</a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
 
     </div>
 @stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
new file mode 100644
index 000000000..b351a4191
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
@@ -0,0 +1,30 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+
+@stop
+
+@section('content')
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E"> {{ $code }}</div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">Page Not Found</div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.</div>
+
+                <a href="{{ route('admin.dashboard.index') }}">GO TO HOME</a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+@stop
\ No newline at end of file
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 e7a25358c..a47db30c1 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
@@ -13,14 +13,14 @@
         @yield('head')
 
         @yield('css')
-        
+
     </head>
-    
+
     <body>
         <div id="app">
 
             <flash-wrapper ref='flashes'></flash-wrapper>
-        
+
             @include ('admin::layouts.nav-top')
 
             @include ('admin::layouts.nav-left')
@@ -44,8 +44,10 @@
             @endif
 
             window.serverErrors = [];
-            @if (count($errors))
-                window.serverErrors = @json($errors->getMessages());
+            @if(isset($errors))
+                @if (count($errors))
+                    window.serverErrors = @json($errors->getMessages());
+                @endif
             @endif
         </script>
 
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 36a6fc1bd..a52a6a85d 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/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php
index 9fbda2311..5fd7ef670 100644
--- a/packages/Webkul/Category/src/Models/Category.php
+++ b/packages/Webkul/Category/src/Models/Category.php
@@ -11,5 +11,5 @@ class Category extends TranslatableModel
 
     public $translatedAttributes = ['name', 'description', 'slug', 'meta_title', 'meta_description', 'meta_keywords'];
 
-    protected $fillable = ['position', 'status', 'parent_id'];
+    protected $fillable = ['position', 'status', 'parent_id','image'];
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
index b687cc046..31a92c207 100644
--- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
+++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php
@@ -64,7 +64,7 @@ class ShopServiceProvider extends ServiceProvider
 
         Event::listen('customer.menu.build', function ($menu) {
             $menu->add('profile', 'Profile', 'customer.profile.index', 1);
-            
+
             $menu->add('orders', 'Orders', 'customer.orders.index', 2);
 
             $menu->add('address', 'Address', 'customer.address.index', 3);
@@ -74,4 +74,4 @@ class ShopServiceProvider extends ServiceProvider
             $menu->add('wishlist', 'Wishlist', 'customer.wishlist.index', 5);
         });
     }
-}
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue
index 96c3aca5e..31126425b 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue
@@ -4,7 +4,7 @@
         <a :href="url+'/categories/'+this.item['translations'][0].slug">{{ this.item['translations'][0].name }}&emsp;<i class="icon dropdown-right-icon"
         v-if="haveChildren && item.parent_id != null"></i></a>
 
-        <i :class="[show ? 'icon arrow-down-icon mt-15' : 'icon dropdown-right-icon mt-15']"
+        <i :class="[show ? 'icon icon-arrow-down mt-15' : 'icon dropdown-right-icon mt-15']"
         v-if="haveChildren"  @click="showOrHide"></i>
 
         <ul v-if="haveChildren && show">
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 0c6107496..36cb61a43 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -426,6 +426,7 @@ section.slider-block {
         }
         ul.right-responsive {
             display: none;
+            cursor: pointer;
 
             li {
                 margin-right : 5px;
@@ -666,6 +667,10 @@ section.slider-block {
             border-bottom: 1px solid $border-color;
         }
 
+        .nav li ul  {
+            padding-left: 30px;
+        }
+
         .nav li:first-child {
             border-top: 1px solid $border-color;
         }
@@ -674,6 +679,7 @@ section.slider-block {
             float:none;
             height: 45px;
             display: none;
+            border: none;
 
             img {
                 margin-right:6px;
@@ -888,23 +894,6 @@ section.product-detail {
                 height: 650px;
                 max-width: 604px;
 
-                .loader {
-                    border: 16px solid $border-color;
-                    border-top: 16px solid $brand-color;
-                    border-radius: 50%;
-                    width: 50px;
-                    height: 50px;
-                    animation: spin 2s linear infinite;
-                    margin-left: 20%;
-                    position: absolute;
-                    margin-top: 200px;
-                }
-
-                @keyframes spin {
-                    0% { transform: rotate(0deg); }
-                    100% { transform: rotate(360deg); }
-                }
-
                 div {
                     display: flex;
                     flex-direction: row;
@@ -2061,4 +2050,4 @@ section.review {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss
index d6d741b6b..e1757818f 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss
@@ -15,12 +15,7 @@
     background-image:URL('../images/icon-menu-close.svg');
     width: 24px;
     height: 24px;
-}
-
-.icon-menu-close-adj {
-    background-image:URL('../images/cross-icon-adj.svg');
-    width: 32px;
-    height: 32px;
+    margin-left:auto;
 }
 
 .grid-view-icon {
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss
index 57b99801d..c43623a87 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss
@@ -169,6 +169,7 @@ body {
                         }
 
                         .sort-filter {
+                            cursor: pointer;
                             display: inline-block;
                             margin-top: 10px;
                         }
@@ -196,21 +197,6 @@ body {
 
 }
 
-// @media only screen and (max-width: 660px) {
-//     .product-grid-3 {
-//         grid-template-columns: 48.5% 48.5%;
-//         grid-column-gap: 20px;
-//     }
-// }
-
-// @media only screen and (max-width: 480px) {
-//     .product-grid-3 {
-//         grid-template-columns: 47.5% 47.5%;
-//     }
-// }
-
-
-
 //layered filter wrapper styles
 .layered-filter-wrapper {
     width: 25%;
@@ -299,7 +285,6 @@ body {
 }
 
 .responsive-layred-filter {
-    @extend .layered-filter-wrapper;
     width: 100%;
     float: none;
     padding-right: 0px;
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
index ce7c36d75..5a2a87908 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php
@@ -13,6 +13,7 @@
     <div class="account-layout">
 
         <div class="account-head">
+            <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
             <span class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
 
             @if(!$address->isEmpty())
@@ -21,6 +22,8 @@
                     {{ __('shop::app.customer.account.address.index.edit') }}
                 </a>
             </span>
+            @else
+            <span></span>
             @endif
             <div class="horizontal-rule"></div>
         </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index e6bdef52b..a33afaa04 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -8,6 +8,7 @@
 
         <div class="account-layout">
             <div class="account-head mb-15">
+                {{--  <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>  --}}
                 <div class="account-heading">{{ __('shop::app.customer.account.address.create.title') }}</div>
             </div>
             <form method="post" action="{{ route('customer.address.create') }}" @submit.prevent="onSubmit">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php
index efd7966d1..49ff25e8a 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php
@@ -5,3 +5,29 @@
         <h1>Account Index Page</h1>
     </div>
 @endsection
+@push('scripts')
+<script>
+    $(document).ready(function(){
+        var sideMenuTitle = document.getElementById("responsive-side-menu");
+        var downIcon = document.getElementById("down-icon");
+        var accountSideMenu = document.getElementsByClassName("account-side-menu");
+
+        sideMenuTitle.addEventListener("click", function(){
+            if(downIcon.className == 'icon icon-arrow-down right'){
+                for(let i=0 ; i < accountSideMenu.length ; i++){
+                    accountSideMenu[i].style.display="block";
+                }
+
+                downIcon.classList.remove("icon","icon-arrow-down","right");
+                downIcon.classList.add("icon","icon-arrow-up","right");
+            }else{
+                for(let i=0 ; i < accountSideMenu.length ; i++){
+                    accountSideMenu[i].style.display="none";
+                }
+
+                downIcon.classList.remove("icon","icon-arrow-up","right");
+                downIcon.classList.add("icon","icon-arrow-down","right");
+            }
+        });
+    });
+@endpush
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
index 3e4998dc7..4e550a2b5 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php
@@ -1,6 +1,10 @@
+<div class="responsive-side-menu" id="responsive-side-menu">
+    Menu
+    <i class="icon icon-arrow-down right" id="down-icon"></i>
+</div>
+
 <ul class="account-side-menu">
     @foreach($menu->items as $menuItem)
-
         <li class="menu-item {{ $menu->getActive($menuItem) }}">
             <a href="{{ $menuItem['url'] }}">
                 {{ $menuItem['name'] }}
@@ -8,41 +12,5 @@
 
             <i class="icon angle-right-icon"></i>
         </li>
-
     @endforeach
-</ul>
-
-
-@push('scripts')
-
-<script>
-
-    $(document).ready(function(){
-
-        var sideMenuTitle = document.getElementById("side-menu-title");
-        var downIcon = document.getElementById("down-icon");
-        var accountSideMenu = document.getElementsByClassName("account-side-menu");
-
-        sideMenuTitle.addEventListener("click", function(){
-            if(downIcon.className == 'icon icon-arrow-down right'){
-                for(let i=0 ; i < accountSideMenu.length ; i++){
-                    accountSideMenu[i].style.display="block";
-                }
-                downIcon.classList.remove("icon","icon-arrow-down","right");
-                downIcon.classList.add("icon","icon-arrow-up","right");
-            }else{
-                for(let i=0 ; i < accountSideMenu.length ; i++){
-                    accountSideMenu[i].style.display="none";
-                }
-                downIcon.classList.remove("icon","icon-arrow-up","right");
-                downIcon.classList.add("icon","icon-arrow-down","right");
-            }
-        });
-
-    });
-
-</script>
-
-@endpush
-
-
+</ul>
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
index fe429af47..8bf634608 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
@@ -12,7 +12,11 @@
         <div class="account-layout">
 
             <div class="account-head mb-10">
-                <div class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</div>
+                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+
+                <span class="account-heading">{{ __('shop::app.customer.account.profile.edit-profile.title') }}</span>
+
+                <span></span>
             </div>
 
             <form method="post" action="{{ route('customer.profile.edit') }}">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index 5ba28e4e9..291c18213 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -12,7 +12,7 @@
 
         <div class="account-head">
 
-            {{--  <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>  --}}
+            <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
 
             <span class="account-heading">{{ __('shop::app.customer.account.profile.index.title') }}</span>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
index f6fca6cc3..fa7e2c6e2 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php
@@ -8,7 +8,9 @@
         <div class="account-layout">
 
             <div class="account-head">
+                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">{{ __('shop::app.customer.account.review.index.title') }}</span>
+                <span></span>
                 <div class="horizontal-rule"></div>
             </div>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
index bfb929133..68c601c10 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist.blade.php
@@ -12,6 +12,7 @@
         <div class="account-head mb-15">
             <span class="account-heading">{{ __('shop::app.wishlist.title') }}</span>
 
+            <span class="account-heading">{{ __('shop::app.wishlist.title') }}</span>
             @if(count($items))
             <div class="account-action">
                 <a href="" style="margin-right: 15px;">{{ __('shop::app.wishlist.deleteall') }}</a>
diff --git a/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php
new file mode 100644
index 000000000..4769b355b
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/errors/403.blade.php
@@ -0,0 +1,28 @@
+@extends('shop::layouts.master')
+
+@section('content-wrapper')
+
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E"> {{ $code }} </div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">Page Not Found</div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.</div>
+
+                <a href="{{ route('shop.home.index') }}">GO TO HOME</a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php
new file mode 100644
index 000000000..1e0900fef
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/errors/404.blade.php
@@ -0,0 +1,28 @@
+@extends('shop::layouts.master')
+
+@section('content-wrapper')
+
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E"> {{ $code }}</div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">Page Not Found</div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.</div>
+
+                <a href="{{ route('shop.home.index') }}">GO TO HOME</a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php b/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php
new file mode 100644
index 000000000..4769b355b
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/errors/500.blade.php
@@ -0,0 +1,28 @@
+@extends('shop::layouts.master')
+
+@section('content-wrapper')
+
+    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+
+        <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
+            justify-content: start; align-items: center;">
+
+            <div class="error-box"  style="width: 50%">
+
+                <div class="error-title" style="font-size: 100px;color: #5E5E5E"> {{ $code }} </div>
+
+                <div class="error-messgae" style="font-size: 24px;color: #5E5E5E">Page Not Found</div>
+
+                <div class="error-description" style="margin-top: 20px;margin-bottom: 20px;color: #242424">The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.</div>
+
+                <a href="{{ route('shop.home.index') }}">GO TO HOME</a>
+
+            </div>
+
+            <div class="error-graphic icon-404" style="margin-left: 10% ;"></div>
+
+        </div>
+
+    </div>
+
+@endsection
\ No newline at end of file
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 23879816c..2a7be34ab 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
@@ -244,17 +244,17 @@
         @include('shop::layouts.header.nav-menu.navmenu')
     </div>
 
-    <div class="search-responsive">
+    <div class="search-responsive mt-10">
         <div class="search-content">
             <i class="icon icon-search mt-10"></i>
             <input  class="search mt-5">
             <i class="icon icon-menu-back right mt-10"></i>
         </div>
 
-        <div class="search-content">
+        {{--  <div class="search-content">
             <i class="icon icon-search mt-10"></i>
             <span class="suggestion mt-15">Designer sarees</span>
-        </div>
+        </div>  --}}
     </div>
 
     <div class="responsive-nav">
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 9b405f9e9..c158bcb57 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php
@@ -39,7 +39,6 @@
         @include('shop::layouts.footer.footer')
 
     </div>
-
     <script type="text/javascript">
         window.flashMessages = [];
 
@@ -56,9 +55,10 @@
         @endif
 
         window.serverErrors = [];
-
-        @if (count($errors))
-            window.serverErrors = @json($errors->getMessages());
+        @if(isset($errors))
+            @if (count($errors))
+                window.serverErrors = @json($errors->getMessages());
+            @endif
         @endif
     </script>
 
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 4ffa896e3..913ab6911 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -74,5 +74,27 @@
     </section>
 @endsection
 
+@push('scripts')
+<script>
+
+    document.onreadystatechange = function () {
+        var state = document.readyState
+        var galleryTemplate = document.getElementById('product-gallery-template');
+        var addTOButton = document.getElementsByClassName('add-to-buttons')[0];
+
+        if(galleryTemplate){
+            if (state == 'interactive') {
+                galleryTemplate.style.display="none";
+            } else  {
+                document.getElementById('loader').style.display="none";
+                addTOButton.style.display="flex";
+            }
+        }
+    }
+
+</script>
+@endpush
+
+
 
 
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
index 18671a86e..bccc81ece 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php
@@ -3,7 +3,7 @@
 
 <div class="product-image-group">
 
-    <div class="loader" id="loader">
+    <div class="cp-spinner cp-round" id="loader">
     </div>
 
     <product-gallery></product-gallery>
diff --git a/packages/Webkul/Ui/src/Resources/assets/images/404-image.svg b/packages/Webkul/Ui/src/Resources/assets/images/404-image.svg
new file mode 100644
index 000000000..8b7106715
--- /dev/null
+++ b/packages/Webkul/Ui/src/Resources/assets/images/404-image.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="254px" height="236px" viewBox="0 0 254 236" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>404-image</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Desktop" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.5">
+        <g id="404-page" transform="translate(-960.000000, -288.000000)">
+            <g id="404-image" transform="translate(961.000000, 289.000000)">
+                <polyline id="Path-3" stroke="#242424" stroke-width="3" points="0.626953125 0.990234375 34.3359375 26.4658203 34.6796875 73.1640625 34.3359375 186.773437 160.960938 215.992187 210.71875 130.375 34.3359375 72.71875"></polyline>
+                <g id="Group" transform="translate(46.000000, 190.000000)" fill="#FFFFFF" stroke="#242424" stroke-width="3">
+                    <circle id="Oval" cx="22.5" cy="22.5" r="21"></circle>
+                    <circle id="Oval" cx="23" cy="23" r="5.5"></circle>
+                </g>
+                <g id="Group" transform="translate(208.000000, 163.000000)" fill="#FFFFFF" stroke="#242424" stroke-width="3">
+                    <circle id="Oval" cx="22.5" cy="22.5" r="21"></circle>
+                    <circle id="Oval" cx="23" cy="23" r="5.5"></circle>
+                </g>
+                <path d="M178,205 L182,205 L182,208 L178,208 L178,205 Z M185,205 L206,205 L206,208 L185,208 L185,205 Z" id="Combined-Shape" fill="#242424" transform="translate(192.000000, 206.500000) rotate(-23.000000) translate(-192.000000, -206.500000) "></path>
+                <path d="M172.473165,218.350993 L176.473165,218.350993 L176.473165,221.350993 L172.473165,221.350993 L172.473165,218.350993 Z M179.473165,218.350993 L200.473165,218.350993 L200.473165,221.350993 L179.473165,221.350993 L179.473165,218.350993 Z" id="Combined-Shape" fill="#242424" transform="translate(186.473165, 219.850993) rotate(-23.000000) translate(-186.473165, -219.850993) "></path>
+                <path d="M198.610065,126.237911 L222.219028,78.9333292 L163.963322,59.4411726 L147.719875,109.950161 L198.610065,126.237911 Z" id="Path-4" stroke="#242424" stroke-width="3"></path>
+                <polyline id="Path-5" stroke="#242424" stroke-width="3" points="131.557617 105.489258 134.746094 71.9423828 157.437808 79.0096878"></polyline>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
index 593c8e447..03e56a6be 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss
@@ -817,4 +817,54 @@ h2 {
             background-image: none;
         }
     }
+}
+
+//css for loader
+.cp-spinner {
+    width: 48px;
+    height: 48px;
+    display: inline-block;
+    box-sizing: border-box;
+    position: absolute;
+    margin-left: 18.5%;
+    margin-top: 15%;
+}
+
+.cp-round:before {
+    border-radius: 50%;
+    content: " ";
+    width: 48px;
+    height: 48px;
+    display: inline-block;
+    box-sizing: border-box;
+    border-top: solid 6px #bababa;
+    border-right: solid 6px #bababa;
+    border-bottom: solid 6px #bababa;
+    border-left: solid 6px #bababa;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
+.cp-round:after {
+    border-radius: 50%;
+    content: " ";
+    width: 48px;
+    height: 48px;
+    display: inline-block;
+    box-sizing: border-box;
+    border-top: solid 6px $brand-color;
+    border-right: solid 6px transparent;
+    border-bottom: solid 6px transparent;
+    border-left: solid 6px transparent;
+    position: absolute;
+    top: 0;
+    left: 0;
+    animation: spin 1s ease-in-out infinite;
+
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
index 9a701a511..ae5feb753 100644
--- a/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
+++ b/packages/Webkul/Ui/src/Resources/assets/sass/icons.scss
@@ -256,3 +256,9 @@
         background-image: url("../images/Expand-Light-On.svg");
     }
 }
+
+.icon-404 {
+    background-image: url("../images/404-image.svg");
+    width: 255px;
+    height: 255px;
+}
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index 13d58889c..7e04ab3e4 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -15,12 +15,16 @@
   background-image: URL("../images/icon-menu-close.svg");
   width: 24px;
   height: 24px;
+<<<<<<< HEAD
+  margin-left: auto;
+=======
 }
 
 .icon-menu-close-adj {
   background-image: URL("../images/cross-icon-adj.svg");
   width: 32px;
   height: 32px;
+>>>>>>> 0bd7d8353108a3306bfa60977477735224974f5d
 }
 
 .grid-view-icon {
@@ -479,7 +483,7 @@ body {
 }
 
 @media only screen and (max-width: 840px) {
-  .layered-filter-wrapper, .responsive-layred-filter {
+  .layered-filter-wrapper {
     display: none;
   }
   .main .category-block {
@@ -501,6 +505,7 @@ body {
     display: none;
   }
   .main .category-block .top-toolbar .pager .view-mode .sort-filter {
+    cursor: pointer;
     display: inline-block;
     margin-top: 10px;
   }
@@ -519,38 +524,38 @@ body {
   }
 }
 
-.layered-filter-wrapper, .responsive-layred-filter {
+.layered-filter-wrapper {
   width: 25%;
   float: left;
   padding-right: 20px;
   min-height: 1px;
 }
 
-.layered-filter-wrapper .filter-title, .responsive-layred-filter .filter-title {
+.layered-filter-wrapper .filter-title {
   border-bottom: 1px solid #E8E8E8;
   color: #242424;
   padding: 10px 0;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item, .responsive-layred-filter .filter-attributes .filter-attributes-item {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item {
   border-bottom: 1px solid #E8E8E8;
   padding-bottom: 10px;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title {
   padding: 10px 40px 0 10px;
   color: #5E5E5E;
   cursor: pointer;
   position: relative;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link {
   font-weight: 400;
   color: #0031F0;
   margin-right: 10px;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .icon {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon {
   background-image: url("../images/arrow-down.svg") !important;
   width: 10px;
   height: 10px;
@@ -559,45 +564,45 @@ body {
   top: 14px;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content {
   padding: 10px;
   display: none;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items {
   padding: 0;
   margin: 0;
   list-style: none none;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item {
   padding: 8px 0;
   color: #5E5E5E;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox {
   margin: 0;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view {
   height: 16px;
   width: 16px;
   background-image: url("../images/checkbox.svg");
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view {
   background-image: url("../images/checkbox-checked.svg");
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper {
   margin-top: 21px;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content, .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-content {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content {
   display: block;
 }
 
-.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon, .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon {
+.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon {
   background-image: url("../images//arrow-up.svg") !important;
 }
 
@@ -1110,6 +1115,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 
 .header .header-top ul.right-responsive {
   display: none;
+  cursor: pointer;
 }
 
 .header .header-top ul.right-responsive li {
@@ -1341,6 +1347,9 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   .responsive-nav .nav > li {
     border-bottom: 1px solid #E8E8E8;
   }
+  .responsive-nav .nav li ul {
+    padding-left: 30px;
+  }
   .responsive-nav .nav li:first-child {
     border-top: 1px solid #E8E8E8;
   }
@@ -1348,6 +1357,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
     float: none;
     height: 45px;
     display: none;
+    border: none;
   }
   .responsive-nav .nav > li:last-child img {
     margin-right: 6px;
@@ -1563,41 +1573,6 @@ section.product-detail div.layouter form div.product-image-group {
   max-width: 604px;
 }
 
-section.product-detail div.layouter form div.product-image-group .loader {
-  border: 16px solid #E8E8E8;
-  border-top: 16px solid #0031F0;
-  border-radius: 50%;
-  width: 50px;
-  height: 50px;
-  -webkit-animation: spin 2s linear infinite;
-          animation: spin 2s linear infinite;
-  margin-left: 20%;
-  position: absolute;
-  margin-top: 200px;
-}
-
-@-webkit-keyframes spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg);
-  }
-}
-
-@keyframes spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-            transform: rotate(360deg);
-  }
-}
-
 section.product-detail div.layouter form div.product-image-group div {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -2642,8 +2617,13 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
   color: #0031F0;
 }
 
+<<<<<<< HEAD
+.account-content .responsive-side-menu {
+  display: none;
+=======
 .account-content .account-side-menu li.active .icon {
   display: inline-block;
+>>>>>>> 0bd7d8353108a3306bfa60977477735224974f5d
 }
 
 .account-content .account-layout {
@@ -2651,8 +2631,83 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p
   width: 100%;
 }
 
+<<<<<<< HEAD
+.account-content .account-layout .back-icon {
+  display: none;
+}
+
+@media only screen and (max-width: 770px) {
+  .account-content {
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+        -ms-flex-direction: column;
+            flex-direction: column;
+  }
+  .account-content .account-side-menu {
+    display: none;
+    width: 100%;
+    border: none;
+  }
+  .account-content .account-side-menu li {
+    margin-left: 0%;
+    width: 100%;
+  }
+  .account-content .account-side-menu li a {
+    color: #242424;
+  }
+  .account-content .responsive-side-menu {
+    cursor: pointer;
+    padding-top: 13px;
+    display: block;
+    height: 46px;
+    border-bottom: 1px solid #E8E8E8;
+    border-top: 1px solid #E8E8E8;
+  }
+  .account-content .responsive-side-menu .right {
+    float: right;
+  }
+  .account-content .account-layout {
+    margin-left: 0%;
+    margin-top: 20px;
+  }
+  .account-content .account-layout .account-head {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+        -ms-flex-pack: justify;
+            justify-content: space-between;
+    border-bottom: 1px solid #E8E8E8;
+    border-top: 1px solid #E8E8E8;
+    height: 46px;
+  }
+  .account-content .account-layout .account-head .back-icon {
+    display: block;
+  }
+  .account-content .account-layout .account-head span {
+    margin-top: 12px;
+    font-size: 18px;
+  }
+  .account-content .account-layout .account-head .horizontal-rule {
+    display: none;
+  }
+  .account-content .account-layout .account-table-content {
+    margin-top: 2%;
+  }
+  .account-content .account-layout .account-table-content table tbody tr {
+    display: grid;
+    margin-bottom: 20px;
+  }
+  .account-content .account-items-list, .account-content .edit-form {
+    margin-top: 20px;
+  }
+  .account-content .control-group .control {
+    width: 100%;
+  }
+=======
 .account-content .account-layout .account-head {
   margin-bottom: 20px;
+>>>>>>> 0bd7d8353108a3306bfa60977477735224974f5d
 }
 
 .account-table-content {
diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js
index 9c193f217..ac742b279 100644
--- a/public/themes/default/assets/js/shop.js
+++ b/public/themes/default/assets/js/shop.js
@@ -30905,7 +30905,7 @@ var render = function() {
       ? _c("i", {
           class: [
             _vm.show
-              ? "icon arrow-down-icon mt-15"
+              ? "icon icon-arrow-down mt-15"
               : "icon dropdown-right-icon mt-15"
           ],
           on: { click: _vm.showOrHide }