diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
index 867ff70b6..6c7bc6a37 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
@@ -134,8 +134,10 @@
                                 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row">
                                     <span class="icon"><i class="far fa-clock"></i><a
                                                 href="#">{{ adv.created_at|date('d/m/Y') }}</a></span>
+                                    {% if setting_value('visiosoft.module.location::detail_page_location') %}
                                     <span class="icon"><i class="fa fa-map-marker"></i><a href="#">{{ adv.city_name }}
-                                            , {{ adv.country_name }}</a></span>
+                                            , {{ adv.country_name }}qqq</a></span>
+                                    {% endif %}
                                     {% if adv.isCorporate == 2 %}
                                         <span class="icon"><i class="fa fa-suitcase"></i><a
                                                     href="{{ url_route('visiosoft.module.advs::list_user_ad', [adv.created_by_id]) }}">{{ adv.owner }}</a></span>
@@ -278,7 +280,7 @@
                                         {% include "visiosoft.module.customfields::list-item" %}
                                     {% endif %}
                                 {% endif %}
-                                {% if adv.map_Val != "" %}
+                                {% if adv.map_Val != "" and setting_value('visiosoft.module.location::detail_page_location') %}
                                     <div id="streetviewtab" class="tab-pane fade in">
                                         <div id="map" data-map-val="{{ adv.map_Val }}"></div>
                                         {% if entries('advs').isEnabled('streetview') %}
@@ -334,9 +336,11 @@
                                             </div>
                                             <!-- item-info-right -->
                                             <div class="user-option pull-right">
+                                                {% if setting_value('visiosoft.module.location::detail_page_location') %}
                                                 <a href="#" data-toggle="tooltip" data-placement="top" title=""
                                                    data-original-title="{{ advs.city_name }}, {{ advs.country_name }}"><i
                                                             class="fa fa-map-marker"></i> </a>
+                                                {% endif %}
                                             </div><!-- item-info-right -->
                                         </div><!-- ad-meta -->
                                     </div><!-- item-info -->
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
index 7598e0aeb..714fc7d2b 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
@@ -121,7 +121,9 @@
                                                     </video>">
                                                         <i class="fa fa-film"></i> </a>
                                                 {% endif %}
+                                                {% if setting_value('visiosoft.module.location::list_page_location') %}
                                                 <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                                {% endif %}
                                                 <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
                                                 {% if entries('advs').isEnabled('comparisons') %}
@@ -181,7 +183,9 @@
                                                     <source src='{{ adv.isAdVideo }}' class='video-src' type='video/mp4' />
                                                     </video>"></a>
                                                 {% endif %}
