diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
index 21af6f508..218190759 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/master.blade.php
@@ -44,7 +44,6 @@
         <style>
             {!! core()->getConfigData('general.content.custom_scripts.custom_css') !!}
         </style>
-
     </head>
 
     <body @if (core()->getCurrentLocale()->direction == 'rtl') class="rtl" @endif>
@@ -137,6 +136,27 @@
 
         <div id="alert-container"></div>
 
+        <script
+            type="text/javascript"
+            src="{{ asset('themes/velocity/assets/js/jquery.min.js') }}">
+        </script>
+
+        <script
+            type="text/javascript"
+            baseUrl="{{ url()->to('/') }}"
+            src="{{ asset('themes/velocity/assets/js/velocity.js') }}">
+        </script>
+
+        <script
+            type="text/javascript"
+            src="{{ asset('themes/velocity/assets/js/jquery.ez-plus.js') }}">
+        </script>
+
+        <script
+            type="text/javascript"
+            src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}">
+        </script>
+
         <script type="text/javascript">
             (() => {
                 window.showAlert = (messageType, messageLabel, message) => {
@@ -188,27 +208,6 @@
             })();
         </script>
 
-        <script
-            type="text/javascript"
-            src="{{ asset('themes/velocity/assets/js/jquery.min.js') }}">
-        </script>
-
-        <script
-            type="text/javascript"
-            src="{{ asset('themes/velocity/assets/js/jquery.ez-plus.js') }}">
-        </script>
-
-        <script
-            type="text/javascript"
-            baseUrl="{{ url()->to('/') }}"
-            src="{{ asset('themes/velocity/assets/js/velocity.js') }}">
-        </script>
-
-        <script
-            type="text/javascript"
-            src="{{ asset('vendor/webkul/ui/assets/js/ui.js') }}">
-        </script>
-
         @stack('scripts')
 
         <script>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
index fbb1179ff..d6a2c9935 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/login-section.blade.php
@@ -2,112 +2,112 @@
     <login-header></login-header>
 {!! view_render_event('bagisto.shop.layout.header.account-item.after') !!}
 
-<script type="text/x-template" id="login-header-template">
-    <div class="dropdown">
-        <div id="account">
+@push('scripts')
+    <script type="text/x-template" id="login-header-template">
+        <div class="dropdown">
+            <div id="account">
 
-            <div class="welcome-content pull-right" @click="togglePopup">
-                <i class="material-icons align-vertical-top">perm_identity</i>
-                <span class="text-center">
+                <div class="welcome-content pull-right" @click="togglePopup">
+                    <i class="material-icons align-vertical-top">perm_identity</i>
+                    <span class="text-center">
+                        @guest('customer')
+                            {{ __('velocity::app.header.welcome-message', ['customer_name' => trans('velocity::app.header.guest')]) }}!
+                        @endguest
+
+                        @auth('customer')
+                            {{ __('velocity::app.header.welcome-message', ['customer_name' => auth()->guard('customer')->user()->first_name]) }}
+                        @endauth
+                    </span>
+                    <span class="select-icon rango-arrow-down"></span>
+                </div>
+            </div>
+
+            <div class="account-modal sensitive-modal hide mt5">
+                <!--Content-->
                     @guest('customer')
-                        {{ __('velocity::app.header.welcome-message', ['customer_name' => trans('velocity::app.header.guest')]) }}!
+                        <div class="modal-content">
+                            <!--Header-->
+                            <div class="modal-header no-border pb0">
+                                <label class="fs18 grey">{{ __('shop::app.header.title') }}</label>
+
+                                <button type="button" class="close disable-box-shadow" data-dismiss="modal" aria-label="Close">
+                                    <span aria-hidden="true" class="white-text fs20" @click="togglePopup">×</span>
+                                </button>
+                            </div>
+
+                            <!--Body-->
+                            <div class="pl10 fs14">
+                                <p>{{ __('shop::app.header.dropdown-text') }}</p>
+                            </div>
+
+                            <!--Footer-->
+                            <div class="modal-footer">
+                                <div>
+                                    <a href="{{ route('customer.session.index') }}">
+                                        <button
+                                            type="button"
+                                            class="theme-btn fs14 fw6">
+
+                                            {{ __('shop::app.header.sign-in') }}
+                                        </button>
+                                    </a>
+                                </div>
+
+                                <div>
+                                    <a href="{{ route('customer.register.index') }}">
+                                        <button
+                                            type="button"
+                                            class="theme-btn fs14 fw6">
+                                            {{ __('shop::app.header.sign-up') }}
+                                        </button>
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
                     @endguest
 
                     @auth('customer')
-                        {{ __('velocity::app.header.welcome-message', ['customer_name' => auth()->guard('customer')->user()->first_name]) }}
+                        <div class="modal-content customer-options">
+                            <div class="customer-session">
+                                <label class="">
+                                    {{ auth()->guard('customer')->user()->first_name }}
+                                </label>
+                            </div>
+
+                            <ul type="none">
+                                <li>
+                                    <a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
+                                </li>
+
+                                <li>
+                                    <a href="{{ route('customer.orders.index') }}" class="unset">{{ __('velocity::app.shop.general.orders') }}</a>
+                                </li>
+
+                                <li>
+                                    <a href="{{ route('customer.wishlist.index') }}" class="unset">{{ __('shop::app.header.wishlist') }}</a>
+                                </li>
+
+                                @php
+                                    $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false
+                                @endphp
+
+                                @if ($showCompare)
+                                    <li>
+                                        <a href="{{ route('velocity.customer.product.compare') }}" class="unset">{{ __('velocity::app.customer.compare.text') }}</a>
+                                    </li>
+                                @endif
+
+                                <li>
+                                    <a href="{{ route('customer.session.destroy') }}" class="unset">{{ __('shop::app.header.logout') }}</a>
+                                </li>
+                            </ul>
+                        </div>
                     @endauth
-                </span>
-                <span class="select-icon rango-arrow-down"></span>
+                <!--/.Content-->
             </div>
         </div>
+    </script>
 
-        <div class="account-modal sensitive-modal hide mt5">
-            <!--Content-->
-                @guest('customer')
-                    <div class="modal-content">
-                        <!--Header-->
-                        <div class="modal-header no-border pb0">
-                            <label class="fs18 grey">{{ __('shop::app.header.title') }}</label>
-
-                            <button type="button" class="close disable-box-shadow" data-dismiss="modal" aria-label="Close">
-                                <span aria-hidden="true" class="white-text fs20" @click="togglePopup">×</span>
-                            </button>
-                        </div>
-
-                        <!--Body-->
-                        <div class="pl10 fs14">
-                            <p>{{ __('shop::app.header.dropdown-text') }}</p>
-                        </div>
-
-                        <!--Footer-->
-                        <div class="modal-footer">
-                            <div>
-                                <a href="{{ route('customer.session.index') }}">
-                                    <button
-                                        type="button"
-                                        class="theme-btn fs14 fw6">
-
-                                        {{ __('shop::app.header.sign-in') }}
-                                    </button>
-                                </a>
-                            </div>
-
-                            <div>
-                                <a href="{{ route('customer.register.index') }}">
-                                    <button
-                                        type="button"
-                                        class="theme-btn fs14 fw6">
-                                        {{ __('shop::app.header.sign-up') }}
-                                    </button>
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                @endguest
-
-                @auth('customer')
-                    <div class="modal-content customer-options">
-                        <div class="customer-session">
-                            <label class="">
-                                {{ auth()->guard('customer')->user()->first_name }}
-                            </label>
-                        </div>
-
-                        <ul type="none">
-                            <li>
-                                <a href="{{ route('customer.profile.index') }}" class="unset">{{ __('shop::app.header.profile') }}</a>
-                            </li>
-
-                            <li>
-                                <a href="{{ route('customer.orders.index') }}" class="unset">{{ __('velocity::app.shop.general.orders') }}</a>
-                            </li>
-
-                            <li>
-                                <a href="{{ route('customer.wishlist.index') }}" class="unset">{{ __('shop::app.header.wishlist') }}</a>
-                            </li>
-
-                            @php
-                                $showCompare = core()->getConfigData('general.content.shop.compare_option') == "1" ? true : false
-                            @endphp
-                            
-                            @if ($showCompare)
-                                <li>
-                                    <a href="{{ route('velocity.customer.product.compare') }}" class="unset">{{ __('velocity::app.customer.compare.text') }}</a>
-                                </li>
-                            @endif
-
-                            <li>
-                                <a href="{{ route('customer.session.destroy') }}" class="unset">{{ __('shop::app.header.logout') }}</a>
-                            </li>
-                        </ul>
-                    </div>
-                @endauth
-            <!--/.Content-->
-        </div>
-    </div>
-</script>
-
-@push('scripts')
     <script type="text/javascript">
 
         Vue.component('login-header', {
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
index 5fc5b0fa7..992ac2f71 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/view/gallery.blade.php
@@ -26,44 +26,44 @@
 
 {!! view_render_event('bagisto.shop.products.view.gallery.after', ['product' => $product]) !!}
 
-<script type="text/x-template" id="product-gallery-template">
-    <ul class="thumb-list col-12 row ltr" type="none">
-        <li class="arrow left" @click="scroll('prev')" v-if="thumbs.length > 4">
-            <i class="rango-arrow-left fs24"></i>
-        </li>
-
-        <carousel-component
-            slides-per-page="4"
-            :id="galleryCarouselId"
-            pagination-enabled="hide"
-            navigation-enabled="hide"
-            add-class="product-gallery"
-            :slides-count="thumbs.length">
-
-            <slide :slot="`slide-${index}`" v-for="(thumb, index) in thumbs">
-                <li
-                    @click="changeImage({
-                        largeImageUrl: thumb.large_image_url,
-                        originalImageUrl: thumb.original_image_url,
-                    })"
-                    :class="`thumb-frame ${index + 1 == 4 ? '' : 'mr5'} ${thumb.large_image_url == currentLargeImageUrl ? 'active' : ''}`"
-                    >
-
-                    <div
-                        class="bg-image"
-                        :style="`background-image: url(${thumb.small_image_url})`">
-                    </div>
-                </li>
-            </slide>
-        </carousel-component>
-
-        <li class="arrow right" @click="scroll('next')" v-if="thumbs.length > 4">
-            <i class="rango-arrow-right fs24"></i>
-        </li>
-    </ul>
-</script>
-
 @push('scripts')
+    <script type="text/x-template" id="product-gallery-template">
+        <ul class="thumb-list col-12 row ltr" type="none">
+            <li class="arrow left" @click="scroll('prev')" v-if="thumbs.length > 4">
+                <i class="rango-arrow-left fs24"></i>
+            </li>
+
+            <carousel-component
+                slides-per-page="4"
+                :id="galleryCarouselId"
+                pagination-enabled="hide"
+                navigation-enabled="hide"
+                add-class="product-gallery"
+                :slides-count="thumbs.length">
+
+                <slide :slot="`slide-${index}`" v-for="(thumb, index) in thumbs">
+                    <li
+                        @click="changeImage({
+                            largeImageUrl: thumb.large_image_url,
+                            originalImageUrl: thumb.original_image_url,
+                        })"
+                        :class="`thumb-frame ${index + 1 == 4 ? '' : 'mr5'} ${thumb.large_image_url == currentLargeImageUrl ? 'active' : ''}`"
+                        >
+
+                        <div
+                            class="bg-image"
+                            :style="`background-image: url(${thumb.small_image_url})`">
+                        </div>
+                    </li>
+                </slide>
+            </carousel-component>
+
+            <li class="arrow right" @click="scroll('next')" v-if="thumbs.length > 4">
+                <i class="rango-arrow-right fs24"></i>
+            </li>
+        </ul>
+    </script>
+
     <script type="text/javascript">
         (() => {
             var galleryImages = @json($images);
