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 6c3a9af6c..7d94fd80c 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
@@ -28,17 +28,27 @@ return [
                     'estimated_pending_time',
                     'default_published_time',
                     'default_GET',
-                    'add_canvas',
+                    'hide_standard_price_field',
+                    'listing_page_image',
+                ],
+            ],
+            'ads_image' => [
+                'title' => 'visiosoft.module.advs::section.ads_image',
+                'fields' => [
+                    'image_resize_backend',
+                    'full_image_width',
+                    'full_image_height',
+                    'medium_image_width',
+                    'medium_image_height',
                     'thumbnail_width',
                     'thumbnail_height',
-                    'picture_width',
-                    'picture_height',
+                    'add_canvas',
+                    'image_canvas_width',
+                    'image_canvas_height',
                     'watermark_type',
                     'watermark_text',
                     'watermark_image',
                     'watermark_position',
-                    'listing_page_image',
-                    'hide_standard_price_field',
                 ],
             ],
             'user' => [
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 1c096479f..fe39dc59c 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php
@@ -108,71 +108,6 @@ return [
             'default_value' => 0,
         ],
     ],
-    'thumbnail_width' => [
-        'type' => 'anomaly.field_type.integer',
-        'config' => [
-            'default_value' => 270,
-        ],
-    ],
-    'add_canvas' => [
-        'type' => 'anomaly.field_type.boolean',
-        'config' => [
-            'default_value' => true,
-            'mode' => 'checkbox',
-        ],
-    ],
-    'thumbnail_height' => [
-        'type' => 'anomaly.field_type.integer',
-        'config' => [
-            'default_value' => 180,
-        ],
-    ],
-    'picture_width' => [
-        'type' => 'anomaly.field_type.integer',
-        'config' => [
-            'default_value' => 600,
-        ],
-    ],
-    'picture_height' => [
-        'type' => 'anomaly.field_type.integer',
-        'config' => [
-            'default_value' => 400,
-        ],
-    ],
-    'watermark_type' => [
-        'type' => 'anomaly.field_type.select',
-        'bind' => 'adv.watermark_type',
-        'env' => 'ADV_WATERMARK_TYPE',
-        'required' => true,
-        'config' => [
-            'options' => ['image' => 'Image', 'text' => 'Text'],
-            'default_value' => 'text',
-        ]
-    ],
-    'watermark_text' => [
-        'type' => 'anomaly.field_type.text',
-        'bind' => 'adv.watermark_text',
-        'env' => 'ADV_WATERMARK_TEXT',
-    ],
-    'watermark_image' => [
-        'type' => 'anomaly.field_type.file',
-        'bind' => 'adv.watermark_image',
-        'env' => 'ADV_WATERMARK_IMAGE',
-        'config' => [
-            'default_value' => '',
-        ],
-    ],
-    'watermark_position' => [
-        'type' => 'anomaly.field_type.select',
-        'bind' => 'adv.watermark_position',
-        'env' => 'ADV_WATERMARK_POSITION',
-        'required' => true,
-        'config' => [
-            'options' => ['top-right' => 'Top Right', 'top-left' => 'Top Left', 'bottom-right' => 'Bottom Right',
-                'bottom-left' => 'Bottom Left', 'center' => 'Middle'],
-            'default_value' => 'top-right',
-        ]
-    ],
 
     'listing_page_image' => [
         'type' => 'anomaly.field_type.file',
@@ -255,4 +190,97 @@ return [
             'default_value' => 15,
         ],
     ],
