diff --git a/plugins/rainlab/blog/models/Post.php b/plugins/rainlab/blog/models/Post.php
index 2f7525638..23508bb16 100644
--- a/plugins/rainlab/blog/models/Post.php
+++ b/plugins/rainlab/blog/models/Post.php
@@ -234,7 +234,7 @@ class Post extends Model
 
     // \Log::info($fields->category_groups->value);
     // \Log::info($fields->category_groupsq->value);
-        
+
         if (isset($this->awtor)) {
             if ($this->awtor->type == 'other' && $context == "create") {
                 $fields->author_name->value = '';
diff --git a/plugins/tps/reklama/components/Advertisement.php b/plugins/tps/reklama/components/Advertisement.php
index 0ac950f03..6ec107396 100644
--- a/plugins/tps/reklama/components/Advertisement.php
+++ b/plugins/tps/reklama/components/Advertisement.php
@@ -117,15 +117,16 @@ class Advertisement extends ComponentBase
             $statistika->increment('click');
         }
 
-        //if($data['url']){
-           
+
+        // if($data['url']){
+
           //  $this->page['url'] = $data['url'];
-             //return Redirect::to($data['url']);
+            //  return Redirect::to($data['url']);
           // return [
             // '@#'.$this->alias => $this->renderPartial('@redirect'),
            //];
-            
-       //}
+
+    //    }
 
     }
 }
diff --git a/plugins/tps/reklama/components/advertisement/default.htm b/plugins/tps/reklama/components/advertisement/default.htm
index 87222bd24..377a61e23 100644
--- a/plugins/tps/reklama/components/advertisement/default.htm
+++ b/plugins/tps/reklama/components/advertisement/default.htm
@@ -1,16 +1,16 @@
-<div id="{{__SELF__}}" class="{{__SELF__.property('css_class')}}">
+
     {% if __SELF__.property('random') %}
     {% put scripts %}
-    <script>
+    <!-- <script>
         $.request('{{__SELF__}}::onShow',{
             data:{random:{{__SELF__.property('random')}}
         {% if __SELF__.property('css_class') %},css_class:'{{__SELF__.property('css_class')}}' {% endif %}
         }
         });
-    </script>
+    </script> -->
     {% endput %}
     {% else %}
         {% partial __SELF__ ~ "::"~ __SELF__.property('type') %}
     {% endif %}
-</div>
+
 
diff --git a/plugins/tps/reklama/components/advertisement/slider.htm b/plugins/tps/reklama/components/advertisement/slider.htm
index 263988748..26b27c54d 100644
--- a/plugins/tps/reklama/components/advertisement/slider.htm
+++ b/plugins/tps/reklama/components/advertisement/slider.htm
@@ -1,9 +1,10 @@
 {% if __SELF__.group and __SELF__.group.adds %}
-<div class="rek_{{__SELF__}}">
+
     {% for reklama in __SELF__.group.adds %}
-    <a class="rek__item"
+        <div class="swiper-slide">
+    <a
        {% if reklama.enable_stats and reklama.url %}
-       data-request="{{__SELF__}}::onRedirect"
+       data-request="onRedirect"
        data-request-data = '[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
        {% else %}
        href="{{reklama.url|default('#')}}" target="_blank"
@@ -15,74 +16,8 @@
             <img src="{{reklama.web_media_mobile|default(reklama.media)|media_cdn}}" alt="{{reklama.title}}"    >
         </picture>
     </a>
+    </div>
     {% endfor %}
-</div>
 
