diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
index 75de1d0be..7c83e2392 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
@@ -30,6 +30,7 @@ return [
                     'default_published_time',
                     'default_GET',
                     'listing_page_image',
+                    'show_ads_count',
                 ],
             ],
             'create_ad' => [
@@ -41,6 +42,7 @@ return [
                     'hide_configurations',
                     'make_map_required',
                     'show_breadcrumb_when_creating_ad',
+                    'show_post_ad_agreement',
                 ],
             ],
             'ads_image' => [
diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
index 7ef868ffe..df69de9c2 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
@@ -325,4 +325,18 @@ return [
             'mode' => 'checkbox'
         ],
     ],
+    'show_ads_count' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+            'mode' => 'checkbox'
+        ],
+    ],
+    'show_post_ad_agreement' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => false,
+            'mode' => 'checkbox'
+        ],
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php
index 48657e31a..c09c7bc27 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php
@@ -41,4 +41,5 @@ return [
 	'create_configurations' => 'Create Configurations',
 	'replicate' => 'Replicate',
 	'fast_create' => 'Fast create',
+	'publish' => 'Publish',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
index 43aa321a6..e813d5ec7 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
@@ -314,6 +314,10 @@ return [
     'listing_details' => 'Listing Details',
     'preview' => 'Preview',
     'congratulations' => 'Congratulations',
+    'ad_desc' => 'Ad Description',
+    'upload_photos' => 'Upload Photos',
+    'additional_fields' => 'Additional Fields',
+    'ad_location' => 'Ad Location',
 
     'free' => 'Free',
     'ad_date' => 'Ad Date',
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
index f99494a88..3d41352db 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
@@ -4,7 +4,7 @@ return [
     'error_added_cart' => 'Requested product is currently missing or inactive',
     'please_payment' => 'Please Pay',
     'bank_account_info' => 'Bank account information',
-    'agreement' => 'By clicking Post, you agree to our Terms of Use and Privacy Policy acknowledge that you are the rightful owner of this item.',
+    'agreement' => 'By clicking Publish, you agree to our Terms of Use and Privacy Policy acknowledge that you are the rightful owner of this item.',
     'update_category_msg' => 'The classified category will be updated.',
     'updated_category_msg' => 'Category successfully edited.',
     'create_ad_with_post_cat' => [
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
index 56e9cf779..660e90150 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
@@ -197,4 +197,12 @@ return [
     'show_breadcrumb_when_creating_ad' => [
         'name' => 'Show Breadcrumb When Creating an Ad',
     ],
+    'show_ads_count' => [
+        'name' => 'Show Ads Count',
+        'instructions' => 'Show ads count on the left categories list',
+    ],
+    'show_post_ad_agreement' => [
+        'name' => 'Show Post Ad Agreement',
+        'instructions' => 'Turn this on if you want to display a privacy policy agreement on the ad creation page',
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index 81a40ec4a..dfc591859 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -20,7 +20,9 @@
             <div class="adpost-details">
                 <div class="row">
                     <div class="col-md-12">
-                        {% set form = form('advs', 'advs').entry(id).actions(['update']).get() %}
+                        {% set form = form('advs', 'advs').entry(id).actions({'update': {
+                            'text': trans('visiosoft.module.advs::button.publish')
+                        }}).get() %}
                         {{ form_open({
                             'id': 'createEditAdvForm',
                             'class': 'form ' ~ form.options.class ,
@@ -45,7 +47,7 @@
                             {% include 'visiosoft.module.advs::new-ad/partials/contact-info' %}
 
                             <h5 class="mt-5 pb-1 border-bottom">{{ trans('visiosoft.module.advs::field.ad_info') }}</h5>
-                            <div class="section postdetails">
+                            <div class="section postdetails bg-light p-4">
                                 <div class="row form-group add-title">
                                     {% set fields = form.fields.base().pluck('field_name').all() %}
                                     <div class="col-md-12">
@@ -99,7 +101,7 @@
                                         }).input|raw }}
                                     </div>
                                     {% set PriceValue = form.fields.price.value|split('.') %}
-                                    <div class="col-8 pr-0 col-md-3">
+                                    <div class="col-6 col-sm-7 pr-0 col-md-3">
                                         <input class="form-control priceField whole-price" value="{{ PriceValue|first }}">
                                     </div>
                                     {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
@@ -108,7 +110,7 @@
                                                    value="{{ PriceValue[1] }}">
                                         </div>
                                     {% endif %}
-                                    <div class="col-sm-3 col-xs-6">
+                                    <div class="col-sm-3 col-6">
                                         <select name="currency" class="custom-select form-control" data-field="currency"
                                                 data-field_name="currency" data-provides="anomaly.field_type.select"
                                                 id="currency" required="">
@@ -152,7 +154,10 @@
                                         </div>
                                     </div>
                                 {% endif %}
+                            </div>
 
+                            <h5 class="mt-5 pb-1 border-bottom">{{ trans('visiosoft.module.advs::field.ad_desc') }}</h5>
+                            <div class="bg-light p-4">
                                 <div class="row form-group brand-name">
                                     <div class="col-md-12">
                                         <div class="field-group advs_desc">
@@ -162,13 +167,28 @@
                                         </div>
                                     </div>
                                 </div>
+                            </div>
+
+                            <h5 class="mt-5 pb-1 border-bottom">{{ trans('visiosoft.module.advs::field.upload_photos') }}</h5>
+                            <div class="bg-light p-4">
                                 <div class="row form-group images">
                                     <div class="col-md-12">
                                         {{ form.fields.files.input |raw }}
                                     </div>
                                 </div>
-                                {{ addBlock('new-ad/other-fields',{'custom_fields':custom_fields})|raw }}
+                            </div>
 
+                            <h5 class="mt-5 pb-1 border-bottom">
+                                {{ trans('visiosoft.module.advs::field.additional_fields') }}
+                            </h5>
+                            <div class="bg-light p-4">
+                                {{ addBlock('new-ad/other-fields',{'custom_fields':custom_fields})|raw }}
+                            </div>
+
+                            <h5 class="mt-5 pb-1 border-bottom">
+                                {{ trans('visiosoft.module.advs::field.ad_location') }}
+                            </h5>
+                            <div class="bg-light p-4 mb-4">
                                 {% include "visiosoft.module.location::new-ad/map" %}
 
                                 <input value="{{ adv.map_Val }}" name="map_Val" data-max="255" data-mask=""
@@ -178,12 +198,14 @@
                             </div><!-- section -->
 
                             <div class="checkbox section agreement">
+                                {% if setting_value('visiosoft.module.advs::show_post_ad_agreement') %}
+                                    <label for="send">
+                                        <input type="checkbox" name="send" id="send" required>
 
-                                <label for="send">
-                                    <input type="checkbox" name="send" id="send" required>
+                                        {{ trans('visiosoft.module.advs::message.agreement') }}
+                                    </label><br>
+                                {% endif %}
 
-                                    {{ trans('visiosoft.module.advs::message.agreement') }}
-                                </label><br>
                                 {{ form.actions|raw }}
                             </div><!-- section -->
 
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/contact-info.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/contact-info.twig
index 7975a456f..f0f40442e 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/contact-info.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/contact-info.twig
@@ -1,6 +1,6 @@
 <h5 class="pb-1 border-bottom">{{ trans('visiosoft.module.advs::field.contact_info') }}</h5>
-<div class="col-12 bg-light row m-0">
-    <div class="col-12 col-md-6 border my-4 bg-white py-3 row m-0 px-0 editContact rounded">
+<div class="px-3 bg-light row justify-content-center m-0">
+    <div class="col-md-9 col-lg-7 border my-4 bg-white py-3 row m-0 px-0 editContact rounded">
         <div class="col-12 row m-0 border-bottom py-2">
             <div class="col-12 col-md-4 pl-0">
                 <label class="mb-0 font-weight-bold">
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
index 7335b7d0a..b383045e3 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
@@ -1,10 +1,17 @@
 {% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %}
+{% set showAdsCount = setting_value('visiosoft.module.advs::show_ads_count') %}
 <ul class="categories-list p-0 d-none d-sm-block">
     <li class="categories-list-li category-icon category-{{ main_category.slug }}">
         {% set catIcon = main_category.icon.path != "" ? url('files/' ~ main_category.icon.path) : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
         <img src="{{ catIcon }}" alt="{{ main_category.name }}" class="img-responsive">
         <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
             <b>{{ main_category.name }}</b>
+            {% if showAdsCount %}
+                {% set catAdsCount = entries('advs', 'advs').countAdsByCategoryId(main_category.id) %}
+                <small class="text-muted">
+                    ({{ catAdsCount }})
+                </small>
+            {% endif %}
         </a>
         <ul class="p-0">
             {% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}
@@ -24,6 +31,13 @@
                 {% for sub_category in sub_categories|slice(subLoop.start, subLoop.end) %}
                     <li class="{{ subLoop.class }}">
                         <a href="{{ url_route('adv_list_seo', [sub_category.slug]) }}">{{ sub_category.name }}</a>
+                        {% if showAdsCount %}
+                            {% set catLevel = getParentsCount(sub_category.id) + 1 %}
+                            {% set catAdsCount = entries('advs', 'advs').countAdsByCategoryId(sub_category.id, catLevel) %}
+                            <small class="text-muted">
+                                ({{ catAdsCount }})
+                            </small>
+                        {% endif %}
                     </li>
                 {% endfor %}
             {% endfor %}
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 567b5c068..9b94af55e 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
@@ -1,6 +1,6 @@
 {% if setting_value('visiosoft.module.location::create_ad_page_location') %}
-    <div class="row form-group location-map">
-        <div class="col-12 m-0 p-0">
+    <div class="form-group location-map">
+        <div>
             <ul class="nav nav-tabs p-1 bg-dark border-bottom py-2" role="tablist">
                 <li role="presentation" class="p-0 m-0">
                     <a href="#location" class="text-dark py-1 px-4 border bg-white locationSection"
@@ -14,7 +14,7 @@
             </ul>
             <div class="tab-content bg-light">
                 <div role="tabpanel" class="tab-pane m-0 pt-2 active" id="location">
-                    <div class="col-12 row">
+                    <div class="row">
                         <div class="col-sm-4">
                             <ul style="padding: 0" class="list-unstyled">
                                 <li class="country-data" data-content="{{ adv['country_id'] }}"