+
+    //Image Settings
+    'image_resize_backend' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+        ],
+    ],
+    'full_image_width' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 800,
+        ],
+    ],
+    'full_image_height' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 600,
+        ],
+    ],
+    'medium_image_width' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 600,
+        ],
+    ],
+    'medium_image_height' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 400,
+        ],
+    ],
+    'thumbnail_width' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 270,
+        ],
+    ],
+    'thumbnail_height' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 180,
+        ],
+    ],
+    'add_canvas' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => true,
+        ],
+    ],
+    'image_canvas_width' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 800,
+        ],
+    ],
+    'image_canvas_height' => [
+        'type' => 'anomaly.field_type.integer',
+        'config' => [
+            'default_value' => 600,
+        ],
+    ],
+    'watermark_type' => [
+        'type' => 'anomaly.field_type.select',
+        'bind' => 'adv.watermark_type',
+        'env' => 'ADV_WATERMARK_TYPE',
+        'required' => true,
+        'config' => [
+            'options' => ['image' => 'Image', 'text' => 'Text'],
+            'default_value' => 'text',
+        ]
+    ],
+    'watermark_text' => [
+        'type' => 'anomaly.field_type.text',
+        'bind' => 'adv.watermark_text',
+        'env' => 'ADV_WATERMARK_TEXT',
+    ],
+    'watermark_image' => [
+        'type' => 'anomaly.field_type.file',
+        'bind' => 'adv.watermark_image',
+        'env' => 'ADV_WATERMARK_IMAGE',
+    ],
+    'watermark_position' => [
+        'type' => 'anomaly.field_type.select',
+        'bind' => 'adv.watermark_position',
+        'env' => 'ADV_WATERMARK_POSITION',
+        'required' => true,
+        'config' => [
+            'options' => ['top-right' => 'Top Right', 'top-left' => 'Top Left', 'bottom-right' => 'Bottom Right',
+                'bottom-left' => 'Bottom Left', 'center' => 'Middle'],
+            'default_value' => 'top-right',
+        ]
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css
index 3e790ce9b..cc6bb4d82 100644
--- a/addons/default/visiosoft/advs-module/resources/css/list.css
+++ b/addons/default/visiosoft/advs-module/resources/css/list.css
@@ -212,4 +212,8 @@ a.sort-by-open-dropdown:hover {
 .sort-by-item:hover {
     text-decoration: underline;
     cursor: pointer;
+}
+
+.filter-section .countries input[type=checkbox] {
+    display: none;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/field.php b/addons/default/visiosoft/advs-module/resources/lang/ar/field.php
index b9bb01c77..e9700e6ad 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/ar/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/ar/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'في ال 24 ساعة الماضية'
     ],
+    'in_the_last_day' => [
+        'name' => 'في آخر 24 ساعة'
+    ],
     'in_the_last_week' => [
         'name' => 'في الأسبوع الماضي'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'خيارات',
+
+    'free' => 'مجانا',
+    'ad_date' => 'تاريخ الإعلان',
+    'photo_video' => 'صور وفيديو',
+    'and_above' => 'و ما فوق',
+    'and_below' => 'و تحت',
+    'clear_all' => 'امسح الكل',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/az/field.php b/addons/default/visiosoft/advs-module/resources/lang/az/field.php
index a12c174d5..15e855630 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/az/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/az/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Son 24 saatda'
     ],
+    'in_the_last_day' => [
+        'name' => 'Son 24 Saatda'
+    ],
     'in_the_last_week' => [
         'name' => 'Son Həftədə'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'Seçimlər',
+
+    'free' => 'Pulsuz',
+    'ad_date' => 'Reklam Tarixi',
+    'photo_video' => 'Foto, Video',
+    'and_above' => 'və yuxarıda',
+    'and_below' => 'və aşağıda',
+    'clear_all' => 'Hamısını sil, hamısını təmizlə',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/bn/field.php b/addons/default/visiosoft/advs-module/resources/lang/bn/field.php
index 32571c214..daac50ac7 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/bn/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/bn/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'শেষ 24 ঘন্টা'
     ],
+    'in_the_last_day' => [
+        'name' => 'শেষ 24 ঘন্টা'
+    ],
     'in_the_last_week' => [
         'name' => 'গত সপ্তাহে'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'বিকল্পগুলি',
+
+    'free' => 'ফ্রি',
+    'ad_date' => 'বিজ্ঞাপন তারিখ',
+    'photo_video' => 'ছবি, ভিডিও',
+    'and_above' => 'এবং উপরে',
+    'and_below' => 'এবং নিচে',
+    'clear_all' => 'সব পরিষ্কার করে দাও',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/field.php b/addons/default/visiosoft/advs-module/resources/lang/de/field.php
index 13f8a2790..ed94fe3fe 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/de/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/de/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'In den letzten 24 Stunden'
     ],
+    'in_the_last_day' => [
+        'name' => 'In den letzten 24 Stunden'
+    ],
     'in_the_last_week' => [
         'name' => 'In der letzten Woche'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Optionen',
+
+    'free' => 'Frei',
+    'ad_date' => 'Anzeigedatum',
+    'photo_video' => 'Foto, Video',
+    'and_above' => 'und darüber',
+    'and_below' => 'und darunter',
+    'clear_all' => 'Alles löschen',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/field.php b/addons/default/visiosoft/advs-module/resources/lang/el/field.php
index b20e07d18..1a6ee9765 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/el/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/el/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Τις τελευταίες 24 ώρες'
     ],
+    'in_the_last_day' => [
+        'name' => 'Τις τελευταίες 24 ώρες'
+    ],
     'in_the_last_week' => [
         'name' => 'Την τελευταία εβδομάδα'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Επιλογές',
+
+    'free' => 'Ελεύθερος',
+    'ad_date' => 'Ημερομηνία διαφήμισης',
+    'photo_video' => 'Φωτογραφία, βίντεο',
+    'and_above' => 'και παραπανω',
+    'and_below' => 'και παρακάτω',
+    'clear_all' => 'Τα καθαρίζω όλα',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/section.php b/addons/default/visiosoft/advs-module/resources/lang/en/section.php
index 926f1c534..b3ebe1995 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php
@@ -44,4 +44,5 @@ return [
     'options' => [
         'title' => 'Options',
     ],
+    'ads_image' => 'Ads Image',
 ];
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 458a81617..07d95f740 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php
@@ -79,21 +79,6 @@ return [
     'default_GET' => [
         'name' => 'Default Ad GET',
     ],
-    'add_canvas' => [
-        'name' => 'Add Canvas',
-    ],
-    'thumbnail_width' => [
-        'name' => 'Thumbnail Width',
-    ],
-    'thumbnail_height' => [
-        'name' => 'Thumbnail Height',
-    ],
-    'picture_width' => [
-        'name' => 'Picture Width',
-    ],
-    'picture_height' => [
-        'name' => 'Picture Height',
-    ],
     'twitter' => [
         'name' => 'Twitter',
     ],
@@ -106,18 +91,6 @@ return [
     'google' => [
         'name' => 'Google',
     ],
-    'watermark_type' => [
-        'name' => 'Watermark Type',
-    ],
-    'watermark_text' => [
-        'name' => 'Watermark Text',
-    ],
-    'watermark_image' => [
-        'name' => 'Watermark Image',
-    ],
-    'watermark_position' => [
-        'name' => 'Watermark Position',
-    ],
     'listing_page_image' => [
         'name' => 'Listing Page Image',
     ],
@@ -158,4 +131,49 @@ return [
     'popular_ads_limit' => [
         'name' => 'Popular Ads Limit',
     ],
+
+    //Image
+
+    'image_resize_backend' => [
+        'name' => 'Image Resize Backend',
+    ],
+    'full_image_width' => [
+        'name' => 'Full Image Width',
+    ],
+    'full_image_height' => [
+        'name' => 'Full Image Height',
+    ],
+    'medium_image_width' => [
+        'name' => 'Medium Image Width',
+    ],
+    'medium_image_height' => [
+        'name' => 'Medium Image Height',
+    ],
+    'thumbnail_width' => [
+        'name' => 'Thumbnail Width',
+    ],
+    'thumbnail_height' => [
+        'name' => 'Thumbnail Height',
+    ],
+    'add_canvas' => [
+        'name' => 'Add Canvas',
+    ],
+    'image_canvas_width' => [
+        'name' => 'Image Canvas Width',
+    ],
+    'image_canvas_height' => [
+        'name' => 'Image Canvas Height',
+    ],
+    'watermark_type' => [
+        'name' => 'Watermark Type',
+    ],
+    'watermark_text' => [
+        'name' => 'Watermark Text',
+    ],
+    'watermark_image' => [
+        'name' => 'Watermark Image',
+    ],
+    'watermark_position' => [
+        'name' => 'Watermark Position',
+    ],
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/es/field.php b/addons/default/visiosoft/advs-module/resources/lang/es/field.php
index 4087a6097..e6794e3d7 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/es/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/es/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'En las últimas 24 horas'
     ],
+    'in_the_last_day' => [
+        'name' => 'En las últimas 24 horas'
+    ],
     'in_the_last_week' => [
         'name' => 'En la ultima semana'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Opciones',
+
+    'free' => 'Gratis',
+    'ad_date' => 'Fecha de anuncio',
+    'photo_video' => 'Foto, video',
+    'and_above' => 'y por encima',
+    'and_below' => 'y por debajo',
+    'clear_all' => 'Limpiar todo',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/fa/field.php b/addons/default/visiosoft/advs-module/resources/lang/fa/field.php
index f3a8b6af4..24f7a4e22 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/fa/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/fa/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'در 24 ساعت گذشته'
     ],
+    'in_the_last_day' => [
+        'name' => 'در 24 ساعت گذشته'
+    ],
     'in_the_last_week' => [
         'name' => 'در هفته گذشته'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'گزینه ها',
+
+    'free' => 'رایگان',
+    'ad_date' => 'تاریخ آگهی',
+    'photo_video' => 'عکس ، فیلم',
+    'and_above' => 'و بالاتر',
+    'and_below' => 'و در زیر',
+    'clear_all' => 'همه را پاک کن',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/field.php b/addons/default/visiosoft/advs-module/resources/lang/fr/field.php
index 03f40be8c..82bb8cffc 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/fr/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/fr/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Au cours des dernières 24 heures'
     ],
+    'in_the_last_day' => [
+        'name' => 'Au cours des dernières 24 heures'
+    ],
     'in_the_last_week' => [
         'name' => 'La semaine dernière'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Options',
+
+    'free' => 'Gratuit',
+    'ad_date' => 'Date de l\'annonce',
+    'photo_video' => 'Photo, vidéo',
+    'and_above' => 'et ci-dessus',
+    'and_below' => 'et plus bas',
+    'clear_all' => 'Tout effacer',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/he/field.php b/addons/default/visiosoft/advs-module/resources/lang/he/field.php
index 299643f1a..cf39a5c15 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/he/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/he/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'ביממה האחרונה'
     ],
+    'in_the_last_day' => [
+        'name' => 'ב 24 השעות האחרונות'
+    ],
     'in_the_last_week' => [
         'name' => 'בשבוע שעבר'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'אפשרויות',
+
+    'free' => 'חינם',
+    'ad_date' => 'תאריך מודעה',
+    'photo_video' => 'צילום, וידאו',
+    'and_above' => 'ומעל',
+    'and_below' => 'ומתחת',
+    'clear_all' => 'נקה הכל',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/hi/field.php b/addons/default/visiosoft/advs-module/resources/lang/hi/field.php
index f28079702..3e21a0cba 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/hi/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/hi/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'द लास्ट 24 ऑवर्स में'
     ],
+    'in_the_last_day' => [
+        'name' => 'द लास्ट 24 ऑवर्स में'
+    ],
     'in_the_last_week' => [
         'name' => 'पिछले हफ़्ते में'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'विकल्प',
+
+    'free' => 'नि: शुल्क',
+    'ad_date' => 'विज्ञापन तिथि',
+    'photo_video' => 'फोटो, वीडियो',
+    'and_above' => 'और ऊपर',
+    'and_below' => 'और नीचे',
+    'clear_all' => 'सभी साफ करें',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/it/field.php b/addons/default/visiosoft/advs-module/resources/lang/it/field.php
index 32c4b7f26..528ef3366 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/it/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/it/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Nelle ultime 24 ore'
     ],
+    'in_the_last_day' => [
+        'name' => 'Nelle ultime 24 ore'
+    ],
     'in_the_last_week' => [
         'name' => 'Nell\'ultima settimana'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Opzioni',
+
+    'free' => 'Gratuito',
+    'ad_date' => 'Data dell\'annuncio',
+    'photo_video' => 'Foto, video',
+    'and_above' => 'e al di sopra',
+    'and_below' => 'e sotto',
+    'clear_all' => 'Cancella tutto',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/ja/field.php b/addons/default/visiosoft/advs-module/resources/lang/ja/field.php
index da6c3d26b..9b68ead52 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/ja/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/ja/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => '過去24時間'
     ],
+    'in_the_last_day' => [
+        'name' => '過去24時間で'
+    ],
     'in_the_last_week' => [
         'name' => '先週'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'オプション',
+
+    'free' => '自由',
+    'ad_date' => '広告日',
+    'photo_video' => '写真、ビデオ',
+    'and_above' => '以上',
+    'and_below' => '以下',
+    'clear_all' => 'すべてクリア',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/ko/field.php b/addons/default/visiosoft/advs-module/resources/lang/ko/field.php
index e23c25a50..e19e6a372 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/ko/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/ko/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => '지난 24 시간 동안'
     ],
+    'in_the_last_day' => [
+        'name' => '지난 24 시간 동안'
+    ],
     'in_the_last_week' => [
         'name' => '지난주에'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => '옵션',
+
+    'free' => '비어 있는',
+    'ad_date' => '광고 날짜',
+    'photo_video' => '사진, 비디오',
+    'and_above' => '이상',
+    'and_below' => '이하',
+    'clear_all' => '모두 지우기',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/field.php b/addons/default/visiosoft/advs-module/resources/lang/nl/field.php
index 8810e1a44..95d2cc31f 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/nl/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/nl/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'In de afgelopen 24 uur'
     ],
+    'in_the_last_day' => [
+        'name' => 'In de afgelopen 24 uur'
+    ],
     'in_the_last_week' => [
         'name' => 'In de laatste week'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Opties',
+
+    'free' => 'Vrij',
+    'ad_date' => 'Advertentiedatum',
+    'photo_video' => 'Foto, video',
+    'and_above' => 'en hoger',
+    'and_below' => 'en onder',
+    'clear_all' => 'Wis alles',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/pl/field.php b/addons/default/visiosoft/advs-module/resources/lang/pl/field.php
index 7bcc0f92d..3d1d8b019 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/pl/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/pl/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'W ciągu ostatnich 24 godzin'
     ],
+    'in_the_last_day' => [
+        'name' => 'W ciągu ostatnich 24 godzin'
+    ],
     'in_the_last_week' => [
         'name' => 'W ostatnim tygodniu'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'Opcje',
+
+    'free' => 'Wolny',
+    'ad_date' => 'Data ogłoszenia',
+    'photo_video' => 'Zdjęcie, wideo',
+    'and_above' => 'i powyżej',
+    'and_below' => 'i poniżej',
+    'clear_all' => 'Wyczyść wszystko',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/pt/field.php b/addons/default/visiosoft/advs-module/resources/lang/pt/field.php
index 6e5992591..1429a94fe 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/pt/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/pt/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Nas últimas 24 horas'
     ],
+    'in_the_last_day' => [
+        'name' => 'Nas últimas 24 horas'
+    ],
     'in_the_last_week' => [
         'name' => 'Na última semana'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Opções',
+
+    'free' => 'Livre',
+    'ad_date' => 'Data do Anúncio',
+    'photo_video' => 'Foto, Vídeo',
+    'and_above' => 'e acima',
+    'and_below' => 'e abaixo',
+    'clear_all' => 'Limpar tudo',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/ro/field.php b/addons/default/visiosoft/advs-module/resources/lang/ro/field.php
index 3d73c7207..07aabded1 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/ro/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/ro/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'În ultimele 24 de ore'
     ],
+    'in_the_last_day' => [
+        'name' => 'În ultimele 24 de ore'
+    ],
     'in_the_last_week' => [
         'name' => 'In ultima saptamana'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'Opțiuni',
+
+    'free' => 'Gratuit',
+    'ad_date' => 'Data publicității',
+    'photo_video' => 'Foto, Video',
+    'and_above' => 'Si mai sus',
+    'and_below' => 'si sub',
+    'clear_all' => 'Curata tot',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/ru/field.php b/addons/default/visiosoft/advs-module/resources/lang/ru/field.php
index 485e864a3..63f2056ce 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/ru/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/ru/field.php
@@ -249,6 +249,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'В последние 24 часа'
     ],
+    'in_the_last_day' => [
+        'name' => 'За последние 24 часа'
+    ],
     'in_the_last_week' => [
         'name' => 'В последнюю неделю'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Параметры',
+
+    'free' => 'Бесплатно',
+    'ad_date' => 'Дата объявления',
+    'photo_video' => 'Фото, видео',
+    'and_above' => 'и выше',
+    'and_below' => 'и ниже',
+    'clear_all' => 'Очистить все',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/field.php b/addons/default/visiosoft/advs-module/resources/lang/sq/field.php
index 639544f16..5364d6b0c 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/sq/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/sq/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Në 24 orët e fundit'
     ],
+    'in_the_last_day' => [
+        'name' => 'Në 24 orët e fundit'
+    ],
     'in_the_last_week' => [
         'name' => 'Në Javën e Fundit'
     ],
@@ -297,4 +300,11 @@ return [
 
     // New create page
     'options' => 'Opsione',
+
+    'free' => 'Falas',
+    'ad_date' => 'Data e shpalljes',
+    'photo_video' => 'Foto, Video',
+    'and_above' => 'dhe më lart',
+    'and_below' => 'dhe më poshtë',
+    'clear_all' => 'Pastroji të gjitha',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/sv/field.php b/addons/default/visiosoft/advs-module/resources/lang/sv/field.php
index a43c3ee66..2a05f75c9 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/sv/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/sv/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Under de senaste 24 timmarna'
     ],
+    'in_the_last_day' => [
+        'name' => 'Under de senaste 24 timmarna'
+    ],
     'in_the_last_week' => [
         'name' => 'Under den sista veckan'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'alternativ',
+
+    'free' => 'Fri',
+    'ad_date' => 'Annonsdatum',
+    'photo_video' => 'Foto, video',
+    'and_above' => 'och ovan',
+    'and_below' => 'och under',
+    'clear_all' => 'Rensa alla',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
index 27f83287d..cc2f95416 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
@@ -250,6 +250,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Son 24 saat'
     ],
+    'in_the_last_day' => [
+        'name' => 'Son 24 Saat İçinde'
+    ],
     'in_the_last_week' => [
         'name' => 'Son 1 hafta'
     ],
@@ -298,4 +301,11 @@ return [
 
     // New create page
     'options' => 'Opsiyonlar',
+
+    'free' => 'Bedava',
+    'ad_date' => 'İlan Tarihi',
+    'photo_video' => 'Fotoğraf, Video',
+    'and_above' => 've yukarıda',
+    'and_below' => 've aşağıda',
+    'clear_all' => 'Hepsini temizle',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/uk/field.php b/addons/default/visiosoft/advs-module/resources/lang/uk/field.php
index cb14a5620..628c6f494 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/uk/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/uk/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'За останні 24 години'
     ],
+    'in_the_last_day' => [
+        'name' => 'В останні 24 години'
+    ],
     'in_the_last_week' => [
         'name' => 'В останній тиждень'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'Параметри',
+
+    'free' => 'Безкоштовно',
+    'ad_date' => 'Дата оголошення',
+    'photo_video' => 'Фото, Відео',
+    'and_above' => 'і вище',
+    'and_below' => 'і нижче',
+    'clear_all' => 'Очистити все',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/ur/field.php b/addons/default/visiosoft/advs-module/resources/lang/ur/field.php
index 03f40dc20..000857a60 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/ur/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/ur/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'آخری 24 گھنٹوں میں'
     ],
+    'in_the_last_day' => [
+        'name' => 'آخری 24 گھنٹوں میں'
+    ],
     'in_the_last_week' => [
         'name' => 'آخری ہفتے میں'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'اختیارات',
+
+    'free' => 'مفت',
+    'ad_date' => 'اشتہاری تاریخ',
+    'photo_video' => 'تصویر ، ویڈیو',
+    'and_above' => 'اور اوپر',
+    'and_below' => 'اور نیچے',
+    'clear_all' => 'تمام کو صاف کریں',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/vi/field.php b/addons/default/visiosoft/advs-module/resources/lang/vi/field.php
index e77c22b82..50d4e9dd8 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/vi/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/vi/field.php
@@ -248,6 +248,9 @@ return [
     'in_the_last_24_hours' => [
         'name' => 'Trong 24 giờ qua'
     ],
+    'in_the_last_day' => [
+        'name' => 'Trong 24 giờ qua'
+    ],
     'in_the_last_week' => [
         'name' => 'Trong tuần trước'
     ],
@@ -296,4 +299,11 @@ return [
 
     // New create page
     'options' => 'Tùy chọn',
+
+    'free' => 'Miễn phí',
+    'ad_date' => 'Ngày quảng cáo',
+    'photo_video' => 'Ảnh, Video',
+    'and_above' => 'trở lên',
+    'and_below' => 'và dưới đây',
+    'clear_all' => 'Làm sạch tất cả',
 ];
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index 3e0b283ac..bf879d2ad 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -2,6 +2,7 @@
 
 use Anomaly\Streams\Platform\Image\Command\MakeImageInstance;
 use Anomaly\Streams\Platform\Model\Advs\AdvsCustomFieldsEntryModel;
+use Carbon\Carbon;
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -371,4 +372,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         $neighborhood = $neighborhoodModel->newQuery()->find($this->neighborhood);
         return $neighborhood ? $neighborhood->name : false;
     }
+
+    public function expired()
+    {
+        return $this->finish_at ? $this->finish_at < Carbon::now() : true;
+    }
 }
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
index 6f022c006..a9cb314fd 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
@@ -4,4 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 
 interface AdvInterface extends EntryInterface
 {
+    public function expired();
 }
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index 15adeb88b..bea56a763 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -433,7 +433,7 @@ class AdvsController extends PublicController
 
         $adv = $this->adv_repository->getListItemAdv($id);
 
-        if ($adv) {
+        if ($adv && !$adv->expired()) {
 
             if ($this->adv_model->is_enabled('complaints')) {
                 $complaints = ComplaintsComplainTypesEntryModel::all();
diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
index 15226e51e..950b34146 100644
--- a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
@@ -7,8 +7,8 @@ return [
             'catalog_mode' => [
                 'title' => 'visiosoft.theme.base::section.catalog_mode.name',
                 'fields' => [
-                    'navigation_title', 'navigation_action', 'date_fields', 'price_fields',
-                    'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn',
+                    'home_page_sub_categories_limit', 'navigation_title', 'navigation_action', 'date_fields',
+                    'price_fields', 'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn',
                     'register_page_instruction_logo', 'register_page_alert_link'
                 ],
             ],
diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
index 7a8060004..791e3a74b 100644
--- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
@@ -62,6 +62,12 @@ return [
             "default_value" => "/",
         ]
     ],
+    "home_page_sub_categories_limit" => [
+        "type"   => "anomaly.field_type.integer",
+        "config" => [
+            "default_value" => 5,
+        ]
+    ],
     'style' => [
         'type' => 'anomaly.field_type.editor',
     ],
diff --git a/addons/default/visiosoft/base-theme/resources/js/script.js b/addons/default/visiosoft/base-theme/resources/js/script.js
new file mode 100644
index 000000000..690b763c9
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/js/script.js
@@ -0,0 +1,3 @@
+$('.categories-list .show-all').on('click', function () {
+    $(this).siblings('.hidden-category').toggleClass('hidden')
+})
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/button.php b/addons/default/visiosoft/base-theme/resources/lang/ar/button.php
index 2e0a18984..80a763ac2 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ar/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ar/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'إعادة تعيين كلمة المرور',
     'email' => 'البريد الإلكتروني',
     'phone' => 'هاتف',
+    'show_all' => 'عرض الكل',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php
index 6265d15eb..8221638f8 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'النمط (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'حد الفئات الفرعية للصفحة الرئيسية',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/az/button.php b/addons/default/visiosoft/base-theme/resources/lang/az/button.php
index 85f1fbd00..3fc99faad 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/az/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/az/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Parolu sıfırlamak',
     'email' => 'Elektron poçt',
     'phone' => 'Telefon',
+    'show_all' => 'Hamısını göstər',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/az/setting.php b/addons/default/visiosoft/base-theme/resources/lang/az/setting.php
index dea8e31cb..8317d134d 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/az/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/az/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Stil (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Əsas alt kateqoriyalar məhdudiyyəti',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/bn/button.php b/addons/default/visiosoft/base-theme/resources/lang/bn/button.php
index f13db1b81..696e27d0f 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/bn/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/bn/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'পাসওয়ার্ড রিসেট করুন',
     'email' => 'ইমেইল',
     'phone' => 'ফোন',
+    'show_all' => 'সব দেখাও',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php b/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php
index ff3d13cf2..37dd14199 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'স্টাইল (css)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'হোমপেজ সাব বিভাগের সীমা',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/de/button.php b/addons/default/visiosoft/base-theme/resources/lang/de/button.php
index 5d30708ec..cad240a9f 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/de/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/de/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Passwort zurücksetzen',
     'email' => 'Email',
     'phone' => 'Telefon',
+    'show_all' => 'Zeige alles',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/de/setting.php b/addons/default/visiosoft/base-theme/resources/lang/de/setting.php
index af29faa67..ec0ba8165 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/de/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/de/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Stil (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Homepage Unterkategorien Limit',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/el/button.php b/addons/default/visiosoft/base-theme/resources/lang/el/button.php
index 1da6f5342..0f1a4bccd 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/el/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/el/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Επαναφέρετε τον κωδικό πρόσβασης',
     'email' => 'ΗΛΕΚΤΡΟΝΙΚΗ ΔΙΕΥΘΥΝΣΗ',
     'phone' => 'Τηλέφωνο',
+    'show_all' => 'Προβολή όλων',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/el/setting.php b/addons/default/visiosoft/base-theme/resources/lang/el/setting.php
index 4a87ecaaf..4f4c3ecfc 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/el/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/el/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Στυλ (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Όριο υποκατηγοριών αρχικής σελίδας',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/button.php b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
index cffe38ff9..31f2b7e44 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Reset Password',
     'email' => 'Email',
     'phone' => 'Phone',
+    'show_all' => 'Show All',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
index 286403eb3..f927a8a08 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Style(CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Homepage Sub Categories Limit',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/es/button.php b/addons/default/visiosoft/base-theme/resources/lang/es/button.php
index 78bebaf92..02ef75923 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/es/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/es/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Restablecer la contraseña',
     'email' => 'Correo electrónico',
     'phone' => 'Teléfono',
+    'show_all' => 'Mostrar todo',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/es/setting.php b/addons/default/visiosoft/base-theme/resources/lang/es/setting.php
index 32222d06f..f6a949c76 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/es/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/es/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Estilo (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Límite de subcategorías de la página de inicio',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/fa/button.php b/addons/default/visiosoft/base-theme/resources/lang/fa/button.php
index 7b5df0aea..87d6b35e0 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/fa/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/fa/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'بازنشانی گذرواژه',
     'email' => 'پست الکترونیک',
     'phone' => 'تلفن',
+    'show_all' => 'نمایش همه',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php b/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php
index 6b8e78a6b..d77025933 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'سبک (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'زیرمجموعه ها',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/fr/button.php b/addons/default/visiosoft/base-theme/resources/lang/fr/button.php
index 198996dce..97741f836 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/fr/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/fr/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'réinitialiser le mot de passe',
     'email' => 'Email',
     'phone' => 'Téléphone',
+    'show_all' => 'Afficher tout',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php b/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php
index 9f444365c..c9b04e6e3 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Style (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Limite des sous-catégories de la page d\'accueil',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/he/button.php b/addons/default/visiosoft/base-theme/resources/lang/he/button.php
index 274274e95..25bf86fcb 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/he/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/he/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'לאפס את הסיסמה',
     'email' => 'אימייל',
     'phone' => 'טלפון',
+    'show_all' => 'תראה הכול',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/he/setting.php b/addons/default/visiosoft/base-theme/resources/lang/he/setting.php
index 9f6d3c839..fd6e10e06 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/he/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/he/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'סגנון (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'מגבלת קטגוריות המשנה לדף הבית',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/hi/button.php b/addons/default/visiosoft/base-theme/resources/lang/hi/button.php
index 7a040c6e8..3725bc8c3 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/hi/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/hi/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'पासवर्ड रीसेट',
     'email' => 'ईमेल',
     'phone' => 'फ़ोन',
+    'show_all' => 'सब दिखाओ',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php b/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php
index 371d0890f..91ac0ef7e 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'शैली (सीएसएस)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'मुखपृष्ठ उप श्रेणियाँ श्रेणियाँ सीमा',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/it/button.php b/addons/default/visiosoft/base-theme/resources/lang/it/button.php
index ba0f2618a..b4c7b4754 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/it/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/it/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Resetta la password',
     'email' => 'E-mail',
     'phone' => 'Telefono',
+    'show_all' => 'Mostra tutto',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/it/setting.php b/addons/default/visiosoft/base-theme/resources/lang/it/setting.php
index 39505176f..30d283ac0 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/it/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/it/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Stile (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Limite delle sottocategorie della home page',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ja/button.php b/addons/default/visiosoft/base-theme/resources/lang/ja/button.php
index 5abc593ec..744fbf811 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ja/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ja/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'パスワードを再設定する',
     'email' => 'Eメール',
     'phone' => '電話',
+    'show_all' => 'すべて表示する',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php
index c4d4dfba4..9ca3676c1 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'スタイル（CSS）',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'ホームページのサブカテゴリの制限',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ko/button.php b/addons/default/visiosoft/base-theme/resources/lang/ko/button.php
index 463d2729d..99d467012 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ko/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ko/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => '암호를 재설정',
     'email' => '이메일',
     'phone' => '전화',
+    'show_all' => '모두 표시',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php
index 4afe6e5f3..d1fa6353e 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => '스타일 (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => '홈페이지 하위 카테고리 제한',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/nl/button.php b/addons/default/visiosoft/base-theme/resources/lang/nl/button.php
index f325dfa66..7b2b98246 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/nl/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/nl/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Wachtwoord opnieuw instellen',
     'email' => 'E-mail',
     'phone' => 'Telefoon',
+    'show_all' => 'Toon alles',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php b/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php
index 1005f9569..2b23dac74 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Stijl (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Limiet subcategorieën op homepage',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/pl/button.php b/addons/default/visiosoft/base-theme/resources/lang/pl/button.php
index 8205dd934..83eb18729 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/pl/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/pl/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Zresetuj hasło',
     'email' => 'E-mail',
     'phone' => 'Telefon',
+    'show_all' => 'Pokaż wszystko',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php b/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php
index cb0fb7df8..5f3e95453 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Styl (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Limit podkategorii strony głównej',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/pt/button.php b/addons/default/visiosoft/base-theme/resources/lang/pt/button.php
index a23918410..612ea0312 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/pt/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/pt/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Redefinir senha',
     'email' => 'O email',
     'phone' => 'telefone',
+    'show_all' => 'Mostre tudo',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php b/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php
index cf530813e..26ef6f439 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Estilo (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Limite de subcategorias da página inicial',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ro/button.php b/addons/default/visiosoft/base-theme/resources/lang/ro/button.php
index 389a5e13f..16223ac8c 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ro/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ro/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Reseteaza parola',
     'email' => 'E-mail',
     'phone' => 'Telefon',
+    'show_all' => 'Arata tot',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php
index 9063ef6b6..10067e769 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Style (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Limita de subcategorii pentru pagina principală',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ru/button.php b/addons/default/visiosoft/base-theme/resources/lang/ru/button.php
index 5d812e7cf..68b50f752 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ru/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ru/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Сброс пароля',
     'email' => 'Электронное письмо',
     'phone' => 'Телефон',
+    'show_all' => 'Показать все',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php
index 025680245..9849ee374 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Style (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Ограничение подкатегорий домашней страницы',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/button.php b/addons/default/visiosoft/base-theme/resources/lang/sq/button.php
index a9d6d10f9..7101af0fd 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/sq/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/sq/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Rivendosni fjalëkalimin',
     'email' => 'Email',
     'phone' => 'Telefon',
+    'show_all' => 'Shfaq të gjitha',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php
index 10aa06b9f..7286cbb1a 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Style (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Nënkategoritë e faqes kryesore Kufiri',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/sv/button.php b/addons/default/visiosoft/base-theme/resources/lang/sv/button.php
index 7aa5184ce..993410a85 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/sv/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/sv/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Återställ lösenord',
     'email' => 'E-post',
     'phone' => 'Telefon',
+    'show_all' => 'Visa allt',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php b/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php
index c30618747..9d805bc60 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Stil (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Hemsida Underkategorier Begränsning',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
index 1f32fa616..309dbb297 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Şifremi Güncelle',
     'email' => 'E-posta',
     'phone' => 'Telefon',
+    'show_all' => 'Hepsini Göster ↓',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php b/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php
index fe4e05720..b5e3e3bb3 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Stil (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Ana Sayfa Alt Kategoriler Sınırı',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/uk/button.php b/addons/default/visiosoft/base-theme/resources/lang/uk/button.php
index 4c0e5f509..718b9965d 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/uk/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/uk/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Скинути пароль',
     'email' => 'Електронна пошта',
     'phone' => 'Телефон',
+    'show_all' => 'Покажи все',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php b/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php
index 85326bab7..f74df18be 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Стиль (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Підкатегорії домашньої сторінки Обмеження',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ur/button.php b/addons/default/visiosoft/base-theme/resources/lang/ur/button.php
index 667e8473d..4b30b9357 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ur/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ur/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'پاس ورڈ ری سیٹ',
     'email' => 'ای میل',
     'phone' => 'فون',
+    'show_all' => 'سارے دکھاو',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php
index 3be46a624..b63083f14 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'انداز (سی ایس ایس)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'مرکزی صفحہ ذیلی زمرے کی حد',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/vi/button.php b/addons/default/visiosoft/base-theme/resources/lang/vi/button.php
index db11498e4..bf07ad18c 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/vi/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/vi/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Đặt lại mật khẩu',
     'email' => 'E-mail',
     'phone' => 'Điện thoại',
+    'show_all' => 'Hiển thị tất cả',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php b/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php
index 53cd78f91..c133c17cb 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Phong cách (CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Giới hạn danh mục phụ của trang chủ',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/no-container.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/no-container.twig
new file mode 100644
index 000000000..20fe9b629
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/views/layouts/no-container.twig
@@ -0,0 +1,42 @@
+<!doctype html>
+
+<!--[if lt IE 7]>
+<html class="nojs ms lt_ie7" lang="{{ config('app.locale') }}"><![endif]-->
+<!--[if IE 7]>
+<html class="nojs ms ie7" lang="{{ config('app.locale') }}"><![endif]-->
+<!--[if IE 8]>
+<html class="nojs ms ie8" lang="{{ config('app.locale') }}"><![endif]-->
+<!--[if gt IE 8]>
+<html class="nojs ms" lang="{{ config('app.locale') }}"><![endif]-->
+
+<html lang="{{ config('app.locale') }}">
+
+<head>
+    {% include "visiosoft.theme.base::partials/metadata" %}
+    {% block styles %}{% endblock %}
+</head>
+
+<body>
+
+{% include "visiosoft.theme.base::partials/header" %}
+
+{{ addBlock('layouts/default/section')|raw }}
+
+<div>
+
+    {% include "visiosoft.theme.base::partials/messages" %}
+
+    {% if (request_path() == '/') %}
+        {% include "visiosoft.theme.base::index/default" %}
+    {% else %}
+        {% block content %}{% endblock %}
+    {% endif %}
+
+</div>
+
+{% include "visiosoft.theme.base::partials/footer" %}
+{% include "visiosoft.theme.base::partials/assets" %}
+{% include "visiosoft.theme.base::partials/settings" %}
+
+</body>
+</html>
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
index dbd77489b..48582c6d5 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
@@ -14,6 +14,7 @@
 {{ asset_add("theme.js", "visiosoft.theme.base::js/phonefield.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/lazy-loading.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/script.js") }}
 
 {# Theme Scripts #}
 {#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#}
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
index b2ce5c599..96f211d5e 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig
@@ -2,15 +2,9 @@
 
 <ul class="categories-list px-0 mr-2 d-block d-sm-none">
     <li class="categories-list-li category-icon text-truncate category-{{ main_category.slug }}">
-        <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ main_category.id }}"
-           class="main-category">
-            {% if main_category.icon.path != "" %}
-                <img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
-                     class="img-responsive">
-            {% else %}
-                <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}" alt="{{ main_category.name }}"
-                     class="img-responsive">
-            {% endif %}
+        <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
+            {% 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">
             <span>{{ main_category.name }}</span>
             <p class="p-0 sub-categories">
                 {% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}
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 9e47154ed..7335b7d0a 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,34 +1,35 @@
 {% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %}
 <ul class="categories-list p-0 d-none d-sm-block">
     <li class="categories-list-li category-icon category-{{ main_category.slug }}">
-        {% if main_category.icon.path != "" %}
-            <img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
-                 class="img-responsive">
-        {% else %}
-            <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}"
-                 alt="{{ main_category.name }}"
-                 class="img-responsive">
-        {% endif %}
-        <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ main_category.id }}"
-           class="main-category">
+        {% 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>
         </a>
-        <ul class="p-0" style="">
+        <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() %}
-            {% for sub_category in sub_categories|slice(0,sub_categories_limit) %}
-                <li>
-                    <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ sub_category.id }}"
-                       class="">{{ sub_category.name }}</a>
-                </li>
-            {% endfor %}
-            {% for sub_category in sub_categories|slice(sub_categories_limit,count(sub_categories)) %}
-                <li class="hidden hidden-category">
-                    <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ sub_category.id }}"
-                       class="">{{ sub_category.name }}</a>
-                </li>
+            {% set subCatLoop = [
+                {
+                    'start': 0,
+                    'end': sub_categories_limit,
+                    'class': '',
+                },
+                {
+                    'start': sub_categories_limit,
+                    'end': count(sub_categories),
+                    'class': 'hidden hidden-category',
+                }
+            ] %}
+            {% for subLoop in subCatLoop %}
+                {% 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>
+                    </li>
+                {% endfor %}
             {% endfor %}
+
             {% if count(sub_categories) > sub_categories_limit %}
-                <li class="show-all">
+                <li class="show-all" data-limit="{{ sub_categories_limit }}">
                     <a>
                         {{ trans('visiosoft.theme.base::button.show_all') }}
                         <i class="fas fa-arrow-circle-down"></i>
diff --git a/addons/default/visiosoft/cats-module/resources/lang/ur/section.php b/addons/default/visiosoft/cats-module/resources/lang/ur/section.php
new file mode 100644
index 000000000..79cd3cfa0
--- /dev/null
+++ b/addons/default/visiosoft/cats-module/resources/lang/ur/section.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'category' => [
+        'title' => 'قسم',
+    ],
+    'placeholderforsearch' => [
+        'title' => 'پلیس ہولڈر',
+    ],
+];
diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
index 3cc81a7d9..80c7a1205 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
@@ -188,4 +188,9 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
         unset($categories[count($categories) - 1]);
         return $categories;
     }
+
+    public function getParent()
+    {
+        return $this->parent_category;
+    }
 }
diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
index 73eb638d5..d3c20ba24 100644
--- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
+++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php
@@ -4,4 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 
 interface CategoryInterface extends EntryInterface
 {
+    public function getParent();
 }
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
index e3f81eb98..d4f55f0c1 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
@@ -223,6 +223,8 @@
   height: 40px;
   margin-top: -9px;
   vertical-align: middle;
+  object-fit: contain;
+  object-position: center;
 }
 #topbar .logo svg .st0 {
   transition: fill 300ms 500ms;
@@ -2670,6 +2672,8 @@ body {
   max-height: 82px;
   margin-top: -30px;
   vertical-align: middle;
+  object-fit: contain;
+  object-position: center;
 }
 #login .logo svg .st0 {
   fill: #ffffff;
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg b/addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg
new file mode 100644
index 000000000..3a42e2edb
--- /dev/null
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="25.7" viewBox="0 0 40 25.7">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.906" y1="0.743" x2="0.193" y2="0.743" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#fff"/>
+      <stop offset="1" stop-color="#c6c4c4"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" x1="0.367" y1="0.156" x2="0.779" y2="0.997" xlink:href="#linear-gradient"/>
+    <linearGradient id="linear-gradient-3" x1="0.26" y1="0.715" x2="0.846" y2="0.216" xlink:href="#linear-gradient"/>
+  </defs>
+  <g id="oc_logo2" data-name="oc logo2" transform="translate(16875 -4360)">
+    <rect id="Rectangle_166" data-name="Rectangle 166" width="40" height="25.7" transform="translate(-16875 4360)" fill="#e2c756" opacity="0"/>
+    <g id="Group_16415" data-name="Group 16415" transform="translate(365.099 -0.303)">
+      <path id="Union_162" data-name="Union 162" d="M12.825,25.7h0ZM0,12.85a12.818,12.818,0,1,1,23.489,7.109,8.4,8.4,0,0,0-3.2-.69H16.277a7.31,7.31,0,1,0-3.555.882h6.534c4.015,0,7.851,4.117,7.851,5.549H12.774A12.818,12.818,0,0,1,0,12.85Z" transform="translate(-17233.715 4360.303)" fill="#fff"/>
+      <path id="Path_10942" data-name="Path 10942" d="M10721.25,13446.668a12.819,12.819,0,0,0,1.842-9.667,23.11,23.11,0,0,1-7.479,7.774,7.484,7.484,0,0,1-1.612,1.177h4A8.2,8.2,0,0,1,10721.25,13446.668Z" transform="translate(-27931.426 -9066.381)" opacity="0.49" fill="url(#linear-gradient)"/>
+      <path id="Path_10943" data-name="Path 10943" d="M9615.6,12634a12.736,12.736,0,0,0-9.6,5.741,22.812,22.812,0,0,1,10.778-.205,7.232,7.232,0,0,1,5.2,2.288A20.176,20.176,0,0,0,9615.6,12634Z" transform="translate(-26837.588 -8273.647)" opacity="0.49" fill="url(#linear-gradient-2)"/>
+      <path id="Path_10944" data-name="Path 10944" d="M9499,13345.158a12.865,12.865,0,0,0,8.006,7.852,23.372,23.372,0,0,1-3.057-10.4,7.239,7.239,0,0,1,.869-5.612A19.873,19.873,0,0,0,9499,13345.158Z" transform="translate(-26731.959 -8967.659)" opacity="0.49" fill="url(#linear-gradient-3)"/>
+    </g>
+  </g>
+</svg>
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg b/addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg
new file mode 100644
index 000000000..3cf852ea4
--- /dev/null
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="25.7" viewBox="0 0 40 25.7">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.906" y1="0.743" x2="0.193" y2="0.743" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#22547c"/>
+      <stop offset="1" stop-color="#0e3c61"/>
+    </linearGradient>
+    <linearGradient id="linear-gradient-2" x1="0.367" y1="0.156" x2="0.779" y2="0.997" xlink:href="#linear-gradient"/>
+    <linearGradient id="linear-gradient-3" x1="0.26" y1="0.715" x2="0.846" y2="0.216" xlink:href="#linear-gradient"/>
+  </defs>
+  <g id="oc_logo1" data-name="oc logo1" transform="translate(16924 -4360)">
+    <rect id="Rectangle_165" data-name="Rectangle 165" width="40" height="25.7" transform="translate(-16924 4360)" fill="#e2c756" opacity="0"/>
+    <g id="Group_16418" data-name="Group 16418" transform="translate(-16917.654 4360)">
+      <g id="Group_16370" data-name="Group 16370" transform="translate(0 0)">
+        <path id="Union_161" data-name="Union 161" d="M12.825,25.7h0ZM0,12.85a12.818,12.818,0,1,1,23.489,7.109,8.4,8.4,0,0,0-3.2-.69H16.277a7.31,7.31,0,1,0-3.555.882h6.534c4.015,0,7.851,4.117,7.851,5.549H12.774A12.818,12.818,0,0,1,0,12.85Z" fill="#22547c"/>
+        <path id="Path_4453" data-name="Path 4453" d="M10721.249,13446.667a12.814,12.814,0,0,0,1.841-9.667,23.133,23.133,0,0,1-7.479,7.775,7.526,7.526,0,0,1-1.61,1.176h4A8.229,8.229,0,0,1,10721.249,13446.667Z" transform="translate(-10697.711 -13426.683)" opacity="0.49" fill="url(#linear-gradient)"/>
+        <path id="Path_4455" data-name="Path 4455" d="M9615.6,12634a12.748,12.748,0,0,0-9.6,5.741,22.838,22.838,0,0,1,10.778-.205,7.235,7.235,0,0,1,5.2,2.289A20.174,20.174,0,0,0,9615.6,12634Z" transform="translate(-9603.875 -12633.949)" opacity="0.49" fill="url(#linear-gradient-2)"/>
+        <path id="Path_4456" data-name="Path 4456" d="M9499,13345.158a12.86,12.86,0,0,0,8,7.852,23.4,23.4,0,0,1-3.057-10.4,7.245,7.245,0,0,1,.871-5.614A19.88,19.88,0,0,0,9499,13345.158Z" transform="translate(-9498.241 -13327.961)" opacity="0.49" fill="url(#linear-gradient-3)"/>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ar/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ar/setting.php
index 4aff335b4..b00aec265 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ar/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ar/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'يتم استخدام أول عنصر تنقل يمكن الوصول إليه باعتباره منطقة <strong>home</strong>.',
         'reorder'      => 'سحب وإسقاط البنود الملاحة الابتدائية في <strong>الشريط الجانبي</strong> إلى إعادة ترتيب لهم.',
     ],
-    "icon" => [
-        'name' => 'أيقونة',
+    "login_icon" => [
+        'name' => 'رمز تسجيل الدخول',
+    ],
+    "panel_icon" => [
+        'name' => 'رمز اللوحة',
     ],
     "title" => [
         'name' => 'عنوان',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/az/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/az/setting.php
index a3e53f221..e8ca6e22f 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/az/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/az/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'İlk əlçatan naviqasiya elementi <strong>ev</strong> sahə kimi istifadə olunur.',
         'reorder'      => 'Sıralamaq üçün <strong>yan çubuğun</strong> də ilkin naviqasiya elementlərini sürükləyin və buraxın.',
     ],
-    "icon" => [
-        'name' => 'Nişan',
+    "login_icon" => [
+        'name' => 'Giriş nişanı',
+    ],
+    "panel_icon" => [
+        'name' => 'Panel nişanı',
     ],
     "title" => [
         'name' => 'Başlıq',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/bn/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/bn/setting.php
index 436406e4c..494058d4a 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/bn/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/bn/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'প্রথম অ্যাক্সেসযোগ্য নেভিগেশন আইটেমটি <strong>হোম</strong> অঞ্চল হিসাবে ব্যবহৃত হয়।',
         'reorder'      => 'পুনরায় ক্রম করতে প্রাথমিক নেভিগেশন আইটেমগুলিকে <strong>সাইডবার</strong> টেনে আনুন।',
     ],
-    "icon" => [
-        'name' => 'আইকন',
+    "login_icon" => [
+        'name' => 'লগইন আইকন',
+    ],
+    "panel_icon" => [
+        'name' => 'প্যানেল আইকন',
     ],
     "title" => [
         'name' => 'শিরোনাম',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/de/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/de/setting.php
index 53233e974..767a0fa96 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/de/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/de/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Das erste verfügbare Navigationselement wird als <strong>Startseite</strong> verwendet.',
         'reorder'      => 'Sie können die primären Navigationelemente per Drag & Drop in der <strong>Sidebar</strong> sortieren.',
     ],
-    "icon" => [
-        'name' => 'Symbol',
+    "login_icon" => [
+        'name' => 'Anmeldesymbol',
+    ],
+    "panel_icon" => [
+        'name' => 'Panel-Symbol',
     ],
     "title" => [
         'name' => 'Titel',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/el/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/el/setting.php
index c0b63068b..2768bb97c 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/el/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/el/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Το πρώτο προσβάσιμο στοιχείο πλοήγησης χρησιμοποιείται ως περιοχή <strong>home</strong>.',
         'reorder'      => 'Μεταφέρετε και αποθέστε τα κύρια στοιχεία πλοήγησης στην <strong>πλευρική γραμμή</strong> για να τα αναδιατάξετε.',
     ],
-    "icon" => [
-        'name' => 'Εικόνισμα',
+    "login_icon" => [
+        'name' => 'Εικονίδιο σύνδεσης',
+    ],
+    "panel_icon" => [
+        'name' => 'Εικονίδιο πίνακα',
     ],
     "title" => [
         'name' => 'Τίτλος',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/es/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/es/setting.php
index a2b93242a..bde700e29 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/es/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/es/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'El primer elemento de navegación accesible se utiliza como el área <strong>inicio</strong>.',
         'reorder'      => 'Arrastre y suelte los elementos de navegación principales en la barra lateral <strong></strong> para reordenarlos.',
     ],
-    "icon" => [
-        'name' => 'Icono',
+    "login_icon" => [
+        'name' => 'Icono de inicio de sesión',
+    ],
+    "panel_icon" => [
+        'name' => 'Icono de panel',
     ],
     "title" => [
         'name' => 'Título',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/fa/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/fa/setting.php
index 40f5f424e..b97823d05 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/fa/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/fa/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'اولین آیتم در منو به عنوان خانه در نظر گرفته می شود',
         'reorder'      => 'برای مرتب کردن آیتم ها را در سایدبار با موس جابجا کنید',
     ],
-    "icon" => [
-        'name' => 'آیکون',
+    "login_icon" => [
+        'name' => 'نماد ورود به سیستم',
+    ],
+    "panel_icon" => [
+        'name' => 'نماد صفحه',
     ],
     "title" => [
         'name' => 'عنوان',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/fr/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/fr/setting.php
index 4406c8031..de898fac5 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/fr/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/fr/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Le premier élément de navigation accessible est utilisé comme zone <strong>origine</strong>.',
         'reorder'      => 'Faites glisser et déposez les éléments de navigation principaux dans la barre latérale <strong></strong> pour les réorganiser.',
     ],
-    "icon" => [
-        'name' => 'Icône',
+    "login_icon" => [
+        'name' => 'Icône de connexion',
+    ],
+    "panel_icon" => [
+        'name' => 'Icône de panneau',
     ],
     "title" => [
         'name' => 'Titre',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/he/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/he/setting.php
index 7a681e9f8..dea5080bd 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/he/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/he/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'פריט הניווט הנגיש הראשון משמש כאזור <strong>ביתי</strong>.',
         'reorder'      => 'גרור ושחרר את הפריטים ניווט העיקרי <strong>הצדדי</strong> כדי לסדר אותן מחדש.',
     ],
-    "icon" => [
-        'name' => 'אייקון',
+    "login_icon" => [
+        'name' => 'סמל כניסה',
+    ],
+    "panel_icon" => [
+        'name' => 'אייקון פאנל',
     ],
     "title" => [
         'name' => 'כותרת',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/hi/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/hi/setting.php
index f8d6337a3..8058ba834 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/hi/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/hi/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'पहला सुलभ नेविगेशन आइटम <strong>होम</strong> क्षेत्र के रूप में उपयोग किया जाता है।',
         'reorder'      => 'उन्हें पुन: व्यवस्थित करने के लिए <strong>साइडबार</strong> में प्राथमिक नेविगेशन आइटम खींचें और छोड़ें।',
     ],
-    "icon" => [
-        'name' => 'चिह्न',
+    "login_icon" => [
+        'name' => 'लॉगिन आइकन',
+    ],
+    "panel_icon" => [
+        'name' => 'पैनल आइकन',
     ],
     "title" => [
         'name' => 'शीर्षक',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/it/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/it/setting.php
index 4a6ce2663..23f63674a 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/it/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/it/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Il primo elemento di navigazione accessibile viene utilizzato come area <strong>home</strong>.',
         'reorder'      => 'Trascina e rilascia gli elementi di navigazione principali nella barra laterale <strong></strong> per riordinarli.',
     ],
-    "icon" => [
-        'name' => 'Icona',
+    "login_icon" => [
+        'name' => 'Icona di accesso',
+    ],
+    "panel_icon" => [
+        'name' => 'Icona del pannello',
     ],
     "title" => [
         'name' => 'Titolo',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ja/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ja/setting.php
index 653a00f64..eb97a6c40 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ja/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ja/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => '最初のアクセス可能なナビゲーション項目は、 <strong>ホーム</strong> エリアとして使用されます。',
         'reorder'      => 'プライマリナビゲーションアイテムを <strong>サイドバー</strong> にドラッグアンドドロップして並べ替えます。',
     ],
-    "icon" => [
-        'name' => 'アイコン',
+    "login_icon" => [
+        'name' => 'ログインアイコン',
+    ],
+    "panel_icon" => [
+        'name' => 'パネルアイコン',
     ],
     "title" => [
         'name' => '題名',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ko/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ko/setting.php
index ae3631dd8..d163d67db 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ko/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ko/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => '액세스 가능한 첫 번째 탐색 항목은 <strong>홈</strong> 영역으로 사용됩니다.',
         'reorder'      => '<strong>사이드 바</strong> 에서 기본 탐색 항목을 끌어다 놓아 순서를 바꿉니다.',
     ],
-    "icon" => [
-        'name' => '상',
+    "login_icon" => [
+        'name' => '로그인 아이콘',
+    ],
+    "panel_icon" => [
+        'name' => '패널 아이콘',
     ],
     "title" => [
         'name' => '표제',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/nl/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/nl/setting.php
index b076f819c..2b1ddb96a 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/nl/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/nl/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Het eerste toegankelijke navigatie-item wordt gebruikt als het <strong>home</strong> gebied.',
         'reorder'      => 'Sleep de primaire navigatie-items in de <strong>zijbalk</strong> om ze opnieuw te ordenen.',
     ],
-    "icon" => [
-        'name' => 'Icoon',
+    "login_icon" => [
+        'name' => 'Login pictogram',
+    ],
+    "panel_icon" => [
+        'name' => 'Paneel Icoon',
     ],
     "title" => [
         'name' => 'Titel',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/pl/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/pl/setting.php
index 0ea8e6ad1..fece5aa3e 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/pl/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/pl/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Pierwszy dostępny element nawigacyjny jest używany jako obszar <strong>domu</strong>.',
         'reorder'      => 'Przeciągnij i upuść podstawowe elementy nawigacji na pasku bocznym <strong></strong> aby zmienić ich kolejność.',
     ],
-    "icon" => [
-        'name' => 'Ikona',
+    "login_icon" => [
+        'name' => 'Ikona logowania',
+    ],
+    "panel_icon" => [
+        'name' => 'Ikona panelu',
     ],
     "title" => [
         'name' => 'Tytuł',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/pt/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/pt/setting.php
index 514bd645b..4d88f10cc 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/pt/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/pt/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'O primeiro item de navegação acessível é usado como a área <strong>inicial</strong>.',
         'reorder'      => 'Arraste e solte os itens de navegação principais na barra lateral <strong></strong> para reordená-los.',
     ],
-    "icon" => [
-        'name' => 'Ícone',
+    "login_icon" => [
+        'name' => 'Ícone de login',
+    ],
+    "panel_icon" => [
+        'name' => 'Ícone do painel',
     ],
     "title" => [
         'name' => 'Título',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ro/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ro/setting.php
index 0eb0ccf3d..e220c90b4 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ro/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ro/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Primul articol accesibil de navigare este utilizat ca zonă <strong>acasă</strong>.',
         'reorder'      => 'Trageți și fixați elementele principale de navigație în bara laterală <strong></strong> pentru a le reordona.',
     ],
-    "icon" => [
-        'name' => 'icoană',
+    "login_icon" => [
+        'name' => 'Pictogramă de autentificare',
+    ],
+    "panel_icon" => [
+        'name' => 'Pictogramă panou',
     ],
     "title" => [
         'name' => 'Titlu',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ru/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ru/setting.php
index f6995c87a..711320c20 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ru/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ru/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Первый доступный элемент навигации используется как область <strong>home</strong>.',
         'reorder'      => 'Перетащите основные элементы навигации на боковой панели <strong></strong> чтобы изменить их порядок.',
     ],
-    "icon" => [
-        'name' => 'Значок',
+    "login_icon" => [
+        'name' => 'Значок входа в систему',
+    ],
+    "panel_icon" => [
+        'name' => 'Значок панели',
     ],
     "title" => [
         'name' => 'заглавие',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/sq/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/sq/setting.php
index 19e9b1621..61584d41e 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/sq/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/sq/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Artikulli i parë i arritshëm i navigimit përdoret si zona <strong>shtëpi</strong>.',
         'reorder'      => 'Zvarritni dhe lëshoni artikujt kryesorë të lundrimit në <strong>sidebar</strong> për t\'i rivartuar ato.',
     ],
-    "icon" => [
-        'name' => 'ikonë',
+    "login_icon" => [
+        'name' => 'Ikona e hyrjes',
+    ],
+    "panel_icon" => [
+        'name' => 'Ikona e panelit',
     ],
     "title" => [
         'name' => 'titull',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/sv/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/sv/setting.php
index 91b189577..566d17f51 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/sv/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/sv/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Det första tillgängliga navigationsobjektet används som <strong>hem</strong> området.',
         'reorder'      => 'Dra och släpp de primära navigeringsobjekten i <strong>sidfältet</strong> att ordna dem.',
     ],
-    "icon" => [
-        'name' => 'Ikon',
+    "login_icon" => [
+        'name' => 'Inloggningsikon',
+    ],
+    "panel_icon" => [
+        'name' => 'Panelikon',
     ],
     "title" => [
         'name' => 'Titel',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/setting.php
index 7110b5604..adacbb1dc 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'İlk erişilebilir gezinme öğesi <strong>ana</strong> alanı olarak kullanılır.',
         'reorder'      => 'Birincil gezinme öğelerini yeniden sıralamak için <strong>kenar çubuğu</strong> sürükleyip bırakın.',
     ],
-    "icon" => [
-        'name' => 'ikon',
+    "login_icon" => [
+        'name' => 'Oturum Açma Simgesi',
+    ],
+    "panel_icon" => [
+        'name' => 'Panel Simgesi',
     ],
     "title" => [
         'name' => 'Başlık',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/uk/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/uk/setting.php
index f7468d482..60f76531b 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/uk/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/uk/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Перший доступний елемент навігації використовується як область <strong>додому</strong>.',
         'reorder'      => 'Перетягніть основні елементи навігації в <strong>бічній панелі</strong> , щоб змінити їх порядок.',
     ],
-    "icon" => [
-        'name' => 'Значок',
+    "login_icon" => [
+        'name' => 'Значок входу',
+    ],
+    "panel_icon" => [
+        'name' => 'Значок панелі',
     ],
     "title" => [
         'name' => 'Назва',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ur/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ur/setting.php
index bd79eff5b..ec871e826 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/ur/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/ur/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'پہلا قابل رسائی نیویگیشن آئٹم <strong>ہوم</strong> ایریا کے بطور استعمال ہوتا ہے۔',
         'reorder'      => 'پرائمری نیویگیشن آئٹمز کو دوبارہ ترتیب دینے کیلئے <strong>سائڈبار</strong> میں گھسیٹیں اور چھوڑیں۔',
     ],
-    "icon" => [
-        'name' => 'شبیہہ',
+    "login_icon" => [
+        'name' => 'لاگ ان کا آئیکن',
+    ],
+    "panel_icon" => [
+        'name' => 'پینل کی علامت',
     ],
     "title" => [
         'name' => 'عنوان',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/vi/setting.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/vi/setting.php
index 540aab96c..ac3d4c7ec 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/vi/setting.php
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/vi/setting.php
@@ -11,8 +11,11 @@ return [
         'warning'      => 'Mục điều hướng có thể truy cập đầu tiên được sử dụng làm khu vực <strong>nhà</strong>.',
         'reorder'      => 'Kéo và thả các mục điều hướng chính trong thanh bên <strong></strong> để sắp xếp lại chúng.',
     ],
-    "icon" => [
-        'name' => 'Biểu tượng',
+    "login_icon" => [
+        'name' => 'Biểu tượng đăng nhập',
+    ],
+    "panel_icon" => [
+        'name' => 'Biểu tượng bảng điều khiển',
     ],
     "title" => [
         'name' => 'Tiêu đề',
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig
index 7377acf23..b2950dd81 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig
@@ -19,7 +19,7 @@
 
 <div class="logo">
     <a href="/admin" class="variant-logo">
-        {{ img('theme::img/icon.svg').data|raw }}
+        {{ img('theme::img/panel-icon.svg').data|raw }}
     </a>
 </div>
 
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig
index 174877348..9ce4b4ab7 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig
@@ -7,7 +7,7 @@
             {% if setting_value('visiosoft.theme.defaultadmin::login_icon') %}
                 <img src="{{ file(setting_value('visiosoft.theme.defaultadmin::login_icon')).url }}" alt="site icon">
             {% else %}
-                {{ img('theme::img/icon.svg').data|raw }}
+                {{ img('theme::img/login-icon.svg').data|raw }}
             {% endif %}
             {{ setting_value('visiosoft.theme.defaultadmin::title') }}
         </div>
@@ -21,7 +21,7 @@
                 {% if setting_value('visiosoft.theme.defaultadmin::login_icon') %}
                     <img src="{{ file(setting_value('visiosoft.theme.defaultadmin::login_icon')).url }}" alt="site icon">
                 {% else %}
-                    {{ img('theme::img/icon.svg').data|raw }}
+                    {{ img('theme::img/login-icon.svg').data|raw }}
                 {% endif %}
             </div>
 
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig
index 9e2075eff..9ff1f559b 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig
@@ -5,7 +5,7 @@
             {% if setting_value('visiosoft.theme.defaultadmin::panel_icon') %}
                 <img src="{{ file(setting_value('visiosoft.theme.defaultadmin::panel_icon')).url }}" alt="site icon">
             {% else %}
-                {{ img('theme::img/icon.svg').data|raw }}
+                {{ img('theme::img/panel-icon.svg').data|raw }}
             {% endif %}
             <span>{{ setting_value('visiosoft.theme.defaultadmin::title') }}</span>
         </a>
diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js
index 880aa297b..6da03fde9 100644
--- a/addons/default/visiosoft/location-module/resources/js/filterLocation.js
+++ b/addons/default/visiosoft/location-module/resources/js/filterLocation.js
@@ -198,6 +198,7 @@ function SelectOnClick() {
         var id = $(this).attr('data-id');
 
         if ($(this).attr('data-field') == "country") {
+            $('.filter-location-modal,.filter-location-back,.filter-location-modal .countries').hide();
             $('input[name="country"]').val(id)
             text_html.html(input_text)
             $(".filter-location-body input[type='checkbox']").prop('checked', false);
diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
index a02584122..ae7403f6a 100644
--- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
+++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
@@ -1,25 +1,29 @@
 <div class="row w-100 px-2 m-0">
-    <div class="col-12 px-0 py-1 px-2">
-        <b>
-            <span class="float-left">{{ trans('visiosoft.module.location::field.address.name') }}</span>
-        </b>
-        {% set defaultCountry = setting_value('visiosoft.module.location::default_country') %}
-        {% set selectedCountry =  app.request.get('country') %}
-        <a href="#" class="a-sahibinden-type selected-country filter-country-btn float-right">
-            {% set countryValue = '' %}
-            {% if selectedCountry %}
-                {% set countryName = getCountry(selectedCountry).name %}
-                {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
-            {% elseif defaultCountry %}
-                {% set countryName = getCountry(defaultCountry).name %}
-                {% set countryValue = defaultCountry %}
-            {% else %}
-                {% set countryName = trans("visiosoft.module.location::field.country.name") %}
-            {% endif %}
-            <small>{{ countryName }}</small>
-        </a>
+    {% set defaultCountry = setting_value('visiosoft.module.location::default_country') %}
+    {% set selectedCountry =  app.request.get('country') %}
+
+    {% set countryValue = '' %}
+    {% if selectedCountry %}
+        {% set countryName = getCountry(selectedCountry).name %}
+        {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
+    {% elseif defaultCountry %}
+        {% set countryName = getCountry(defaultCountry).name %}
+        {% set countryValue = defaultCountry %}
+    {% else %}
+        {% set countryName = trans("visiosoft.module.location::field.country.name") %}
+    {% endif %}
+    <div class="col-12 px-0 py-1">
+        <button type="button" class="btn btn-default border border-1 w-100 selected-country filter-country-btn"
+                data-toggle="modal">
+            <span class="float-left">
+                {{ trans("visiosoft.module.location::field.country.name") }}
+                    <small class="text-muted selected-country">{{ countryName }}</small>
+            </span>
+            <i class="fas fa-sort-down float-right"></i>
+        </button>
         <input name="country" value="{{ countryValue }}" type="hidden">
     </div>
+
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 filter-city-btn" data-toggle="modal"
                 data-parent="">
diff --git a/addons/default/visiosoft/media-field_type/resources/config/settings.php b/addons/default/visiosoft/media-field_type/resources/config/settings.php
deleted file mode 100644
index d541497e1..000000000
--- a/addons/default/visiosoft/media-field_type/resources/config/settings.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-return [
-
-    'imageCanvasW' => [
-        'type' => 'anomaly.field_type.integer',
-        'config' => [
-            'default_value' => 800,
-        ],
-    ],
-    'imageCanvasH' => [
-        'type' => 'anomaly.field_type.integer',
-        'config' => [
-            'default_value' => 600,
-        ],
-    ],
-    'imageResizeH' => [
-        'type' => 'anomaly.field_type.integer',
-        'config' => [
-            'default_value' => 600,
-        ],
-    ],
-];
diff --git a/addons/default/visiosoft/media-field_type/resources/js/upload.js b/addons/default/visiosoft/media-field_type/resources/js/upload.js
index 52b315380..cf0c7fef7 100644
--- a/addons/default/visiosoft/media-field_type/resources/js/upload.js
+++ b/addons/default/visiosoft/media-field_type/resources/js/upload.js
@@ -16,8 +16,8 @@ $(function () {
     var dropzone = new Dropzone('.dropzone:not(data-initialized)',
         {
             paramName: 'upload',
-            resizeWidth: 800,
-            resizeHeight: 600,
+            resizeWidth: settings_image['resize_width'],
+            resizeHeight: settings_image['resize_height'],
             autoProcessQueue: true,
             parallelUploads: 1,
             resizeMethod: 'contain',
diff --git a/addons/default/visiosoft/media-field_type/resources/lang/en/message.php b/addons/default/visiosoft/media-field_type/resources/lang/en/message.php
index 442c2387b..b554b6955 100644
--- a/addons/default/visiosoft/media-field_type/resources/lang/en/message.php
+++ b/addons/default/visiosoft/media-field_type/resources/lang/en/message.php
@@ -1,12 +1,13 @@
 <?php
 
 return [
-    'choose_folder'     => 'Which folder would you like to upload to?',
-    'upload'            => 'Add İmages | Upload İmages | Attach a photo',
-    'choose_files'      => 'Which files would you like to use?',
+    'choose_folder' => 'Which folder would you like to upload to?',
+    'upload' => 'Add İmages | Upload İmages | Attach a photo',
+    'choose_files' => 'Which files would you like to use?',
     'no_files_selected' => 'No files selected.',
-    'no_uploads'        => 'No files uploaded.',
-    'overwrite'         => 'has already been uploaded. Would you like to overwrite it?',
-    'uploading'         => 'Uploading',
-    'loading'           => 'Loading',
+    'no_uploads' => 'No files uploaded.',
+    'overwrite' => 'has already been uploaded. Would you like to overwrite it?',
+    'uploading' => 'Uploading',
+    'loading' => 'Loading',
+    'error_upload' => 'There was a problem uploading the file.',
 ];
diff --git a/addons/default/visiosoft/media-field_type/resources/lang/en/setting.php b/addons/default/visiosoft/media-field_type/resources/lang/en/setting.php
deleted file mode 100644
index eec5e70ba..000000000
--- a/addons/default/visiosoft/media-field_type/resources/lang/en/setting.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-return [
-    'imageCanvasW' => [
-        'name' => 'Image Canvas Width'
-    ],
-    'imageCanvasH' => [
-        'name' => 'Image Canvas Height'
-    ],
-    'imageResizeW' => [
-        'name' => 'Image Resize Width'
-    ],
-    'imageResizeH' => [
-        'name' => 'Image Resize Height'
-    ],
-];
diff --git a/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig b/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig
index d1c7f95a5..bb51d1f01 100644
--- a/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig
+++ b/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig
@@ -14,3 +14,9 @@
     </div>
 
 </div>
+<script>
+    var settings_image = {
+        'resize_width':"{{ setting_value('visiosoft.module.advs::full_image_width') }}",
+        'resize_height':"{{ setting_value('visiosoft.module.advs::full_image_height') }}"
+    };
+</script>
\ No newline at end of file
diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
index bae2b9d24..613ab7454 100644
--- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
+++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php
@@ -5,7 +5,6 @@ use Anomaly\Streams\Platform\Model\Files\FilesFilesEntryModel;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
-use Visiosoft\MediaFieldType\Table\FileTableBuilder;
 use Visiosoft\MediaFieldType\Table\UploadTableBuilder;
 use Anomaly\FilesModule\File\FileUploader;
 use Anomaly\FilesModule\Folder\Command\GetFolder;
@@ -13,7 +12,6 @@ use Anomaly\FilesModule\Folder\Contract\FolderRepositoryInterface;
 use Anomaly\Streams\Platform\Http\Controller\AdminController;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Intervention\Image\Facades\Image as WaterMark;
-use Anomaly\SettingsModule\Setting\Contract\SettingRepositoryInterface;
 use Anomaly\FilesModule\File\Contract\FileRepositoryInterface;
 
 /**
@@ -25,16 +23,20 @@ use Anomaly\FilesModule\File\Contract\FileRepositoryInterface;
  */
 class UploadController extends AdminController
 {
+    public $uploader;
+    public $folders;
+    public $files;
 
     use DispatchesJobs;
 
-    /**
-     * Return the uploader.
-     *
-     * @param UploadTableBuilder $table
-     * @param                        $folder
-     * @return \Illuminate\View\View
-     */
+    public function __construct(FileUploader $uploader, FolderRepositoryInterface $folders, FileRepositoryInterface $files)
+    {
+        $this->uploader = $uploader;
+        $this->folders = $folders;
+        $this->files = $files;
+        parent::__construct();
+    }
+
     public function index(UploadTableBuilder $table, $folder)
     {
         return $this->view->make(
@@ -46,90 +48,102 @@ class UploadController extends AdminController
         );
     }
 
-    /**
-     * Upload a file.
-     *
-     * @param FileUploader $uploader
-     * @param FolderRepositoryInterface $folders
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function upload(FileUploader $uploader, FolderRepositoryInterface $folders, SettingRepositoryInterface $settings, FileRepositoryInterface $files)
+    public function upload()
     {
-        if ($file = $uploader->upload($this->request->file('upload'), $folders->find($this->request->get('folder')))) {
+        $file = $this->uploader->upload($this->request->file('upload'), $this->folders->find($this->request->get('folder')));
+        if ($file) {
 
-            $watermarktype = $settings->value('visiosoft.module.advs::watermark_type');
-            $position = $settings->value('visiosoft.module.advs::watermark_position');
-            $fullImg = WaterMark::make($this->request->file('upload')->getRealPath())
-                    ->resize(null, setting_value('visiosoft.field_type.media::imageResizeH', 600),function ($constraint) {
-                            $constraint->aspectRatio();
-                    });
-            $mdImg = WaterMark::make($this->request->file('upload')->getRealPath())
-                    ->resize(null, setting_value('visiosoft.module.advs::picture_height'),function ($constraint) {
+            $settings_key = [
+                'image_resize_backend',
+                'full_image_width',
+                'full_image_height',
+                'medium_image_width',
+                'medium_image_height',
+                'thumbnail_width',
+                'thumbnail_height',
+                'add_canvas',
+                'image_canvas_width',
+                'image_canvas_height',
+                'watermark_type',
+                'watermark_text',
+                'watermark_image',
+                'watermark_position'
+            ];
+
+            $settings_value = array();
+
+            foreach ($settings_key as $key) {
+                $settings_value[$key] = setting_value('visiosoft.module.advs::' . $key);
+            }
+
+
+            $fullImg = WaterMark::make($this->request->file('upload')->getRealPath());
+
+            if ($settings_value['image_resize_backend']) {
+                $fullImg = $fullImg->resize(null, $settings_value['full_image_height'],
+                    function ($constraint) {
                         $constraint->aspectRatio();
                     });
-            if (setting_value('visiosoft.module.advs::add_canvas')) {
+            }
+
+            $mdImg = WaterMark::make($this->request->file('upload')->getRealPath())
+                ->resize(null, $settings_value['medium_image_height'], function ($constraint) {
+                    $constraint->aspectRatio();
+                });
+
+
+            if ($settings_value['add_canvas']) {
+
                 $fullImg->resizeCanvas(
-                    setting_value('visiosoft.field_type.media::imageCanvasW', 800),
-                    setting_value('visiosoft.field_type.media::imageCanvasH', 600),
+                    $settings_value['image_canvas_width'], $settings_value['image_canvas_height'],
                     'center', false, 'fff'
                 );
+
                 $mdImg->resizeCanvas(
-                    setting_value('visiosoft.module.advs::picture_width', 400),
-                    setting_value('visiosoft.module.advs::picture_height', 300),
+                    $settings_value['medium_image_width'], $settings_value['medium_image_height'],
                     'center', false, 'fff'
                 );
             }
-            foreach ([$fullImg, $mdImg] as $index => $image) {
-                if ($watermarktype == 'image') {
-                    $watermarkimage_id = $settings->value('visiosoft.module.advs::watermark_image');
-                    $watermarkimage = $files->find($watermarkimage_id);
-                    if ($watermarkimage != null) {
+
+            $image_types = array('full' => $fullImg, 'medium' => $mdImg);
+
+            foreach ($image_types as $key => $image) {
+
+                if ($settings_value['watermark_type'] == 'image') {
+
+                    if (!$watermarkimage = $this->files->find($settings_value['watermark_image'])) {
                         $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path());
-                        $image->insert($watermark, $position);
+                        $image->insert($watermark, $settings_value['watermark_position']);
                     }
+
                 } else {
-                    $watermarktext = $settings->value('visiosoft.module.advs::watermark_text');
                     $v = "top";
                     $h = "center";
                     $w = $image->width() / 2;
                     $h1 = $image->height() / 2;
                     $font_size = $w / 20;
-                    $image->text($watermarktext, $w, $h1, function ($font) use ($v, $h, $font_size) {
+                    $image->text($settings_value['watermark_text'], $w, $h1, function ($font) use ($v, $h, $font_size) {
                         $font->file(public_path('Antonio-Bold.ttf'));
                         $font->size($font_size);
                         $font->align($h);
                         $font->valign($v);
                     });
                 }
-                if ($index === 0) {
+                if ($key === "full") {
                     $fileName = $file->getAttributes()['name'];
                 } else {
                     $fileName = 'md-' . $file->getAttributes()['name'];
 
-                    $files->create([
-                        'folder_id' => $this->request->get('folder'),
-                        'name' => $fileName,
-                        'disk_id' => 1,
-                        'size' => $image->filesize(),
-                        'mime_type' => $image->mime,
-                        'extension' => $image->extension,
-                    ]);
+                    $this->createFile($this->request->get('folder'),$fileName,$image);
                 }
                 $image->save(app_storage_path() . '/files-module/local/images/' . $fileName);
             }
-
             return $this->response->json($file->getAttributes());
         }
 
-        return $this->response->json(['error' => 'There was a problem uploading the file.'], 500);
+        return $this->response->json(['error' => trans('visiosoft.field_type.media::message.error_upload')], 500);
     }
 
-    /**
-     * Return the recently uploaded files.
-     *
-     * @param FileTableBuilder $table
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
     public function recent(UploadTableBuilder $table)
     {
         return $table->setUploaded(explode(',', $this->request->get('uploaded')))
@@ -158,4 +172,16 @@ class UploadController extends AdminController
         }
         return response()->json(['status' => 'error']);
     }
+
+    public function createFile($folder, $filename, $image)
+    {
+        $this->files->create([
+            'folder_id' => $folder,
+            'name' => $filename,
+            'disk_id' => 1,
+            'size' => $image->filesize(),
+            'mime_type' => $image->mime,
+            'extension' => $image->extension,
+        ]);
+    }
 }
diff --git a/addons/default/visiosoft/profile-module/resources/views/address/create.twig b/addons/default/visiosoft/profile-module/resources/views/address/create.twig
index 1aea1f279..60bc2b98f 100644
--- a/addons/default/visiosoft/profile-module/resources/views/address/create.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/address/create.twig
@@ -51,7 +51,9 @@
                             {{ form_close() }}
 
                         </div>
-                        <div class="tab-pane fade p-3 {% if isCompany %}active show{% endif  %}" id="corporate" role="tabpanel" aria-labelledby="corporate-tab">
+
+                        <div class="tab-pane fade p-3 {{ isCompany ? ' active show' }}" id="corporate" role="tabpanel"
+                             aria-labelledby="corporate-tab">
                             {% set form = form('addressCompany').entry(id).actions({'save':'save'}).get() %}
                             {{ form_open({
                                 'class': 'form ' ~ form.options.class ,
diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
index 52368270e..7d53dee4d 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
@@ -50,7 +50,7 @@
                             <div>
                                 {% set userForm = form('userProfile').entry(user.id).get() %}
                                 {{ userForm.open()|raw }}
-                                <div class="mt-4 d-flex profile--desc flex-column flex-lg-row text-lg-center">
+                                <div class="mt-4 d-flex profile--desc flex-column flex-lg-row">
                                     <div class="d-flex d-sm-block m-auto m-sm-0 mr-sm-3">
                                         <img src="{{ profile_photo }}">
                                     </div>
diff --git a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php
index a3056af25..b5590b3eb 100644
--- a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormBuilder.php
@@ -4,59 +4,12 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
 
 class AdressFormBuilder extends FormBuilder
 {
-
-    /**
-     * Additional validation rules.
-     *
-     * @var array|string
-     */
-    protected $rules = [];
-
-    /**
-     * Fields to skip.
-     *
-     * @var array|string
-     */
-    protected $skips = [];
-
-    /**
-     * The form actions.
-     *
-     * @var array|string
-     */
-    protected $actions = [];
-
-    /**
-     * The form buttons.
-     *
-     * @var array|string
-     */
     protected $buttons = [
         'cancel',
     ];
 
-    /**
-     * The form options.
-     *
-     * @var array
-     */
     protected $options = [
         'redirect' => '/profile/address',
         'success_message' => 'visiosoft.module.profile::message.adress_success_create',
     ];
-
-    /**
-     * The form sections.
-     *
-     * @var array
-     */
-    protected $sections = [];
-
-    /**
-     * The form assets.
-     *
-     * @var array
-     */
-    protected $assets = [];
-
 }
diff --git a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormBuilder.php b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormBuilder.php
index 960ddb4d5..c71db96ec 100644
--- a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormBuilder.php
@@ -5,61 +5,14 @@ use Visiosoft\ProfileModule\Adress\AdressModel;
 
 class AddressCompanyFormBuilder extends FormBuilder
 {
-
-    /**
-     * Additional validation rules.
-     *
-     * @var array|string
-     */
     protected $model = AdressModel::class;
 
-    protected $rules = [];
-
-    /**
-     * Fields to skip.
-     *
-     * @var array|string
-     */
-    protected $skips = [];
-
-    /**
-     * The form actions.
-     *
-     * @var array|string
-     */
-    protected $actions = [];
-
-    /**
-     * The form buttons.
-     *
-     * @var array|string
-     */
     protected $buttons = [
         'cancel',
     ];
 
-    /**
-     * The form options.
-     *
-     * @var array
-     */
     protected $options = [
         'redirect' => '/profile/address',
         'success_message' => 'visiosoft.module.profile::message.adress_success_create',
     ];
-
-    /**
-     * The form sections.
-     *
-     * @var array
-     */
-    protected $sections = [];
-
-    /**
-     * The form assets.
-     *
-     * @var array
-     */
-    protected $assets = [];
-
 }
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 4ae7fb561..4593e9c23 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -44,13 +44,13 @@ class DatabaseSeeder extends Seeder
         $admin = $this->roles->findBySlug('admin');
 
         $this->users->unguard();
-        $this->users->newQuery()->where('email', "admin@visiosoft.com.tr")->forceDelete();
+        $this->users->newQuery()->where('email', "info@openclassify.com")->forceDelete();
         $visiosoft_administrator = $this->users->create(
             [
-                'display_name' => 'Visiosoft Dev',
-                'email' => "admin@visiosoft.com.tr",
-                'username' => "visiosoft",
-                'password' => "visiosoft123",
+                'display_name' => 'openclassify',
+                'email' => "info@openclassify.com",
+                'username' => "openclassify",
+                'password' => "openclassify",
             ]
         );
 
@@ -108,4 +108,4 @@ class DatabaseSeeder extends Seeder
 
         $this->call(widgetSeeder::class);
     }
-}
\ No newline at end of file
+}
diff --git a/database/seeds/widgetSeeder.php b/database/seeds/widgetSeeder.php
index d5dab2a2f..1a5410367 100644
--- a/database/seeds/widgetSeeder.php
+++ b/database/seeds/widgetSeeder.php
@@ -29,8 +29,8 @@ class widgetSeeder extends Seeder
             ->create(
                 [
                     'en'        => [
-                        'title'       => 'ARecent News',
-                        'description' => 'ARecent news from http://pyrocms.com/',
+                        'title'       => 'Recent News',
+                        'description' => 'Recent news'
                     ],
                     'extension' => 'anomaly.extension.xml_feed_widget',
                     'dashboard' => $dashboard,
@@ -43,7 +43,7 @@ class widgetSeeder extends Seeder
             [
                 'scope' => $widget->getId(),
                 'key'   => 'anomaly.extension.xml_feed_widget::url',
-                'value' => 'http://www.pyrocms.com/posts/rss.xml',
+                'value' => 'https://openclassify.com/posts/rss.xml',
             ]
         );
     }