-{% if __SELF__.property('random') %}
-<script>
-    
-    // advertisement start
-    $(function () {
-        var $slideshow = $(".rek_{{__SELF__}}");
-        var ImagePauses = {{__SELF__.group.adds.pluck('display')}};
 
-        // Init
-        $slideshow.slick({
-            dots: false,
-            arrows: false,
-            infinite: true,
-            initialSlide: 0,
-            autoplay: true,
-            autoplaySpeed: ImagePauses[0] * 1000,
-            fade: true,
-            cssEase: "linear",
-            adaptiveHeight: true,
-        });
-
-        // Sliding settings
-        $slideshow.on("afterChange", function (event, slick, currentSlide) {
-            // Update autoplay speed according to slide index
-            $slideshow.slick(
-                "slickSetOption",
-                "autoplaySpeed",
-                ImagePauses[currentSlide] * 1000,
-                true
-            );
-        });
-    });
-    // advertisement end
-</script>
-{% else %}
-{% put scripts %}
-<script>
-    $(function () {
-        var $slideshow = $(".rek_{{__SELF__}}");
-        var ImagePauses = {{__SELF__.group.adds.pluck('display')}};
-
-        // Init
-        $slideshow.slick({
-            dots: false,
-            arrows: false,
-            infinite: true,
-            initialSlide: 0,
-            autoplay: true,
-            autoplaySpeed: ImagePauses[0] * 1000,
-            fade: true,
-            cssEase: "linear",
-            adaptiveHeight: true,
-        });
-
-        // Sliding settings
-        $slideshow.on("afterChange", function (event, slick, currentSlide) {
-            $slideshow.slick(
-                "slickSetOption",
-                "autoplaySpeed",
-                ImagePauses[currentSlide] * 1000,
-                true
-            );
-        });
-    });
-</script>
-{% endput %}
-{% endif %}
 {% endif %}
diff --git a/plugins/tps/reklama/controllers/reklamascontroller/config_filter.yaml b/plugins/tps/reklama/controllers/reklamascontroller/config_filter.yaml
new file mode 100644
index 000000000..9d3771d75
--- /dev/null
+++ b/plugins/tps/reklama/controllers/reklamascontroller/config_filter.yaml
@@ -0,0 +1,50 @@
+# ===================================
+# Filter Scope Definitions
+# ===================================
+
+scopes:
+    title:
+        label: Title Search
+        type: text
+        modelClass: Tps\Reklama\Models\Reklama
+        scope: FilterName
+
+    category:
+
+        # Filter name
+        label: rainlab.blog::lang.posts.filter_category
+
+        # Model Class name
+        modelClass: Tps\Reklama\Models\Group
+
+        # Model attribute to display for the name
+        nameFrom: name
+
+        # Apply query scope
+        scope: FilterCategories
+
+    published:
+
+        # Filter name
+        label: rainlab.blog::lang.posts.filter_published
+
+        # Filter type
+        type: switch
+
+        # SQL Conditions
+        conditions:
+            - active <> '1'
+            - active = '1'
+
+    published_date:
+
+        # Filter name
+        label: rainlab.blog::lang.posts.filter_date
+
+        # Filter type
+        type: daterange
+
+        # SQL Conditions
+        conditions: created_at >= ':after' AND created_at <= ':before'
+
+
diff --git a/plugins/tps/reklama/controllers/reklamascontroller/config_list.yaml b/plugins/tps/reklama/controllers/reklamascontroller/config_list.yaml
index 47471683c..5815da63b 100644
--- a/plugins/tps/reklama/controllers/reklamascontroller/config_list.yaml
+++ b/plugins/tps/reklama/controllers/reklamascontroller/config_list.yaml
@@ -10,3 +10,4 @@ toolbar:
     buttons: list_toolbar
     search:
         prompt: 'backend::lang.list.search_prompt'
+filter: config_filter.yaml
diff --git a/plugins/tps/reklama/models/Reklama.php b/plugins/tps/reklama/models/Reklama.php
index d0e385ed9..2463ad828 100644
--- a/plugins/tps/reklama/models/Reklama.php
+++ b/plugins/tps/reklama/models/Reklama.php
@@ -21,7 +21,7 @@ class Reklama extends Model
      * @var string The database table used by the model.
      */
     public $table = 'tps_reklama_item';
-    
+
       public $translatable = [
         'media',
         'media_mobile',
@@ -62,6 +62,18 @@ class Reklama extends Model
 
     }
 