+                                                {% if setting_value('visiosoft.module.location::list_page_location') %}
                                                 <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                               {% endif %}
                                                 <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
                                                 {% if entries('advs').isEnabled('comparisons') %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig b/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig
index 836eb98af..0808a23e8 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/partials/display_mode.twig
@@ -1,5 +1,7 @@
 <div class="featured-top-display-settings">
+    {% if setting_value('visiosoft.module.location::list_page_location') %}
     <a href="{{ url_route('visiosoft.module.advs::view_type',['map']) }}"><h4 class="viewType"> <i class="fa fa-map-marker" ></i> {{ trans("visiosoft.module.advs::field.show_display_mode.map") }}</h4></a>
+    {% endif %}
     <a href="{{ url_route('visiosoft.module.advs::view_type',['list']) }}"><h4 class="viewType"> <i class="fa fa-list-ul" ></i> {{ trans('visiosoft.module.advs::field.show_list_view.name') }} </h4></a>
     <a href="{{ url_route('visiosoft.module.advs::view_type',['table']) }}"><h4 class="viewType"> <i class="fa fa-table" ></i> {{ trans('visiosoft.module.advs::field.show_table_view.name') }} </h4></a>
 </div>
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig b/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig
index 664fad088..028e5e940 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/partials/table-row.twig
@@ -32,9 +32,11 @@
         <td class="vertical-center">
             {{ adv.created_at|date("d/m/Y") }}
         </td>
+        {% if setting_value('visiosoft.module.location::list_page_location') %}
         <td class="vertical-center">
             {{ adv.city_name }} / {{ adv.country_name }}
         </td>
+        {% endif %}
         {% if entries('advs').isEnabled('customfields') %}
             {% include "visiosoft.module.customfields::cftablerow" %}
         {% endif %}
@@ -57,9 +59,11 @@
             </a>
         </div>
         <div class="table-row-name-bar">
+            {% if setting_value('visiosoft.module.location::list_page_location') %}
             <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                data-toggle="tooltip" data-placement="top" title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                         class="fa fa-map-marker"></i> </a>
+            {% endif %}
             <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i
                         class="fa fa-user"></i> </a>
             {% if entries('advs').isEnabled('comparisons') %}
@@ -78,9 +82,11 @@
     <td class="vertical-center">
         {{ adv.created_at|date("d/m/Y") }}
     </td>
+    {% if setting_value('visiosoft.module.location::list_page_location') %}
     <td class="vertical-center">
         {{ adv.city_name }} / {{ adv.country_name }}
     </td>
+    {% endif %}
     {% if entries('advs').isEnabled('customfields') %}
         {% include "visiosoft.module.customfields::cftablerow" %}
     {% endif %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/table.twig b/addons/default/visiosoft/advs-module/resources/views/advs/table.twig
index 824a8b7ab..2bb32d2b3 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/table.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/table.twig
@@ -94,7 +94,9 @@
                                         <th scope="col" colspan="2" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
                                         <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
                                         <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
+                                        {% if setting_value('visiosoft.module.location::list_page_location') %}
                                         <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
+                                        {% endif %}
                                         {% if entries('advs').isEnabled('customfields') %}
                                             {% include "visiosoft.module.customfields::cftable" %}
                                         {% endif %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
index fc126f274..42d40728c 100644
--- a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
@@ -36,7 +36,7 @@
                     </div><!-- panel-body -->
                 </div>
             </div><!-- panel -->
-
+            {% if setting_value('visiosoft.module.location::list_page_location') %}
             <div class="panel-default panel-faq">
                 <!-- panel-heading -->
                 <div class="panel-heading active-faq">
@@ -94,7 +94,7 @@
                     </div><!-- panel-body -->
                 </div>
             </div><!-- panel -->
-
+            {% endif %}
             {% for key,value in checkboxes %}
                 <!-- panel -->
                 <div class="panel-default panel-faq">
diff --git a/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js b/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js
index 46624eff9..ba0e04767 100644
--- a/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js
+++ b/addons/default/visiosoft/default-theme/resources/js/scroll-screen.js
@@ -1,3 +1,5 @@
 $(window).on('load',function(){
-    $('#swipeTableModal').modal('show');
+    if (window.innerWidth < 800) {
+        $('#swipeTableModal').modal('show');
+    }
 });
\ No newline at end of file
diff --git a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig
index a1a46271b..6915021e7 100644
--- a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig
+++ b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig
@@ -9,6 +9,8 @@
                 <form action="{{ url('advs/list') }}" id="home-page-search-form" method="get">
                     <div class="row">
                         <div class="col-md-12">
+
+                            {% if setting_value('visiosoft.module.location::home_page_location') %}
                             <div class="col-md-2 home-search-field">
                                 <div class="form-group ">
                                     {% set cities = entries('location','cities').orderBy('slug').get() %}
@@ -21,49 +23,53 @@
                                 </div>
                             </div>
                             <div class="col-md-2 home-search-field">
-                                <div class="form-group ">
-                                    <ul>
-                                        <li class="dropdown home-search-category-field">
-                                            {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
-                                            <a href="#" class="btn btn-default" data-toggle="dropdown" role="button"
-                                               aria-haspopup="true" aria-expanded="false">
+                                {% else %}
+                                <div class="col-md-4 home-search-field">
+                                    {% endif %}
+
+                                    <div class="form-group ">
+                                        <ul>
+                                            <li class="dropdown home-search-category-field">
+                                                {% set cats = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('order').get() %}
+                                                <a href="#" class="btn btn-default" data-toggle="dropdown" role="button"
+                                                   aria-haspopup="true" aria-expanded="false">
                                             <span class="selected-category-item"
                                                   style="display: inline-block;">{{ trans('theme::fields.categories') }}</span>
-                                            </a>
-                                            <ul class="dropdown-menu cat-dropdown-menu">
-                                                {% for cat in cats %}
-                                                    <li><a href="#" data-id="{{ cat.id }}"
-                                                           class="navigation-category-select-item">{{ cat.name }}</a>
-                                                    </li>
-                                                {% endfor %}
-                                            </ul>
-                                        </li>
-                                    </ul>
+                                                </a>
+                                                <ul class="dropdown-menu cat-dropdown-menu">
+                                                    {% for cat in cats %}
+                                                        <li><a href="#" data-id="{{ cat.id }}"
+                                                               class="navigation-category-select-item">{{ cat.name }}</a>
+                                                        </li>
+                                                    {% endfor %}
+                                                </ul>
+                                            </li>
+                                        </ul>
+                                    </div>
                                 </div>
-                            </div>
-                            <input type="hidden" value="" name="cat" id="searchable_category_input"
-                                   class="select-category-home-id">
-                            <div class="col-md-4 home-search-field">
-                                <div class="form-group ">
-                                    {% set SearchPlaceHolder = entries('cats','placeholderforsearch').get() %}
-                                    <input type="text" name="keyword" data-period="2000" id="search_ac_navigator"
-                                           data-type='[{% for placeholder in SearchPlaceHolder %}"{{ placeholder.name }}","...",{% endfor %}"..."]'
-                                           class="form-control search-input">
+                                <input type="hidden" value="" name="cat" id="searchable_category_input"
+                                       class="select-category-home-id">
+                                <div class="col-md-4 home-search-field">
+                                    <div class="form-group ">
+                                        {% set SearchPlaceHolder = entries('cats','placeholderforsearch').get() %}
+                                        <input type="text" name="keyword" data-period="2000" id="search_ac_navigator"
+                                               data-type='[{% for placeholder in SearchPlaceHolder %}"{{ placeholder.name }}","...",{% endfor %}"..."]'
+                                               class="form-control search-input">
+                                    </div>
+                                </div>
+                                <div class="col-md-1 home-search-field">
+                                    <button type="submit" class="btn btn-default pl-5 pr-5 search-button"><i
+                                                class="fa fa-search"></i> {{ trans('theme::fields.search') }}
+                                    </button>
                                 </div>
-                            </div>
-                            <div class="col-md-1 home-search-field">
-                                <button type="submit" class="btn btn-default pl-5 pr-5 search-button"><i
-                                            class="fa fa-search"></i> {{ trans('theme::fields.search') }}
-                                </button>
-                            </div>
 
-                            <div class="col-md-3 home-search-field">
-                                <button type="button" class="btn btn-default map-search-button pl-5 pr-5 "><i
-                                            class="fa fa-map-marker"></i> {{ trans('theme::fields.search_map') }}
-                                </button>
+                                <div class="col-md-3 home-search-field">
+                                    <button type="button" class="btn btn-default map-search-button pl-5 pr-5 "><i
+                                                class="fa fa-map-marker"></i> {{ trans('theme::fields.search_map') }}
+                                    </button>
+                                </div>
                             </div>
                         </div>
-                    </div>
                 </form>
                 {% if(app.request.cookies.has('last_search')) %}
                     <div class="last-search">
@@ -115,7 +121,7 @@
                                                 <div class="featured-image">
                                                     <a href="{{ adv.detail_url }}">
                                                         {% if adv.is_get_adv == "1" and adv.stock == "0" and entries('advs').isEnabled('carts') %}
-                                                        <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
+                                                            <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
                                                         {% endif %}
                                                         <img
                                                                 src="{{ adv.cover_photo }}"
@@ -150,14 +156,17 @@
                                                     <!-- item-info-right -->
                                                     <div class="user-option pull-right">
                                                         {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                            <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                            <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                               data-toggle="tooltip" data-placement="top"
                                                                title="{{ trans('visiosoft.module.advs::field.online_shopping') }}"><i
                                                                         class="fa fa-shopping-cart"></i> </a>
                                                         {% endif %}
+                                                        {% if setting_value('visiosoft.module.location::home_page_location') %}
                                                         <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                                                            data-toggle="tooltip" data-placement="top"
                                                            title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                     class="fa fa-map-marker"></i> </a>
+                                                        {% endif %}
                                                     </div><!-- item-info-right -->
                                                 </div><!-- ad-meta -->
                                             </div><!-- featured -->
@@ -243,14 +252,17 @@
                                                 <!-- item-info-right -->
                                                 <div class="user-option pull-right">
                                                     {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                           data-toggle="tooltip" data-placement="top"
                                                            title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                     class="fa fa-shopping-cart"></i> </a>
                                                     {% endif %}
+                                                    {% if setting_value('visiosoft.module.location::home_page_location') %}
                                                     <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                                                        data-toggle="tooltip" data-placement="top"
                                                        title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                 class="fa fa-map-marker"></i> </a>
+                                                    {% endif %}
                                                 </div><!-- item-info-right -->
                                             </div><!-- ad-meta -->
                                         </div><!-- item-info -->
@@ -276,7 +288,8 @@
                                                             class="img-respocive"></a>
 
                                                 {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                    <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                    <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                       data-toggle="tooltip" data-placement="top"
                                                        title="Get ilanı"><i
                                                                 class="fa fa-check-square-o"></i></a>
                                                 {% endif %}
@@ -309,14 +322,17 @@
                                                 <!-- item-info-right -->
                                                 <div class="user-option pull-right">
                                                     {% if adv.is_get_adv == "1" and adv.stock != "0" and entries('advs').isEnabled('carts') %}
-                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}" data-toggle="tooltip" data-placement="top"
+                                                        <a href="{{ url_route('adv_AddCart',[adv.id]) }}"
+                                                           data-toggle="tooltip" data-placement="top"
                                                            title="{{ trans('visiosoft.module.advs::field.online_shopping') }}"><i
                                                                     class="fa fa-shopping-cart"></i> </a>
                                                     {% endif %}
+                                                    {% if setting_value('visiosoft.module.location::home_page_location') %}
                                                     <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
                                                        data-toggle="tooltip" data-placement="top"
                                                        title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                 class="fa fa-map-marker"></i> </a>
+                                                    {% endif %}
                                                 </div><!-- item-info-right -->
                                             </div><!-- ad-meta -->
                                         </div><!-- item-info -->
@@ -341,6 +357,6 @@
                 </div><!-- advertisement -->
             </div><!-- row -->
         </div><!-- main-content -->
-        {{ blocks('advs-default-theme-addoncategories-bottom') }} 
+        {{ blocks('advs-default-theme-addoncategories-bottom') }}
     </div><!-- container -->
 </section>
\ No newline at end of file
diff --git a/addons/default/visiosoft/location-module/resources/config/settings.php b/addons/default/visiosoft/location-module/resources/config/settings.php
new file mode 100644
index 000000000..2977763f5
--- /dev/null
+++ b/addons/default/visiosoft/location-module/resources/config/settings.php
@@ -0,0 +1,27 @@
+<?php
+
+
+use Anomaly\Streams\Platform\Model\Location\LocationCitiesEntryModel;
+use Anomaly\Streams\Platform\Model\Location\LocationDistrictsEntryModel;
+use Visiosoft\LocationModule\Country\CountryModel;
+
+return [
+    'home_page_location' => [
+        'type'   => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+        ],
+    ],
+    'list_page_location' => [
+        'type'   => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+        ],
+    ],
+    'detail_page_location' => [
+        'type'   => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+        ],
+    ],
+];