diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
index ffa77daa3..0f51353ca 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
@@ -54,31 +54,6 @@
 
                             {% endif %}
                         </div>
-                        {% if(adv.video_url != null) %}
-                            <div class="col-md-2">
-                                <a class="btn btn-success" onclick="openVideo()"><i class="fa fa-file-video-o"
-                                                                                    aria-hidden="true"></i> {{ trans('visiosoft.module.cloudinary::field.video') }}
-                                </a>
-                                <div class="modal fade" id="adv-video" tabindex="-1" role="dialog"
-                                     aria-labelledby="myModalLabel">
-                                    <div class="modal-dialog" role="document">
-                                        <div class="modal-content">
-                                            <div class="close-modal text-right">
-                                                <button type="button" class="btn btn-danger" data-dismiss="modal">X
-                                                </button>
-                                            </div>
-                                            <div class="modal-body">
-                                                <video controls loop class="img-responsive"
-                                                       style="text-align: center; width: 100%">
-                                                    <source src="{{ adv.video_url }}" class="video-src"
-                                                            type="video/mp4"/>
-                                                </video>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endif %}
                     </div><!-- Controls -->
 
                     <!-- slider-text -->
@@ -144,20 +119,20 @@
 
                                 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row">
                                     {% if entries('advs').isEnabled('favs') %}
-                                        <a id="owner-fav" href="#"><i id="heart-icon-seller" class="fa fa-heart-o"></i></a>
+                                        <a id="owner-fav" href="#"><i id="heart-icon-seller" class="far fa-heart"></i></a>
                                     {% endif %}
-                                    <span>{{ trans('visiosoft.module.advs::field.offered_by') }}:
+                                    <span class="icon">{{ trans('visiosoft.module.advs::field.offered_by') }}:
                                             <a id="owner"
                                                href="{{ url_route('visiosoft.module.advs::list_user_ad', [adv.created_by_id]) }}"
                                                data-content="{{ adv.owner_id }}">{{ adv.owner }}</a>
                                         </span>
-                                    <span> {{ trans('visiosoft.module.advs::field.ad_id') }}:
+                                    <span class="icon"> {{ trans('visiosoft.module.advs::field.ad_id') }}:
                                             <a href="#" class="time"> {{ adv.id }}</a>
                                         </span>
                                 </div>
 
-                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-row">
-                                    <span class="icon"><i class="fa fa-clock-o"></i><a
+                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row">
+                                    <span class="icon"><i class="far fa-clock"></i><a
                                                 href="#">{{ adv.created_at|date('d/m/Y') }}</a></span>
                                     <span class="icon"><i class="fa fa-map-marker"></i><a href="#">{{ adv.city_name }}
                                             , {{ adv.country_name }}</a></span>
@@ -167,6 +142,39 @@
                                     {% endif %}
                                 </div>
 
+                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row">
+                                    {% if entries('advs').isEnabled('comparisons') %}
+                                        {% include "visiosoft.module.comparisons::comparebtn" %}
+                                        <span class="icon">{{ trans('visiosoft.module.comparisons::field.comparisonpagetitle') }}</span>
+                                    {% endif %}
+                                </div>
+
+                                {% if(adv.video_url != null) %}
+                                    <div class="contact-with">
+                                        <h4>{{ trans('visiosoft.module.cloudinary::field.video') }}</h4>
+                                            <a class="btn btn-success" onclick="openVideo()"><i class="fa fa-file-video-o"
+                                                                                    aria-hidden="true"></i> {{ trans('visiosoft.module.cloudinary::field.video') }}
+                                            </a>
+                                            <div class="modal fade" id="adv-video" tabindex="-1" role="dialog"
+                                     aria-labelledby="myModalLabel">
+                                            <div class="modal-dialog" role="document">
+                                                <div class="modal-content">
+                                                    <div class="close-modal text-right">
+                                                        <button type="button" class="btn btn-danger" data-dismiss="modal">X
+                                                        </button>
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <video controls loop class="img-responsive"
+                                                            style="text-align: center; width: 100%">
+                                                            <source src="{{ adv.video_url }}" class="video-src"
+                                                                    type="video/mp4"/>
+                                                        </video>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                {% endif %}
                                 {% if(profile.getObject().gsm_phone is not null or profile.office_phone is not null or entries('advs').isEnabled('messages')) %}
                                     <!-- contact-with -->
                                     <div class="contact-with">
@@ -189,9 +197,6 @@
                                                         class="fa fa-envelope-square"></i>{{ trans("visiosoft.module.advs::field.send_message") }}
                                             </a>
                                         {% endif %}
