diff --git a/packages/TPS/Shop/src/Resources/views/shop/layouts/header/search-nav.blade.php b/packages/TPS/Shop/src/Resources/views/shop/layouts/header/search-nav.blade.php
index ab21f81ae..00babb2fe 100644
--- a/packages/TPS/Shop/src/Resources/views/shop/layouts/header/search-nav.blade.php
+++ b/packages/TPS/Shop/src/Resources/views/shop/layouts/header/search-nav.blade.php
@@ -7,10 +7,9 @@
     }
     $cart = cart()->getCart();
 ?>
-
 <my-mobile-nav></my-mobile-nav>
-
 @push('scripts')
+    @auth('customer')
 <script type="text/x-template" id="profile-btn-template">
     <div class="login logged-true logged" @click.prevent="toggleProfileDropdown">
         <button type="button" class="nav-link">
@@ -21,7 +20,18 @@
         </button>
     </div>
 </script>
-
+<script>
+    Vue.component('profile-btn', {
+        template: '#profile-btn-template',
+        methods: {
+            toggleProfileDropdown() {
+                let obj = document.querySelector('.profile-dropdown')
+                obj.classList.toggle('shown')
+            }
+        }
+    })
+</script>
+@endauth
 <script type="text/x-template" id="my-mobile-nav-template">
     <nav class="nav-block container">
         <div class="burger-mobile" @click.capture="closeMobileMenu($event)">
@@ -127,7 +137,7 @@
 
                     </li>
                     @endauth
-                    
+
                 </ul>
             </div>
 
@@ -229,7 +239,7 @@
                             <img src="{{ bagisto_asset('icons/burger-arrow-white.svg') }}" alt="burger arrow white">
                         </div>
                     </div>
-  
+
                     {{-- <div class="burger-dropdown active" id="language-dropdown-content">
                         <ul class="burger-list-inner-inner lang-list" onchange="window.location.href = this.value">
                             @foreach (core()->getCurrentChannel()->locales as $locale)
@@ -249,15 +259,15 @@
                             @endforeach
                         </ul>
                     </div> --}}
-  
+
                     <div class="language-dropdown" id="language-dropdown-content" onchange="window.location.href = this.value">
                           @foreach (core()->getCurrentChannel()->locales as $locale)
                                   <a
                                   class="@if(core()->getCurrentLocale()->code == $locale->code) active-lang @endif burger-item-name lang lang-second"
                                       @if (isset($serachQuery))
-                                          href="?{{ $serachQuery }}&locale={{ $locale->code }}" 
+                                          href="?{{ $serachQuery }}&locale={{ $locale->code }}"
                                       @else
-                                          href="?locale={{ $locale->code }}" 
+                                          href="?locale={{ $locale->code }}"
                                       @endif
                                   >
                                       <div class="burger-lang">
@@ -268,8 +278,8 @@
                     </div>
                   </div>
                   {{-- Language dropdown end --}}
-  
-                  
+
+
                   <a href="{{ route('shop.checkout.cart.index') }}" class="nav-link">
                       <div class="icon-wrapper">
                           <img src="{{ bagisto_asset('icons/cart.svg') }}" alt="cart" />
@@ -313,21 +323,8 @@
         </div>
     </nav>
 </script>
-<script>
-  
-</script>
 
-<script>
-    Vue.component('profile-btn', {
-        template: '#profile-btn-template',
-        methods: {
-            toggleProfileDropdown() {
-                let obj = document.querySelector('.profile-dropdown')
-                obj.classList.toggle('shown')
-            }
-        }
-    })
-</script>
+
 
 <script>
     Vue.component('my-mobile-nav', {
diff --git a/packages/TPS/Shop/src/Resources/views/shop/layouts/header/top-nav.blade.php b/packages/TPS/Shop/src/Resources/views/shop/layouts/header/top-nav.blade.php
index 399d91b21..2c0590cd7 100644
--- a/packages/TPS/Shop/src/Resources/views/shop/layouts/header/top-nav.blade.php
+++ b/packages/TPS/Shop/src/Resources/views/shop/layouts/header/top-nav.blade.php
@@ -19,22 +19,19 @@
                 <div class="flag-wrapper">
                     <img src="{{ core()->getCurrentLocale()->image_url }}" alt="" width="30" height="20" />
                 </div>
-
                 <div class="language-wrapper">
                     <span class="language">{{ core()->getCurrentLocale()->name }}</span>
-                    <ul class="language-list hidden" id="locale-switcher" onchange="window.location.href = this.value"
-                        @if (count(core()->getCurrentChannel()->locales) == 1) disabled="disabled" @endif>
-
-                        @foreach (core()->getCurrentChannel()->locales as $locale)
-                            @if (isset($serachQuery))
-                                <li class="language-el" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}><a href="?{{ $serachQuery }}&locale={{ $locale->code }}">{{ $locale->name }}</a></li>
-                            @else
-                                <li class="language-el" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}><a href="?locale={{ $locale->code }}">{{ $locale->name }}</a></li>
-                            @endif
-                        @endforeach
+                    <ul class="language-list hidden" id="locale-switcher" onchange="window.location.href = this.value">
+                @foreach (core()->getCurrentChannel()->locales as $locale)
+                    @if (isset($serachQuery))
+                        <li class="language-el" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}><a href="?{{ $serachQuery }}&locale={{ $locale->code }}">{{ $locale->name }}</a></li>
+                    @else
+                        <li class="language-el" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}><a href="?locale={{ $locale->code }}">{{ $locale->name }}</a></li>
+                    @endif
+                @endforeach
                     </ul>
                 </div>
             </div>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/packages/TPS/Shop/src/Resources/views/shop/layouts/master.blade.php b/packages/TPS/Shop/src/Resources/views/shop/layouts/master.blade.php
index 13f631d5e..f21648659 100644
--- a/packages/TPS/Shop/src/Resources/views/shop/layouts/master.blade.php
+++ b/packages/TPS/Shop/src/Resources/views/shop/layouts/master.blade.php
@@ -9,24 +9,23 @@
     <meta name="csrf-token" content="{{ csrf_token() }}">
     <meta http-equiv="content-language" content="{{ app()->getLocale() }}">
     <meta name="format-detection" content="telephone=no">
-    @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') }}" />
+@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')
+    @if (! request()->is('/'))
+    <meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
     @endif
-    @yield('head')
-    @section('seo')
-        @if (! request()->is('/'))
-            <meta name="description" content="{{ core()->getCurrentChannel()->description }}"/>
-        @endif
-    @show
-    @stack('css_before')
+@show
+@stack('css_before')
     <link rel="stylesheet" href="{{bagisto_asset('styles/style.css')}}" />
     @stack('css')
     <style>
         {!! core()->getConfigData('general.content.custom_scripts.custom_css') !!}
     </style>
-
 </head>
 <body style="scroll-behavior: smooth;">
     @include('shop::layouts.header.top-nav')