diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
index 489c50210..0cc75d9e8 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
@@ -7,7 +7,7 @@
 @section('content')
     <div class="content">
         <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
-        
+
         <form method="POST" action="" @submit.prevent="onSubmit">
 
             <div class="page-header">
@@ -121,7 +121,7 @@
 
                 </div>
             </div>
-        
+
         </form>
     </div>
 @stop
\ No newline at end of file
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
index 245b9bac6..0ea37bc67 100644
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -63,8 +63,13 @@
 
                             <div class="control-group">
                                 <label for="name" >{{ __('admin::app.customers.customers.customer_group') }}</label>
-                                <?php $selectedOption = $customer->customerGroup->id ?>
+
+                                @if(!is_null($customer->customer_group_id))
+                                    <?php $selectedOption = $customer->customerGroup->id ?>
+                                @endif
+
                                 <select  class="control" name="customer_group_id">
+
                                     @foreach($customerGroup as $group)
                                     <option value="{{ $group->id }}" {{ $selectedOption == $group->id ? 'selected' : '' }}>
                                         {{ $group->group_name}}
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
new file mode 100644
index 000000000..3a46d37a5
--- /dev/null
+++ b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
@@ -0,0 +1,13 @@
+@extends('admin::layouts.content')
+
+@section('page_title')
+    {{ __('admin::app.catalog.categories.edit-title') }}
+@stop
+
+@section('content')
+    <div class="content">
+
+
+
+    </div>
+@stop
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 11c591d3c..22a724cbe 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -1070,6 +1070,7 @@ section.slider-block {
                 .addtocart {
                     white-space: nowrap;
                     font-size: 12px;
+                    border-radius: 0px;
                 }
             }
         }
@@ -1173,6 +1174,7 @@ section.slider-block {
                 .addtocart {
                     white-space: nowrap;
                     font-size: 12px;
+                    border-radius: 0px;
                 }
             }
         }
@@ -1649,11 +1651,13 @@ section.product-detail {
                     .addtocart {
                         width: 293px;
                         background: black;
+                        border-radius: 0px;
                     }
 
                     .buynow {
                         width: 293px;
                         float:right;
+                        border-radius: 0px;
                     }
                 }
             }
@@ -1991,10 +1995,12 @@ section.product-detail {
                             .addtocart {
                                 width: 49%;
                                 background: #000000;
+                                border-radius: 0px;
                             }
 
                             .buynow {
                                 width: 49%;
+                                border-radius: 0px;
                             }
                         }
                     }
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css
index 436ccbbc9..7b72e4fcd 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -1132,6 +1132,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   .main-container-wrapper .product-card .cart-fav-seg .addtocart {
     white-space: nowrap;
     font-size: 12px;
+    border-radius: 0px;
   }
   .main-container-wrapper .top-toolbar {
     border-bottom: 1px solid #E8E8E8;
@@ -1197,6 +1198,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
   .main-container-wrapper .product-card .cart-fav-seg .addtocart {
     white-space: nowrap;
     font-size: 12px;
+    border-radius: 0px;
   }
   .main-container-wrapper .top-toolbar {
     border-bottom: 1px solid #E8E8E8;
@@ -1692,11 +1694,13 @@ section.product-detail div.layouter form div.product-image-group .cart-fav-seg {
 section.product-detail div.layouter form div.product-image-group .cart-fav-seg .addtocart {
   width: 293px;
   background: black;
+  border-radius: 0px;
 }
 
 section.product-detail div.layouter form div.product-image-group .cart-fav-seg .buynow {
   width: 293px;
   float: right;
+  border-radius: 0px;
 }
 
 section.product-detail div.layouter form .details {
@@ -1905,9 +1909,11 @@ section.product-detail div.layouter form .details .full-description {
   section.product-detail div.layouter form .details .attributes .cart-fav-seg .addtocart {
     width: 49%;
     background: #000000;
+    border-radius: 0px;
   }
   section.product-detail div.layouter form .details .attributes .cart-fav-seg .buynow {
     width: 49%;
+    border-radius: 0px;
   }
 }