-                                        {% if entries('advs').isEnabled('comparisons') %}
-                                            {% include "visiosoft.module.comparisons::comparebtn" %}
-                                        {% endif %}
                                     </div><!-- contact-with -->
                                 {% endif %}
                                 {% if adv_detail_place_code %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
index 8b6220f0d..f8cbcb539 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
@@ -124,10 +124,8 @@
                                                 <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
                                                 {% if entries('advs').isEnabled('comparisons') %}
-                                                
-                                                <a href="javascript:;" class="comparison" data-adv="{{adv.id}}" data-title="{{ adv.name | slice(0, 20) }}" data-price="{{ adv.price }} {{adv.currency}}" data-img="{{advPhoto}}">
-                                                    <i class="fa fa-arrows-alt"></i>
-                                                </a>
+                                            
+                                                    {% include "visiosoft.module.comparisons::comparebtn" %}
 
                                                 {% endif %}
                                             </div><!-- item-info-right -->
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 741b6407f..8bfb63a1f 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -123,14 +123,13 @@ class AdvsController extends PublicController
 
         Cookie::queue(Cookie::make('last_search', $request->getRequestUri(), 84000));
 
-            $viewType = $request->cookie('viewType');
-            if (isset($viewType) and $viewType == 'table') {
-                return $this->view->make('visiosoft.module.advs::advs/table', $compact);
-            } elseif (isset($viewType) and $viewType == 'map')
-            {
-                return $this->view->make('visiosoft.module.advs::advs/map', $compact);
-            }
-            return $this->view->make('visiosoft.module.advs::advs/list', $compact);
+        $viewType = $request->cookie('viewType');
+        if (isset($viewType) and $viewType == 'table') {
+            return $this->view->make('visiosoft.module.advs::advs/table', $compact);
+        } elseif (isset($viewType) and $viewType == 'map') {
+            return $this->view->make('visiosoft.module.advs::advs/map', $compact);
+        }
+        return $this->view->make('visiosoft.module.advs::advs/list', $compact);
     }
 
     public function viewType($type)
@@ -315,9 +314,7 @@ class AdvsController extends PublicController
         CategoryRepositoryInterface $categoryRepository,
         Dispatcher $events,
         AdvModel $advModel,
-        CategoryModel $categoryModel,
-        PackageModel $packageModel,
-        AdModel $StoreAdModel
+        CategoryModel $categoryModel
     )
     {
         if (!Auth::user()) {
@@ -335,6 +332,7 @@ class AdvsController extends PublicController
 
             if ($advModel->is_enabled('packages') and $adv->slug == "") {
                 $parent_cat = $categoryModel->getParentCats($request->cat1, 'parent_id');
+                $packageModel = new PackageModel();
                 $package = $packageModel->reduceLimit($parent_cat, 'reduce');
                 if ($package != null) {
                     return redirect('/')->with('error', trans('visiosoft.module.advs::message.please_buy_package'));
@@ -342,7 +340,8 @@ class AdvsController extends PublicController
             }
 
             if ($advModel->is_enabled('store') and $adv->slug == "") {
-                if ($request->store != "0" and $request->store != null ) {
+                $StoreAdModel = new AdModel();
+                if ($request->store != "0" and $request->store != null) {
                     $StoreAdModel->createStoreAdLoggedInUser($request->store, $request->update_id);
                 }
             }
@@ -500,8 +499,7 @@ class AdvsController extends PublicController
         AdvFormBuilder $advFormBuilder,
         AdvRepositoryInterface $advRepository,
         CategoryRepositoryInterface $categoryRepository,
-        AdvModel $advModel,
-        UserModel $StoreUserModel
+        AdvModel $advModel
     )
     {
         $nameField = HTMLDomParser::str_get_html($advFormBuilder->render($id)->getContent());
@@ -568,7 +566,7 @@ class AdvsController extends PublicController
 
     }
 
-    public function statusAds($id, $type, SettingRepositoryInterface $settings, Dispatcher $events, AdvModel $advModel, PackageModel $packageModel)
+    public function statusAds($id, $type, SettingRepositoryInterface $settings, Dispatcher $events, AdvModel $advModel)
     {
         $ad = $advModel->getAdv($id);
         $auto_approved = $settings->value('visiosoft.module.advs::auto_approve');
@@ -582,6 +580,7 @@ class AdvsController extends PublicController
             $advModel->publish_at_Ads($id);
             if ($ad->finish_at == NULL AND $type == "approved") {
                 if ($advModel->is_enabled('packages')) {
+                    $packageModel = new PackageModel();
                     $published_time = $packageModel->reduceTimeLimit($ad->cat1);
                     if ($published_time != null) {
                         $default_published_time = $published_time;
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 182763ace..d5bfca8dc 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -238,7 +238,7 @@ class MyProfileController extends PublicController
         }
     }
 
-    public function statusAds($id, $type, SettingRepositoryInterface $settings, Dispatcher $events, AdvModel $advModel, PackageModel $packageModel)
+    public function statusAds($id, $type, SettingRepositoryInterface $settings, Dispatcher $events, AdvModel $advModel)
     {
         $ad = $advModel->getAdv($id);
         $auto_approved = $settings->value('visiosoft.module.advs::auto_approve');
@@ -252,6 +252,7 @@ class MyProfileController extends PublicController
             $advModel->publish_at_Ads($id);
             if ($ad->finish_at == NULL AND $type == "approved") {
                 if ($advModel->is_enabled('packages')) {
+                    $packageModel = new PackageModel();
                     $published_time = $packageModel->reduceTimeLimit($ad->cat1);
                     if($published_time != null)
                     {