+    public function scopeFilterName($query, $name)
+    {
+        return $query->where('title', 'LIKE', '%' . $name . '%');
+    }
+
+    public function scopeFilterCategories($query, $group)
+    {
+        return $query->whereHas('group', function ($q) use ($group) {
+            $q->whereIn('id', $group);
+        });
+    }
+
     public function getViewsAttribute(){
         if($this->enable_stats)
             return $this->stats->sum('view');
diff --git a/plugins/tps/reklama/models/reklama/columns.yaml b/plugins/tps/reklama/models/reklama/columns.yaml
index ab9623f7e..9c9f2d046 100644
--- a/plugins/tps/reklama/models/reklama/columns.yaml
+++ b/plugins/tps/reklama/models/reklama/columns.yaml
@@ -20,8 +20,8 @@ columns:
         type: text
         searchable: true
         sortable: true
+        select: name
         relation: group
-        valueFrom: name
     views:
         label: views
         type: text
diff --git a/themes/modern2/layouts/new/master.htm b/themes/modern2/layouts/new/master.htm
index 394aa4aa4..1a68045c5 100644
--- a/themes/modern2/layouts/new/master.htm
+++ b/themes/modern2/layouts/new/master.htm
@@ -53,8 +53,6 @@ random = 0
 
         {% partial 'new/mobile-menu' %}
 
-
-
         <div class="header-search-icon">
           <img src="{{ 'assets/new/icons/search.svg'|theme}}" alt="seach" />
         </div>
@@ -63,7 +61,7 @@ random = 0
           <a href="/" class="header-logo">
             <!-- <img src="{{ 'assets/images/newYearLogo.png'|theme}}" alt="logo" /> -->
             <img src="{{ 'assets/new/icons/orientlogo.svg'|theme}}" alt="Orient News" />
-           
+
           </a>
            <h1> {{'site.slogan'|_}}</h1>
         </div>
@@ -116,9 +114,9 @@ random = 0
 
 
        {% partial 'new/menu' %}
-       
+
        {% partial 'new/latest-news-mobile' %}
-       
+
        {% partial 'new/morque' %}
 
 
@@ -129,15 +127,20 @@ random = 0
   {% partial 'new/footer' %}
 
   <!-- SCRIPTS -->
-  
+
   <script src="{{ 'assets/new/scripts/swiper/swiper-bundle.min.js'|theme}}"></script>
-  {% scripts %}
   <script src="{{ 'assets/new/jquery.js'|theme}}"></script>
   <script src="{{ 'assets/new/copy.js'|theme}}"></script>
+    {% scripts %}
+
   {% framework extras %}
 
 
 
+
+
+
+
 <!-- javascript end
 ============================================= -->
 <!-- Global site tag (gtag.js) - Google Analytics -->
@@ -151,4 +154,4 @@ random = 0
 </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/themes/modern2/pages/new/home.htm b/themes/modern2/pages/new/home.htm
index 4ba22233f..1081a070d 100644
--- a/themes/modern2/pages/new/home.htm
+++ b/themes/modern2/pages/new/home.htm
@@ -12,66 +12,35 @@ robot_follow = "follow"
 localeTitle[en] = "Home"
 localeUrl[en] = "/home"
 
-[builderList adv4]
-modelClass = "Tps\Reklama\Models\Reklama"
-scope = "-"
-scopeValue = "{{ :scope }}"
-displayColumn = "id"
-noRecordsMessage = "No records found"
-detailsPage = "-"
-detailsUrlParameter = "id"
-pageNumber = "{{ :page }}"
+[adverts adverts5]
+code = 5
+type = "slider"
+random = 0
 
-[builderList adv5]
-modelClass = "Tps\Reklama\Models\Reklama"
-scope = "-"
-scopeValue = "{{ :scope }}"
-displayColumn = "id"
-noRecordsMessage = "No records found"
-detailsPage = "-"
-detailsUrlParameter = "id"
-pageNumber = "{{ :page }}"
+[adverts adverts6]
+code = 6
+type = "slider"
+random = 0
+
+[adverts adverts7]
+code = 7
+type = "slider"
+random = 0
+
+[adverts adverts8]
+code = 8
+type = "slider"
+random = 0
 ==
-{% put styles %}
-
-<!--     <style>
-    .trending-banner img {
-        width: 100%;
-        height: 85%;
-        -o-object-fit: cover;
-        object-fit: cover;
-    }
-</style> -->
-
-{% endput %}
-
-{% set records = adv4.records %}
-{% set displayColumn = adv4.displayColumn %}
-{% set noRecordsMessage = adv4.noRecordsMessage %}
-{% set detailsPage = adv4.detailsPage %}
-{% set detailsKeyColumn = adv4.detailsKeyColumn %}
-{% set detailsUrlParameter = adv4.detailsUrlParameter %}
-
- 
-
 {% partial 'newHome/main' %}
 {% partial 'newHome/main-popular' %}
 
-{% partial 'adv/2adv' records=records id=19 id2=20 %}
+{% partial 'adv/2adv' adv1=adverts5 adv2=adverts6 %}
 
 {% partial 'newHome/publication' %}
 
 
-
-{% set records = adv5.records %}
-{% set displayColumn = adv5.displayColumn %}
-{% set noRecordsMessage = adv5.noRecordsMessage %}
-{% set detailsPage = adv5.detailsPage %}
-{% set detailsKeyColumn = adv5.detailsKeyColumn %}
-{% set detailsUrlParameter = adv5.detailsUrlParameter %}
-
-
-{% partial 'adv/2adv' records=records id=21 id2=22 %}
+{% partial 'adv/2adv' adv1=adverts7 adv2=adverts8 %}
 
 {% partial 'newHome/poleznoe' %}
 
@@ -81,17 +50,17 @@ pageNumber = "{{ :page }}"
         <div class="media-videos">
              {% partial 'newHome/video' %}
         </div>
-       
+
         <div class="media-videos media-photos">
              {% partial 'newHome/photo' %}
         </div>
-        
-           
+
+
       </div>
     </div>
   </section>
-  
-  
+
+
   <section class="partners">
       <div class="container">
         <div class="partners-inner">
@@ -99,9 +68,9 @@ pageNumber = "{{ :page }}"
           <div class="partners-content">
             <div class="swiper partnerSwiper">
               <div class="swiper-wrapper">
-                
+
                  {% partial 'newHome/partners' header="" %}
-                
+
               </div>
               <div class="partner-prev photo-prev video-prev">
                 <img src="{{'assets/new/icons/arrow-left-white.svg'|theme}}" alt="" />
@@ -114,13 +83,13 @@ pageNumber = "{{ :page }}"
         </div>
       </div>
     </section>
-    
-    
+
+
   <section class="photo-scroller">
     <div class="photo-scroller-inner">
       <div class="swiper photoScrollerSwiper">
         <div class="swiper-wrapper">
-          
+
         </div>
         <div class="photo-scroller-prev video-prev">
           <img src="{{'assets/new/icons/arrow-left-white.svg'|theme}}" alt="" />
@@ -134,9 +103,9 @@ pageNumber = "{{ :page }}"
       </div>
     </div>
   </section>
-  
+
   {% put scripts %}
        <script src="{{ 'assets/new/scripts/marquee/marquee3k.js'|theme}}"></script>
-        <script src="{{ 'assets/new/scripts/core/main.js'|theme}}"></script> 
-        
+        <script src="{{ 'assets/new/scripts/core/main.js'|theme}}"></script>
+
   {% endput %}
\ No newline at end of file
diff --git a/themes/modern2/partials/adv/2adv.htm b/themes/modern2/partials/adv/2adv.htm
index f126b6d22..a4f508f9b 100644
--- a/themes/modern2/partials/adv/2adv.htm
+++ b/themes/modern2/partials/adv/2adv.htm
@@ -2,52 +2,61 @@
 ==
 <section class="banners">
     <div class="container banner-container">
-      <div class="banners-inner">
-      
-        <div class="swiper bannerSwiper-1">
-          <div class="swiper-wrapper">
-          
-           {% for record in records if record.group_id == id and record.active == 1 %}
-            <div class="swiper-slide">
-              <div class="banner">
-                <!-- <img src="{{record.media|media}}" alt="" /> -->
-                <a href="{{ record.url }}" target="_blank">
-               <picture>
-                <source media="(min-width:700px)" srcset="{{record.media|media_cdn}}">
-                <img src="{{record.web_media_mobile|default(record.media)|media_cdn}}" alt="{{record.title}}"    >
-              </picture>
-                  </a>
-              </div>
+        <div class="banners-inner">
+
+            <div class="swiper bannerSwiper-1">
+                <div class="swiper-wrapper">
+                    {% if adv1.group and adv1.group.adds %}
+
+                    {% for reklama in adv1.group.adds %}
+                    <div class="swiper-slide">
+                        <div class="banner">
+                            <a {% if reklama.enable_stats and reklama.url %} data-request="onRedirect"
+                                data-request-data='[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
+                                onclick='window.open("{{reklama.url}}", "_blank");' {% else %} href="#" {% endif %}>
+                                <picture>
+                                    <source media="(min-width:700px)" srcset="{{reklama.media|media_cdn}}">
+                                    <img src="{{reklama.web_media_mobile|default(reklama.media)|media_cdn}}"
+                                        alt="{{reklama.title}}">
+                                </picture>
+                            </a>
+                        </div>
+                    </div>
+                    {% endfor %}
+
+
+                    {% endif %}
+
+
+                </div>
             </div>
-             {% else %}
-                <li class="no-data">{{ noRecordsMessage }}</li>
-            {% endfor %}
-            
-          </div>
+
+            <div class="swiper bannerSwiper-2">
+                <div class="swiper-wrapper">
+                    {% if adv2.group and adv2.group.adds %}
+
+                    {% for reklama in adv2.group.adds %}
+                    <div class="swiper-slide">
+                        <div class="banner">
+                            <a {% if reklama.enable_stats and reklama.url %} data-request="onRedirect"
+                                data-request-data='[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
+                                onclick='window.open("{{reklama.url}}", "_blank");' {% else %} href="#" {% endif %}>
+                                <picture>
+                                    <source media="(min-width:700px)" srcset="{{reklama.media|media_cdn}}">
+                                    <img src="{{reklama.web_media_mobile|default(reklama.media)|media_cdn}}"
+                                        alt="{{reklama.title}}">
+                                </picture>
+                            </a>
+                        </div>
+                    </div>
+                    {% endfor %}
+
+
+                    {% endif %}
+
+                </div>
+            </div>
+
         </div>
-        
-        <div class="swiper bannerSwiper-2">
-          <div class="swiper-wrapper">
-          
-           {% for record in records if record.group_id == id2 and record.active == 1 %}
-            <div class="swiper-slide">
-              <div class="banner">
-                <!-- <img src="{{record.media|media}}" alt="" /> -->
-                <a href="{{ record.url }}" target="_blank">
-              <picture>
-                <source media="(min-width:700px)" srcset="{{record.media|media_cdn}}">
-                <img src="{{record.web_media_mobile|default(record.media)|media_cdn}}" alt="{{record.title}}"    >
-              </picture>
-                </a>
-              </div>
-            </div>
-           {% else %}
-            <li class="no-data">{{ noRecordsMessage }}</li>
-           {% endfor %}
-           
-          </div>
-        </div> 
-        
-      </div>
     </div>
-  </section>
\ No newline at end of file
+</section>
diff --git a/themes/modern2/partials/adv/right-sidebar.htm b/themes/modern2/partials/adv/right-sidebar.htm
index d1074375d..7c1e65331 100644
--- a/themes/modern2/partials/adv/right-sidebar.htm
+++ b/themes/modern2/partials/adv/right-sidebar.htm
@@ -1,16 +1,24 @@
 [viewBag]
 ==
 <div class="aside-ad-wrapper">
-        {% for record in records if record.group_id == id %}
-           
-          {% if record.id == 96 %}
-          <a href="{{ record.url }}" target="_blank">
-            <img src="{{record.media|media}}" alt="" />
-          </a>
-          {% endif %}
-          
-        {% else %}
-            <li class="no-data">{{ noRecordsMessage }}</li>
-        {% endfor %}
-      
-    </div>
\ No newline at end of file
+
+    {% if adv.group and adv.group.adds %}
+
+    {% for reklama in adv.group.adds %}
+    <div>
+        <a {% if reklama.enable_stats and reklama.url %} data-request="onRedirect"
+            data-request-data='[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
+            onclick='window.open("{{reklama.url}}", "_blank");' {% else %} href="#" {% endif %}>
+            <picture>
+                <source media="(min-width:700px)" srcset="{{reklama.media|media_cdn}}">
+                <img src="{{reklama.web_media_mobile|default(reklama.media)|media_cdn}}" alt="{{reklama.title}}">
+            </picture>
+        </a>
+    </div>
+
+    {% endfor %}
+
+    {% endif %}
+
+
+</div>
diff --git a/themes/modern2/partials/adv/right-sidebar2.htm b/themes/modern2/partials/adv/right-sidebar2.htm
index 86fbd034f..fcdd74a2e 100644
--- a/themes/modern2/partials/adv/right-sidebar2.htm
+++ b/themes/modern2/partials/adv/right-sidebar2.htm
@@ -1,25 +1,30 @@
 [viewBag]
 ==
 <div class="{{css}}-banner">
-          <div class="swiper trendingSwiper">
-            <div class="swiper-wrapper">
-            {% for record in records if record.group_id == id and record.active == 1 %}
-            
-              <div class="swiper-slide">
-                <a href="{{ record.url }}" target="_blank">
-                  <!-- <img src="{{record.media|media}}" alt="" /> -->
-                  
-                  <picture>
-                    <source media="(min-width:700px)" srcset="{{record.media|media_cdn}}">
-                    <img src="{{record.web_media_mobile|default(record.media)|media_cdn}}" alt="{{record.title}}"    >
-                </picture>
+    <div class="swiper trendingSwiper">
+        <div class="swiper-wrapper">
+            {% if adv.group and adv.group.adds %}
+
+            {% for reklama in adv.group.adds %}
+            <div class="swiper-slide">
+
+                <a {% if reklama.enable_stats and reklama.url %} data-request="onRedirect"
+                    data-request-data='[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
+                    onclick='window.open("{{reklama.url}}", "_blank");' {% else %} href="#" {% endif %}>
+                    <picture>
+                        <source media="(min-width:700px)" srcset="{{reklama.media|media_cdn}}">
+                        <img src="{{reklama.web_media_mobile|default(reklama.media)|media_cdn}}"
+                            alt="{{reklama.title}}">
+                    </picture>
                 </a>
-              </div>
-  
-           {% else %}
-                <li class="no-data">{{ noRecordsMessage }}</li>
-            {% endfor %}
-              
+
             </div>
-          </div>
-        </div>
\ No newline at end of file
+            {% endfor %}
+
+            {% endif %}
+
+
+
+        </div>
+    </div>
+</div>
diff --git a/themes/modern2/partials/newHome/main-popular.htm b/themes/modern2/partials/newHome/main-popular.htm
index 9c7b0be6c..1b873f7e8 100644
--- a/themes/modern2/partials/newHome/main-popular.htm
+++ b/themes/modern2/partials/newHome/main-popular.htm
@@ -18,16 +18,12 @@ noRecordsMessage = "No records found"
 detailsPage = "-"
 detailsUrlParameter = "id"
 pageNumber = "{{ :page }}"
+
+[adverts adverts4]
+code = 4
+type = "slider"
+random = 0
 ==
-{% set records = adv3.records %}
-{% set displayColumn = adv3.displayColumn %}
-{% set noRecordsMessage = adv3.noRecordsMessage %}
-{% set detailsPage = adv3.detailsPage %}
-{% set detailsKeyColumn = adv3.detailsKeyColumn %}
-{% set detailsUrlParameter = adv3.detailsUrlParameter %}
-
-
-
 {% set post = byEditor.posts %}
 
 <section class="trending">
@@ -61,7 +57,7 @@ pageNumber = "{{ :page }}"
          {% partial 'newHome/popular-item' %}
  
          
-         {% partial 'adv/right-sidebar2' records=records id=18 css="trending" %}
+         {% partial 'adv/right-sidebar2' adv=adverts4 css="trending" %}
          
       </div>
     </div>
diff --git a/themes/modern2/partials/newHome/main.htm b/themes/modern2/partials/newHome/main.htm
index 433eeaf7e..242a8fd3b 100644
--- a/themes/modern2/partials/newHome/main.htm
+++ b/themes/modern2/partials/newHome/main.htm
@@ -18,15 +18,10 @@ sortOrder = "published_at desc"
 categoryPage = 404
 postPage = 404
 
-[builderList adv1]
-modelClass = "Tps\Reklama\Models\Reklama"
-scope = "-"
-scopeValue = "{{ :scope }}"
-displayColumn = "id"
-noRecordsMessage = "No records found"
-detailsPage = "-"
-detailsUrlParameter = "id"
-pageNumber = "{{ :page }}"
+[adverts adverts2]
+code = 2
+type = "slider"
+random = 0
 ==
 {% set postsMainLeft = postsMainLeft.posts %}
 {% set postsMainRight = postsMainRight.posts %}
@@ -34,77 +29,67 @@ pageNumber = "{{ :page }}"
 
 
 <!-- MAIN ======== -->
-  <main class="main" style="margin-top: 40px;">
+<main class="main" style="margin-top: 40px;">
     <div class="main-inner">
-      <section class="main-inner-content">
-      
-      
-        {% partial 'newHome/main-slider' %}
-        
-        {% set records = adv1.records %}
-        {% set displayColumn = adv1.displayColumn %}
-        {% set noRecordsMessage = adv1.noRecordsMessage %}
-        {% set detailsPage = adv1.detailsPage %}
-        {% set detailsKeyColumn = adv1.detailsKeyColumn %}
-        {% set detailsUrlParameter = adv1.detailsUrlParameter %}
-        
+        <section class="main-inner-content">
 
-        
-        <section class="main-advert">
-          <div class="container main-news-container">
-            <div class="main-advert-inner">
-           
-               <div class="swiper mainAdvertSwiper">
-                    <div class="swiper-wrapper">
-                    {% for key, record in records if record.group_id == 16 %}
-                      
-                 
-        
-                      
-                      <div class="swiper-slide">
-                           <a href="{{ record.url }}" target="_blank">
-                              <picture>
-                                <source media="(min-width:700px)" srcset="{{record.media|media_cdn}}">
-                                <img src="{{record.web_media_mobile|default(record.media)|media_cdn}}" alt="{{record.title}}"    >
-                              </picture>
-                           <!--    <img src="{{record.media|media}}" alt="" /> -->
-                           </a>
-                      </div>
-                      
-                    
-                    {% else %}
-                        <li class="no-data">{{ noRecordsMessage }}</li>
-                    {% endfor %}
-                
-                 </div>
-              </div>
-             
-            </div>
-          </div>
+
+            {% partial 'newHome/main-slider' %}
+
+
+            <section class="main-advert">
+                <div class="container main-news-container">
+                    <div class="main-advert-inner">
+
+                        <div class="swiper mainAdvertSwiper">
+                            <div class="swiper-wrapper">
+
+
+                                {% if adverts2.group and adverts2.group.adds %}
+
+                                {% for reklama in adverts2.group.adds %}
+                                <div class="swiper-slide">
+                                    <a {% if reklama.enable_stats and reklama.url %} data-request="onRedirect"
+                                        data-request-data='[{id:{{reklama.id}}},{url:"{{reklama.url}}"}]'
+                                        onclick='window.open("{{reklama.url}}", "_blank");' {% else %} href="#" {% endif
+                                        %}>
+                                        <picture>
+                                            <source media="(min-width:700px)" srcset="{{reklama.media|media_cdn}}">
+                                            <img src="{{reklama.web_media_mobile|default(reklama.media)|media_cdn}}"
+                                                alt="{{reklama.title}}">
+                                        </picture>
+                                    </a>
+                                </div>
+                                {% endfor %}
+
+
+                                {% endif %}
+
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </section>
+
+
+
+            <section class="sub-news">
+
+                <div class="container">
+                    <div class="sub-news-inner">
+
+                        {% partial 'newHome/main-bussiness' categoryPosts = postsMainLeft %}
+
+                        {% partial 'newHome/main-tender' categoryPosts = postsMainRight %}
+
+                    </div>
+                </div>
+            </section>
         </section>
-       
-       
-       
-        <section class="sub-news">
-        
-          <div class="container">
-            <div class="sub-news-inner">
-            
-            {% partial 'newHome/main-bussiness' categoryPosts = postsMainLeft %}
-       
-            {% partial 'newHome/main-tender' categoryPosts = postsMainRight %} 
-             
-            </div>
-          </div>
-        </section>
-      </section>
-      
-      
-      
-     {% partial 'newHome/right-sidebar' %}
-      
-      
-      
+
+        {% partial 'newHome/right-sidebar'%}
+
     </div>
-  </main>
-  <!-- MAIN end ======== -->
\ No newline at end of file
+</main>
+<!-- MAIN end ======== -->
diff --git a/themes/modern2/partials/newHome/partners.htm b/themes/modern2/partials/newHome/partners.htm
index 5d31168be..235f53c7e 100644
--- a/themes/modern2/partials/newHome/partners.htm
+++ b/themes/modern2/partials/newHome/partners.htm
@@ -24,13 +24,13 @@ pageNumber = "{{ :page }}"
 
 
         {% for record in records if record.group_id == 1 %}
-        
+
             <div class="swiper-slide">
               <div class="partners-item">
                 <img src="{{record.media|media}}" alt="" />
               </div>
             </div>
-            
+
         {% else %}
             <li class="no-data">{{ noRecordsMessage }}</li>
-        {% endfor %}
\ No newline at end of file
+        {% endfor %}
diff --git a/themes/modern2/partials/newHome/right-sidebar.htm b/themes/modern2/partials/newHome/right-sidebar.htm
index 43665a773..5d486ca0a 100644
--- a/themes/modern2/partials/newHome/right-sidebar.htm
+++ b/themes/modern2/partials/newHome/right-sidebar.htm
@@ -20,28 +20,14 @@ categoryPage = 404
 postPage = 404
 exceptPost = "{{ :id }}"
 
-[builderList adv2]
-modelClass = "Tps\Reklama\Models\Reklama"
-scope = "-"
-scopeValue = "{{ :scope }}"
-displayColumn = "id"
-noRecordsMessage = "No records found"
-detailsPage = "-"
-detailsUrlParameter = "id"
-pageNumber = "{{ :page }}"
+[adverts adverts3]
+code = 3
+type = "slider"
+random = 0
 ==
 {% set turkmenPosts = turkmenistan.posts %}
 {% set worldPosts = world.posts %}
 
-{% set records = adv2.records %}
-{% set displayColumn = adv2.displayColumn %}
-{% set noRecordsMessage = adv2.noRecordsMessage %}
-{% set detailsPage = adv2.detailsPage %}
-{% set detailsKeyColumn = adv2.detailsKeyColumn %}
-{% set detailsUrlParameter = adv2.detailsUrlParameter %}
-
-
-
 <div class="container aside-container">
   <aside class="aside {{ class }}">
     <div class="aside-content-wrapper">
@@ -85,6 +71,8 @@ pageNumber = "{{ :page }}"
         </a>
       </div>
     </div>
-    {% partial 'adv/right-sidebar2' records=records id=17 css="aside" %}
+    
+    {% partial 'adv/right-sidebar2' adv=adverts3 css="aside" %}
+    
   </aside>
 </div>
\ No newline at end of file