diff --git a/packages/Webkul/Custom/src/Observers/CustomerObserver.php b/packages/Webkul/Custom/src/Observers/CustomerObserver.php
new file mode 100644
index 000000000..2cc88330a
--- /dev/null
+++ b/packages/Webkul/Custom/src/Observers/CustomerObserver.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Webkul\Custom\Observers;
+
+use Webkul\SAASCustomizer\Models\Customer\Customer;
+
+use Company;
+
+class CustomerObserver
+{
+    public function creating(Customer $model)
+    {
+        if (! auth()->guard('super-admin')->check()) {
+            $model->company_id = Company::getCurrent()->id;
+
+            $model->status = 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Custom/src/Providers/CustomServiceProvider.php b/packages/Webkul/Custom/src/Providers/CustomServiceProvider.php
index 104dc31ea..a52571833 100755
--- a/packages/Webkul/Custom/src/Providers/CustomServiceProvider.php
+++ b/packages/Webkul/Custom/src/Providers/CustomServiceProvider.php
@@ -18,7 +18,13 @@ class CustomServiceProvider extends ServiceProvider
 
         $this->app->concord->registerModel(\Webkul\Core\Contracts\Slider::class, \Webkul\Custom\Models\Slider::class);
 
+        \Webkul\SAASCustomizer\Models\Customer\Customer::observe(\Webkul\Custom\Observers\CustomerObserver::class);
+
         \Webkul\Custom\Models\Slider::observe(\Webkul\Custom\Observers\SliderObserver::class);
+
+        $this->publishes([
+            __DIR__ . '/../Resources/views/navmenu.blade.php' => resource_path('views/vendor/shop/layouts/header/nav-menu/navmenu.blade.php'),
+        ]);
     }
 
     public function register()
diff --git a/packages/Webkul/Custom/src/Resources/views/header.blade.php b/packages/Webkul/Custom/src/Resources/views/header.blade.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/Webkul/Custom/src/Resources/views/navmenu.blade.php b/packages/Webkul/Custom/src/Resources/views/navmenu.blade.php
new file mode 100644
index 000000000..200a9b60d
--- /dev/null
+++ b/packages/Webkul/Custom/src/Resources/views/navmenu.blade.php
@@ -0,0 +1,177 @@
+{!! view_render_event('bagisto.shop.layout.header.category.before') !!}
+
+<?php
+
+$categories = [];
+
+foreach (app('Webkul\CustomerGroupCatalog\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
+    if ($category->slug)
+        array_push($categories, $category);
+}
+
+$cmsPages = app('Webkul\CMS\Repositories\CMSRepository')->findWhere([
+    'channel_id' => core()->getCurrentChannel()->id,
+    'locale_id' => core()->getCurrentLocale()->id
+]);
+
+?>
+
+<category-nav categories='@json($categories)' url="{{url()->to('/')}}"></category-nav>
+
+{!! view_render_event('bagisto.shop.layout.header.category.after') !!}
+
+
+@push('scripts')
+
+
+<script type="text/x-template" id="category-nav-template">
+
+    <ul class="nav">
+        <li>
+            <a href="{{ route('shop.home.index') }}">Home</a>
+        </li>
+
+        <li>
+            <a>Catalog</a>
+
+            <category-item
+                v-for="(item, index) in items"
+                :key="index"
+                :url="url"
+                :item="item"
+                :parent="index">
+            </category-item>
+        </li>
+
+        @foreach($cmsPages as $cmsPage)
+            <li>
+                <a href="{{ route('shop.cms.page', $cmsPage->url_key) }}">{{ $cmsPage->page_title }}</a>
+            </li>
+        @endforeach
+    </ul>
+
+</script>
+
+<script>
+    Vue.component('category-nav', {
+
+        template: '#category-nav-template',
+
+        props: {
+            categories: {
+                type: [Array, String, Object],
+                required: false,
+                default: (function () {
+                    return [];
+                })
+            },
+
+            url: String
+        },
+
+        data: function(){
+            return {
+                items_count:0
+            };
+        },
+
+        computed: {
+            items: function() {
+                return JSON.parse(this.categories)
+            }
+        },
+    });
+</script>
+
+<script type="text/x-template" id="category-item-template">
+    <li>
+        <a :href="url+'/categories/'+this.item['translations'][0].slug">
+            @{{ name }}&emsp;
+            <i class="icon dropdown-right-icon" v-if="haveChildren && item.parent_id != null"></i>
+        </a>
+
+        <i :class="[show ? 'icon icon-arrow-down mt-15' : 'icon dropdown-right-icon left mt-15']"
+        v-if="haveChildren"  @click="showOrHide"></i>
+
+        <ul v-if="haveChildren && show">
+            <category-item
+                v-for="(child, index) in item.children"
+                :key="index"
+                :url="url"
+                :item="child">
+            </category-item>
+        </ul>
+    </li>
+</script>
+
+<script>
+    Vue.component('category-item', {
+
+        template: '#category-item-template',
+
+        props: {
+            item:  Object,
+            url: String,
+        },
+
+        data: function() {
+            return {
+                items_count:0,
+                show: false,
+            };
+        },
+
+        mounted: function() {
+            if(window.innerWidth > 770){
+                this.show = true;
+            }
+        },
+
+        computed: {
+            haveChildren: function() {
+                return this.item.children.length ? true : false;
+            },
+
+            name: function() {
+                if (this.item.translations && this.item.translations.length) {
+                    this.item.translations.forEach(function(translation) {
+                        if (translation.locale == document.documentElement.lang)
+                            return translation.name;
+                    });
+                }
+
+                return this.item.name;
+            }
+        },
+
+        methods: {
+            showOrHide: function() {
+                this.show = !this.show;
+            }
+        }
+    });
+</script>
+
+<script>
+    $(document).ready(function () {
+        $('.nav > li > li').css('display', 'none');
+
+        $('.nav > li').mouseenter(function () {
+            $('.nav > li > li').css('display', 'block');
+        });
+
+        $('.nav > li').mouseleave(function () {
+            $('.nav > li > li').css('display', 'none');
+        });
+
+        $('ul > li li').css('background', 'white');
+
+        $('ul > li li').css('border', '1px solid #c7c7c7');
+
+        $('ul > li li').css('border-right', '1px solid #c7c7c7');
+
+        $('.header .header-bottom .nav > li').css('z-index', '1');
+    });
+</script>
+
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/CustomerGroupCatalog/src/Providers/CustomerGroupCatalogServiceProvider.php b/packages/Webkul/CustomerGroupCatalog/src/Providers/CustomerGroupCatalogServiceProvider.php
index 62777e295..d0f682a70 100755
--- a/packages/Webkul/CustomerGroupCatalog/src/Providers/CustomerGroupCatalogServiceProvider.php
+++ b/packages/Webkul/CustomerGroupCatalog/src/Providers/CustomerGroupCatalogServiceProvider.php
@@ -23,7 +23,6 @@ class CustomerGroupCatalogServiceProvider extends ServiceProvider
 
         $this->publishes([
             __DIR__ . '/../Resources/views/admin/customers/groups' => resource_path('views/vendor/admin/customers/groups'),
-            __DIR__ . '/../Resources/views/shop/products' => resource_path('views/vendor/shop/products'),
             __DIR__ . '/../Resources/views/shop/layouts' => resource_path('views/vendor/shop/layouts'),
         ]);
     }
diff --git a/resources/views/vendor/shop/layouts/header/nav-menu/navmenu.blade.php b/resources/views/vendor/shop/layouts/header/nav-menu/navmenu.blade.php
index c0e357257..200a9b60d 100644
--- a/resources/views/vendor/shop/layouts/header/nav-menu/navmenu.blade.php
+++ b/resources/views/vendor/shop/layouts/header/nav-menu/navmenu.blade.php
@@ -4,11 +4,16 @@
 
 $categories = [];
 
-foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
+foreach (app('Webkul\CustomerGroupCatalog\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
     if ($category->slug)
         array_push($categories, $category);
 }
 
+$cmsPages = app('Webkul\CMS\Repositories\CMSRepository')->findWhere([
+    'channel_id' => core()->getCurrentChannel()->id,
+    'locale_id' => core()->getCurrentLocale()->id
+]);
+
 ?>
 
 <category-nav categories='@json($categories)' url="{{url()->to('/')}}"></category-nav>
@@ -22,13 +27,27 @@ foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCateg
 <script type="text/x-template" id="category-nav-template">
 
     <ul class="nav">
-        <category-item
-            v-for="(item, index) in items"
-            :key="index"
-            :url="url"
-            :item="item"
-            :parent="index">
-        </category-item>
+        <li>
+            <a href="{{ route('shop.home.index') }}">Home</a>
+        </li>
+
+        <li>
+            <a>Catalog</a>
+
+            <category-item
+                v-for="(item, index) in items"
+                :key="index"
+                :url="url"
+                :item="item"
+                :parent="index">
+            </category-item>
+        </li>
+
+        @foreach($cmsPages as $cmsPage)
+            <li>
+                <a href="{{ route('shop.cms.page', $cmsPage->url_key) }}">{{ $cmsPage->page_title }}</a>
+            </li>
+        @endforeach
     </ul>
 
 </script>
@@ -133,5 +152,26 @@ foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCateg
     });
 </script>
 
+<script>
+    $(document).ready(function () {
+        $('.nav > li > li').css('display', 'none');
+
+        $('.nav > li').mouseenter(function () {
+            $('.nav > li > li').css('display', 'block');
+        });
+
+        $('.nav > li').mouseleave(function () {
+            $('.nav > li > li').css('display', 'none');
+        });
+
+        $('ul > li li').css('background', 'white');
+
+        $('ul > li li').css('border', '1px solid #c7c7c7');
+
+        $('ul > li li').css('border-right', '1px solid #c7c7c7');
+
+        $('.header .header-bottom .nav > li').css('z-index', '1');
+    });
+</script>
 
 @endpush
\ No newline at end of file