diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories.twig
index ad638d9bb..e9641ff22 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories.twig
@@ -33,6 +33,7 @@
                 </span>
             </a>
         </li>
+        {{ addBlock('base/leftSidebar')|raw }}
     </ul>
 
     {{ addBlock('base/categoriesRow')|raw }}
diff --git a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php
index 562069db8..682af5c4e 100644
--- a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php
+++ b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php
@@ -41,8 +41,16 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider
         AbstractPaginator::$defaultView       = 'visiosoft.theme.defaultadmin::pagination/bootstrap-4';
         AbstractPaginator::$defaultSimpleView = 'streams::pagination/simple-bootstrap-4';
     }
+    public function getOverrides()
+    {
+        $request = app('Illuminate\Http\Request');
 
-    protected $overrides = [
-        'streams::form/partials/tabs' => 'visiosoft.theme.defaultadmin::form/partials/tabs',
-    ];
+        if ($request->segment(2) === "users") {
+            return [
+                'streams::form/partials/tabs' => 'visiosoft.theme.defaultadmin::form/partials/tabs',
+            ];
+        }
+
+        return parent::getOverrides();
+    }
 }
diff --git a/addons/default/visiosoft/location-module/resources/js/addressSelect.js b/addons/default/visiosoft/location-module/resources/js/addressSelect.js
index a0264a1ed..58ee87366 100644
--- a/addons/default/visiosoft/location-module/resources/js/addressSelect.js
+++ b/addons/default/visiosoft/location-module/resources/js/addressSelect.js
@@ -44,18 +44,16 @@ $('.edit-this-address').on('click', function () {
         $("#newAdd-address").find('select[name="country"]').val(address_detail.country_id)
 
         //Get City Options
-        var cat = default_country;
-        var level = 1;
-        var name = 'city';
-        Locations(cat, level, name);
+        crud('id=' + address_detail.country_id, '/ajax/getCities', 'POST',function (callback){
+            setSelectOptions($("#newAdd-address").find('select[name="city"]'),callback,'id','name');
+        })
 
         //Get District Options
         var selectedCity = new Promise(function (resolve) {
+            crud('id=' + address_detail.city, '/ajax/getDistricts', 'POST',function (callback){
+                setSelectOptions($("#newAdd-address").find('select[name="district"]'),callback,'id','name');
+            });
             $("#newAdd-address").find('select[name="city"]').val(address_detail.city)
-            var cat = address_detail.city;
-            var level = 2;
-            var name = 'district';
-            Locations(cat, level, name);
             resolve();
         });
         //Selected District
@@ -88,4 +86,11 @@ $("#newAdd-address").submit(function (e) {
             alert(response.msg)
         }
     });
-});
\ No newline at end of file
+});
+
+function setSelectOptions(input, options, valueParams, TitleParams) {
+    input.html("<option value=''>...</option>");
+    $.each(options, function (index, value) {
+        input.append("<option value='" + value[valueParams] + "'>" + value[TitleParams] + "</option>");
+    });
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
index d3e549eb5..ed0e32682 100644
--- a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
+++ b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
@@ -13,7 +13,7 @@
                 </li>
             </ul>
             <div class="tab-content bg-light">
-                <div role="tabpanel" class="tab-pane m-0 pt-2" id="location">
+                <div role="tabpanel" class="tab-pane m-0 pt-2 active" id="location">
                     <div class="col-12 row">
                         <div class="col-sm-4">
                             <ul style="padding: 0" class="list-unstyled">
@@ -44,7 +44,7 @@
 
 
                 </div>
-                <div role="tabpanel" class="tab-pane active" id="my_address">
+                <div role="tabpanel" class="tab-pane" id="my_address">
                     <div class="col-md-12">
                         <input type="hidden" name="address_id">
                         <table class="table addressSelect">
diff --git a/addons/default/visiosoft/location-module/resources/views/new-ad/modals.twig b/addons/default/visiosoft/location-module/resources/views/new-ad/modals.twig
index 7fec43e7d..4c53a0c88 100755
--- a/addons/default/visiosoft/location-module/resources/views/new-ad/modals.twig
+++ b/addons/default/visiosoft/location-module/resources/views/new-ad/modals.twig
@@ -82,7 +82,7 @@
                                                 <i class="fa fa-save "></i>
                                                 {{ trans('streams::button.save') }}
                                             </button>
-                                            <button type="button" class="btn btn-secondary"
+                                            <button type="button" class="btn btn-sm btn-secondary"
                                                     data-dismiss="modal">{{ trans("visiosoft.module.carts::button.close") }}</button>
 
                                         </div>
@@ -102,5 +102,4 @@
 <script>
     var default_country = "{{ setting_value('visiosoft.module.location::default_country') }}"
 </script>
-{{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/country.js") }}
 {{ asset_add("scripts.js", "visiosoft.theme.base::js/phoneField.js") }}