diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index 025aefdc1..4772d8d80 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -65,7 +65,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
             if ($nullable_ad)
                 return $this->find($id);
             else
-                $this->where('advs_advs.slug', '!=', "")
+                return $this->where('advs_advs.slug', '!=', "")
                     ->find($id);
         }
         if ($nullable_ad)
diff --git a/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig b/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig
index bbd59e7a7..6345327f2 100644
--- a/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig
+++ b/addons/default/visiosoft/cats-module/resources/views/cats/admin-cat.twig
@@ -1,13 +1,15 @@
 {% extends "theme::layouts/default" %}
 {% block content %}
     {% include "theme::partials/messages" %}
+    {{ asset_add("scripts.js", "streams::js/form/form.js") }}
+    {{ asset_add("scripts.js", "streams::js/form/translations.js") }}
 
     <div class="container-fluid">
         <div class="card">
             <div class="card-block">
 
                 {% set actions = ['save'] %}
-                
+
                 {% if id is not null %}
                     {% set actions = ['update'] %}
                 {% endif %}
@@ -19,7 +21,12 @@
                 })|raw }}
                 <fieldset>
                     <div class="section">
-                        {{ nameField|raw }}
+                        {% set fields = form.fields.base().pluck('field_name').all() %}
+                        <div class="field-group name">
+                            {% for field in form.fields.translations('name') %}
+                                {{ field.render({'form': form})|raw }}
+                            {% endfor %}
+                        </div>
                         {{ form.fields.slug|raw }}
                         <input type="hidden" name="parent_category"
                                value="{% if form.fields.parent_category.value.id is defined %}{{ form.fields.parent_category.value.id }}{% elseif app.request.get('parent')  is defined %}{{ app.request.get('parent') }}{% endif %}">
diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
index 8e6ee1829..13a4feb08 100644
--- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
+++ b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
@@ -147,21 +147,10 @@ class CategoryController extends AdminController
             }
 
             return $this->redirect->to('/admin/cats');
-        } else {
-            $form->setFields(['name']);
-            $form->setActions(['save']);
-            $formBuilder = $form;
-            $nameField = HTMLDomParser::str_get_html($form->render()->getContent());
-            $nameField = $nameField->find('.name', 0);
-            if ($nameField !== null) {
-                $nameField = $nameField->innertext();
-            } else {
-                $nameField = "";
-            }
         }
 
 
-        return $this->view->make('visiosoft.module.cats::cats/admin-cat', compact('nameField', 'formBuilder'));
+        return $this->view->make('visiosoft.module.cats::cats/admin-cat', compact('formBuilder'));
     }
 
     public function endsWith($string, $test) {
@@ -184,18 +173,9 @@ class CategoryController extends AdminController
                 die;
             }
             return $this->redirect->to('/admin/cats');
-        } else {
-            $form->setFields(['name']);
-            $nameField = HTMLDomParser::str_get_html($form->render($id)->getContent());
-            $nameField = $nameField->find('.name', 0);
-            if ($nameField !== null) {
-                $nameField = $nameField->innertext();
-            } else {
-                $nameField = "";
-            }
         }
 
-        return $this->view->make('visiosoft.module.cats::cats/admin-cat', compact('nameField'))->with('id', $id);
+        return $this->view->make('visiosoft.module.cats::cats/admin-cat')->with('id', $id);
     }
 
     public function delete(CategoryRepositoryInterface $categoryRepository, Request $request, CategoryModel $categoryModel, $id)
diff --git a/addons/default/visiosoft/location-module/resources/views/location/admin-sub-location.twig b/addons/default/visiosoft/location-module/resources/views/location/admin-sub-location.twig
index f2cad4145..5378763e8 100644
--- a/addons/default/visiosoft/location-module/resources/views/location/admin-sub-location.twig
+++ b/addons/default/visiosoft/location-module/resources/views/location/admin-sub-location.twig
@@ -1,32 +1,54 @@
 {% extends "theme::layouts/default" %}
 {% block content %}
     {% include "theme::partials/messages" %}
+    {{ asset_add("scripts.js", "streams::js/form/form.js") }}
+    {{ asset_add("scripts.js", "streams::js/form/translations.js") }}
 
-    {% set form = form('location', app.request.query|keys|first).entry(id).get() %}
 
-    {{ form_open()|raw }}
-        <div class="container-fluid">
-            <div class="card">
-                <div class="card-block">
-                    {{ form.fields.name|raw }}
-                    {{ form.fields.slug|raw }}
-                    {% if app.request.get('cities') is not empty %}
-                        <input type="hidden" name="parent_country_id" value="{{ app.request.get('cities') }}">
-                    {% elseif app.request.get('districts') is not empty %}
-                        <input type="hidden" name="parent_city_id" value="{{ app.request.get('districts') }}">
-                    {% elseif app.request.get('neighborhoods') is not empty %}
-                        <input type="hidden" name="parent_district_id" value="{{ app.request.get('neighborhoods') }}">
-                    {% elseif app.request.get('village') is not empty %}
-                        <input type="hidden" name="parent_neighborhood_id" value="{{ app.request.get('village') }}">
-                    {% endif %}
-                    {{ form.fields.order|raw }}
-                </div>
-            </div>
-            <div class="controls card">
-                <div class="card-block">
-                    {{ form.actions|raw }}
-                </div>
+    {% if app.request.get('cities') is not empty %}
+        {% set parent = "country" %}
+    {% elseif app.request.get('districts') is not empty %}
+        {% set parent = "city" %}
+    {% elseif app.request.get('neighborhoods') is not empty %}
+        {% set parent = "district" %}
+    {% elseif app.request.get('village') is not empty %}
+        {% set parent = "neighborhood" %}
+    {% endif %}
+
+    {% set redirect_parameter = app.request.query|keys|first %}
+
+    <div class="container-fluid">
+        {% set form = form('location', app.request.query|keys|first).
+            entry(id).
+            actions({'save':{}}).
+            redirect('/admin/location/'~redirect_parameter~'?'~parent~"="~app.request.get(redirect_parameter))
+            .get() %}
+        {{ form.open({
+            'class': 'form ' ~ form.options.class ,
+            'enctype': 'multipart/form-data',
+        })|raw }}
+        <div class="card">
+            <div class="card-block">
+                <fieldset>
+                    <div class="section">
+                        {% set fields = form.fields.base().pluck('field_name').all() %}
+                        <div class="field-group name">
+                            {% for field in form.fields.translations('name') %}
+                                {{ field.render({'form': form})|raw }}
+                            {% endfor %}
+                        </div>
+                        {{ form.fields.slug|raw }}
+                        <input type="hidden" name="parent_{{ parent }}_id" value="{{ app.request.get(redirect_parameter) }}">
+                        {{ form.fields.order|raw }}
+                    </div>
+                </fieldset>
             </div>
         </div>
-    {{ form.close|raw}}
+        <div class="controls card">
+            <div class="card-block">
+                {{ form.actions|raw }}
+            </div>
+        </div>
+        {{ form.close|raw }}
+    </div>
 {% endblock %}
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/resources/config/permissions.php b/addons/default/visiosoft/profile-module/resources/config/permissions.php
deleted file mode 100644
index 549a751cb..000000000
--- a/addons/default/visiosoft/profile-module/resources/config/permissions.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-return [
-    'profile' => [
-        'read',
-        'write',
-        'delete',
-    ],
-    'adress' => [
-        'read',
-        'write',
-        'delete',
-    ],
-];
diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
new file mode 100644
index 000000000..c99cd34c0
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'monitoring' => [
+        'stacked' => false,
+        'tabs' => [
+
+            'general_setting' => [
+                'title' => 'visiosoft.module.profile::section.general_setting',
+                'fields' => [
+                    'show_my_ads', 'upload_avatar'
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
new file mode 100644
index 000000000..f9ea8a35b
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    'upload_avatar' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => 1
+        ],
+    ],
+    'show_my_ads' => [
+        'type' => 'anomaly.field_type.boolean',
+        'config' => [
+            'default_value' => 1
+        ],
+    ],
+];
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/button.php b/addons/default/visiosoft/profile-module/resources/lang/en/button.php
index 7a88374dc..78d618698 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/button.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/button.php
@@ -4,4 +4,6 @@ return [
     'new_profile' => 'New Profile',
     'new_adress' => 'New Adress',
     'show' => 'Show Adress',
+    'update_password' => 'Update Password',
+    'update_profile' => 'Update Profile',
 ];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/field.php b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
index 9ab15586f..654410428 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
@@ -109,12 +109,10 @@ return [
 
 
     /*Menu Button*/
-    'menu_profile' => [
+    'profile' => [
         'name' => 'Profile'
     ],
-    'menu_balance' => [
-        'name' => 'Balance'
-    ],
+
     'create' => [
         'name' => 'Create'
     ],
@@ -365,8 +363,8 @@ return [
     'corporate_settings' => [
         'name' => 'Corporate Settings',
     ],
-    'change_password' => [
-        'name' => 'Change password',
+    'password' => [
+        'name' => 'Password',
     ],
     'new_password' => [
         'name' => 'New password',
@@ -424,6 +422,8 @@ return [
         'name' => 'corporate',
     ],
 
-
+    'details' => [
+        'name' => 'Details'
+    ],
 
 ];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/message.php b/addons/default/visiosoft/profile-module/resources/lang/en/message.php
index 3ed8b88c6..ba7c92cc0 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/message.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/message.php
@@ -19,4 +19,7 @@ return [
     "required_add"=> "Please fill in all required lines.",
     "no_extend_package" => "No Extend Ad Packages",
     "saved" => "Saved!",
+    'please_confirm_transaction' => 'Please Confirm Transaction',
+    'password_do_not_match' => 'Passwords do not match',
+    'your_password_changed' => 'Your password was successfully updated',
 ];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/section.php b/addons/default/visiosoft/profile-module/resources/lang/en/section.php
index d2a7e0bea..3564a569b 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/section.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/section.php
@@ -7,4 +7,5 @@ return [
     'adress' => [
         'title' => 'Adress',
     ],
+    'general_setting' => 'General Settings',
 ];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
new file mode 100644
index 000000000..7dfd5b0a8
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'show_my_ads' => [
+        'name' => 'Show My Ads Tab',
+    ],
+    'upload_avatar' => [
+        'name' => 'Avatar Upload',
+    ],
+];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/addon.php b/addons/default/visiosoft/profile-module/resources/lang/tr/addon.php
index 21e68013a..88af26e6a 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/addon.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/addon.php
@@ -1,7 +1,7 @@
 <?php
 
- return[
-   "title"   =>"Profil",
-   "name"   =>"Profil Modülü",
-   "description"   =>""
-];
\ No newline at end of file
+return [
+    'title'       => 'Profil',
+    'name'        => 'Profil Modülü',
+    'description' => 'Profil Modülü'
+];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/button.php b/addons/default/visiosoft/profile-module/resources/lang/tr/button.php
index ec45c7daf..00d3a15dc 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/button.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/button.php
@@ -1,7 +1,7 @@
 <?php
 
- return[
-   "new_profile"   =>"Yeni profil",
-   "new_adress"   =>"Yeni Adres",
-   "show"   =>"Adresi Göster"
-];
\ No newline at end of file
+return [
+    'new_profile' => 'Yeni Profil',
+    'new_adress' => 'Yeni Adres',
+    'show' => 'Göster',
+];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/field.php b/addons/default/visiosoft/profile-module/resources/lang/tr/field.php
index e8978a3df..2256244d1 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/field.php
@@ -1,533 +1,402 @@
 <?php
 
-return[
-    "file"   =>   [
-        "name"      =>"Fotoğraflar",
-
+return [
+    'file' => [
+        'name' => 'Fotoğraflar'
     ],
-    "first_name"   =>   [
-        "name"      =>"İsim",
-
+    'first_name' => [
+        'name' => 'İsim'
     ],
-    "last_name"   =>   [
-        "name"      =>"Soyadı",
-
+    'last_name' => [
+        'name' => 'Soyisim'
     ],
-    "username"   =>   [
-        "name"      =>"Kullanıcı adı",
-
+    'username' => [
+        'name' => 'Kullanıcı Adı'
     ],
-    "display_name"   =>   [
-        "name"      =>"Ekran adı",
-
+    'display_name' => [
+        'name' => 'Görüntüleme İsmi'
     ],
-    "email"   =>   [
-        "name"      =>"E-posta adresi",
-
+    'email' => [
+        'name' => 'Email Adresi'
     ],
-    "sitename"   =>   [
-        "name"      =>"site adı",
-
+    'sitename' => [
+        'name' => 'siteadı'
     ],
-    "activated"   =>   [
-        "name"      =>"Kullanıcı aktif",
-
+    'activated' => [
+        'name' => 'Aktif Kullanıcı'
     ],
-    "enabled"   =>   [
-        "name"      =>"Kullanıcı Etkinleştir",
-
+    'enabled' => [
+        'name' => 'Kullanıcı Etkinleştir'
     ],
-    "country"   =>   [
-        "name"      =>"ülke",
-
+    'country' => [
+        'name' => 'Ülke'
     ],
-    "city"   =>   [
-        "name"      =>"Kent",
-
+    'city' => [
+        'name' => 'İl'
     ],
-    "district"   =>   [
-        "name"      =>"İlçe",
-
+    'district' => [
+        'name' => 'İlçe'
     ],
-    "neighborhood"   =>   [
-        "name"      =>"Komşuluk",
-
+    'neighborhood' => [
+        'name' => 'Mahalle'
     ],
-    "village"   =>   [
-        "name"      =>"köy",
-
+    'village' => [
+        'name' => 'Köy'
     ],
-    "gsm_phone"   =>   [
-        "name"      =>"GSM Telefon Numarası",
-
+    'gsm_phone' => [
+        'name' => 'GSM Numarası'
     ],
-    "land_phone"   =>   [
-        "name"      =>"Arsa Telefon Numarası",
-
+    'land_phone' => [
+        'name' => 'Sabit Telefon'
     ],
-    "office_phone"   =>   [
-        "name"      =>"Ofis Telefon Numarası",
-
+    'office_phone' => [
+        'name' => 'Ofis Telefonu'
     ],
-    "register_type"   =>   [
-        "name"      =>"Kayıt türü",
-
+    'register_type' => [
+        'name' => 'Üyelik Tipi'
     ],
-    "identification_number"   =>   [
-        "name"      =>"Kimlik Numarası",
-
+    'identification_number' => [
+        'name' => 'Kimlik Numarası'
     ],
-    "adress_name"   =>   [
-        "name"      =>"Adres İsmi",
-
+    'adress_name' => [
+        'name' => 'Adres Ado'
     ],
-    "adress_first_name"   =>   [
-        "name"      =>"İsim",
-
+    'adress_first_name' => [
+        'name' => 'İsim'
     ],
-    "adress_last_name"   =>   [
-        "name"      =>"Soyadı",
-
+    'adress_last_name' => [
+        'name' => 'Soyisim'
     ],
-    "actions"   =>   [
-        "name"      =>"Eylemler",
-
+    'actions' => [
+        'name' => 'İşlemler'
     ],
-    "adress_content"   =>   [
-        "name"      =>"Adres İçeriği",
-
+    'adress_content' => [
+        'name' => 'Adres Detay'
     ],
-    "adress_post_code"   =>   [
-        "name"      =>"Posta Kodu",
-
+    'adress_post_code' => [
+        'name' => 'Posta Kodu'
     ],
-    "adress_gsm_phone"   =>   [
-        "name"      =>"GSM Telefonu",
-
+    'adress_gsm_phone' => [
+        'name' => 'Gsm Numarası'
     ],
-    "adress_land_phone"   =>   [
-        "name"      =>"Sabit telefon",
-
+    'adress_land_phone' => [
+        'name' => 'Sabit Telefon'
     ],
-    "adress_country"   =>   [
-        "name"      =>"ülke",
-
+    'adress_country' => [
+        'name' => 'Ülke'
     ],
-    "adress_city"   =>   [
-        "name"      =>"Kent",
-
+    'adress_city' => [
+        'name' => 'İl'
     ],
-    "adress_district"   =>   [
-        "name"      =>"İlçe",
-
+    'adress_district' => [
+        'name' => 'İlçe'
     ],
-    "adress_neighborhood"   =>   [
-        "name"      =>"Komşuluk",
-
+    'adress_neighborhood' => [
+        'name' => 'Mahalle'
     ],
-    "adress_village"   =>   [
-        "name"      =>"köy",
-
+    'adress_village' => [
+        'name' => 'Köy'
     ],
-    "messages"   =>   [
-        "name"      =>"Mesajlar",
-
+    'messages' => [
+        'name' => 'Mesajlar'
     ],
-    "user_no"   =>   [
-        "name"      =>"kullanıcı",
-
+    'user_no' => [
+        'name' => 'Kullanıcı'
     ],
-    "menu_profile"   =>   [
-        "name"      =>"Profil",
 
-    ],
-    "menu_balance"   =>   [
-        "name"      =>"Denge",
 
-    ],
-    "create"   =>   [
-        "name"      =>"yaratmak",
 
-    ],
-    "edit"   =>   [
-        "name"      =>"Düzenle",
 
-    ],
-    "list"   =>   [
-        "name"      =>"Liste",
 
+    /*Menu Button*/
+    'profile' => [
+        'name' => 'Profil'
     ],
-    "menu_address"   =>   [
-        "name"      =>"Adres",
-
+    'menu_balance' => [
+        'name' => 'Bakiye'
     ],
-    "menu_orders"   =>   [
-        "name"      =>"Emirler",
-
+    'create' => [
+        'name' => 'Oluştur'
     ],
-    "menu_favorites"   =>   [
-        "name"      =>"Favoriler",
-
+    'edit' => [
+        'name' => 'Düzenle'
     ],
-    "menu_archived_ads"   =>   [
-        "name"      =>"Arşivlenmiş ilanlar",
-
+    'list' => [
+        'name' => 'Listele'
     ],
-    "menu_pending_ads"   =>   [
-        "name"      =>"Onay bekleyen",
-
+    'menu_address' => [
+        'name' => 'Adres'
     ],
-    "menu_delete_account"   =>   [
-        "name"      =>"Hesabı kapat",
-
+    'menu_orders' => [
+        'name' => 'Siparişler'
     ],
-    "menu_my_ads"   =>   [
-        "name"      =>"İlanlarım",
-
+    'menu_favorites' => [
+        'name' => 'Favoriler'
     ],
-    "menu_fav_ads"   =>   [
-        "name"      =>"Favori İlanlar",
-
+    'menu_archived_ads' => [
+        'name' => 'Arşivlenen İlanlar'
     ],
-    "menu_hello_msg"   =>   [
-        "name"      =>"Merhaba",
-
+    'menu_pending_ads' => [
+        'name' => 'Onay Bekleyenler'
     ],
-    "menu_last_msg"   =>   [
-        "name"      =>"En son giriş yaptınız",
-
+    'menu_delete_account' => [
+        'name' => 'Hesabı Kapat'
     ],
-    "menu_packages"   =>   [
-        "name"      =>"Benim paketleri",
-
+    'menu_my_ads' => [
+        'name' => 'İlanlarım'
     ],
-    "menu_adv_packages"   =>   [
-        "name"      =>"İlan Paketleri",
-
+    'menu_fav_ads' => [
+        'name' => 'Favori İlanlarım'
     ],
-    "menu_time_packages"   =>   [
-        "name"      =>"Zaman Paketleri",
-
+    'menu_hello_msg' => [
+        'name' => 'Merhaba'
     ],
-    "profile_details"   =>   [
-        "name"      =>"profil detayları",
-
+    'menu_last_msg' => [
+        'name' => 'Son giriş zamanı'
     ],
-    "profile_photo"   =>   [
-        "name"      =>"Profil resmi",
-
+    'menu_packages' => [
+        'name' => 'Paketlerim'
     ],
-    "adv_listing_banner"   =>   [
-        "name"      =>"İlan Listeleme Sayfa Afişi",
-
+    'menu_adv_packages' => [
+        'name' => 'İlan Paketleri'
     ],
-    "approve"   =>   [
-        "name"      =>"Onayla",
-
+    'menu_time_packages' => [
+        'name' => 'İlan Süre Paketleri'
     ],
-    "approved"   =>   [
-        "name"      =>"onaylı",
-
+    'profile_details' => [
+        'name' => 'Profil Detayları'
     ],
-    "pending"   =>   [
-        "name"      =>"kadar",
-
+    'profile_photo' => [
+        'name' => 'Profil Fotoğrafı'
     ],
-    "passive"   =>   [
-        "name"      =>"Pasif",
-
+    'adv_listing_banner' => [
+        'name' => 'Listeleme Arkaplanı'
     ],
-    "pending_admin"   =>   [
-        "name"      =>"kadar",
-
+    'approve' => [
+        'name' => 'Onayla'
     ],
-    "menu_messages"   =>   [
-        "name"      =>"Mesajlar",
-
+    'approved' => [
+        'name' => 'Onaylandı'
     ],
-    "menu_my_purchase"   =>   [
-        "name"      =>"Satın Alma İşlemim",
-
+    'pending' => [
+        'name' => 'Onay Sürecinde'
     ],
-    "menu_my_sales"   =>   [
-        "name"      =>"Satışlarım",
-
+    'passive' => [
+        'name' => 'Devre Dışı'
     ],
-    "right_secure_trading_subject"   =>   [
-        "name"      =>"Güvenli Ticaret",
-
+    'pending_admin' => [
+        'name' => 'Admin Onay Sürecinde'
     ],
-    "right_secure_trading_msg"   =>   [
-        "name"      =>"Lorem ipsum dolor amet sitet,
-      başkası adipisicing elit",
-
+    'menu_messages' => [
+        'name' => 'Mesajlar'
     ],
-    "right_support_subject"   =>   [
-        "name"      =>"24/7 Destek",
-
+    'menu_my_purchase' => [
+        'name' => 'Aldıklarım'
     ],
-    "right_support_msg"   =>   [
-        "name"      =>"Lorem ipsum dolor amet sitet,
-      başkası adipisicing elit",
-
+    'menu_my_sales' => [
+        'name' => 'Satışlarım'
     ],
-    "right_easy_trading_subject"   =>   [
-        "name"      =>"Kolay Ticaret",
 
+    'disable_account' => [
+        'name' => 'Hesabı Dondur'
     ],
-    "right_easy_trading_msg"   =>   [
-        "name"      =>"Lorem ipsum dolor amet sitet,
-      başkası adipisicing elit",
-
+    'disable_account_msg' => [
+        'name' => 'Hesabınız devre dışı bırakılacak.Bu işlem geri alınamaz'
     ],
-    "right_need_help_subject"   =>   [
-        "name"      =>"Yardıma mı ihtiyacınız var?",
 
-    ],
-    "right_need_help_msg"   =>   [
-        "name"      =>"Bir çağrı yap",
+    'message_title' => 'Mesaj Başlığı',
+    'owner_name' => 'Mesaj',
 
+    'favorites' => "Favoriler",
+    'fav_advs' => 'Favori İlanlar',
+    'fav_sellers' => "Favori Satıcılar",
+    'fav_searches' => "Favori Aramalar",
+    'posted_on' => "Yayınlayan",
+    'message_details' => "Mesaj Detayı",
+    'adv_no' => 'İlan Numarası',
+    'bill_address' => [
+        'name' => 'Fatura Adresi',
     ],
-    "disable_account"   =>   [
-        "name"      =>"Hesabı devre dışı bırak",
-
+    'delivery_address' => [
+        'name' => 'Teslimat Adresi',
     ],
-    "disable_account_msg"   =>   [
-        "name"      =>"Hesabınız devre dışı bırakılacak. Bu işlem geri alınamaz",
-
+    'order_total' => [
+        'name' => 'Toplam',
     ],
-    "message_title"   =>"Mesaj Başlığı",
-    "owner_name"   =>"Mesaj",
-    "favorites"   =>"Favoriler",
-    "fav_advs"   =>"Favori İlanlar",
-    "fav_sellers"   =>"Fav Satıcıları",
-    "fav_searches"   =>"Fav Aramalar",
-    "posted_on"   =>"Yayınlanan",
-    "message_details"   =>"Mesaj Detayları",
-    "adv_no"   =>"İlan No",
-    "bill_address"   =>   [
-        "name"      =>"Fatura adresi",
-
+    'order_date' => [
+        'name' => 'Sipariş Tarihi',
     ],
-    "delivery_address"   =>   [
-        "name"      =>"Teslim adresi",
-
+    'order_no' => [
+        'name' => 'Sipariş Numarası',
     ],
-    "order_total"   =>   [
-        "name"      =>"Genel Toplam",
-
+    'order_detail' => [
+        'name' => 'Detaylar',
     ],
-    "order_date"   =>   [
-        "name"      =>"Sipariş tarihi",
-
+    /*Detail Page Order*/
+    'detail' => [
+        'name' => 'Detaylar',
     ],
-    "order_no"   =>   [
-        "name"      =>"Sipariş Kimliği",
-
+    'back' => [
+        'name' => 'Geri',
     ],
-    "order_detail"   =>   [
-        "name"      =>"Detayları göster",
-
+    'image' => [
+        'name' => 'Resim',
     ],
-    "detail"   =>   [
-        "name"      =>"detay",
-
+    'subject' => [
+        'name' => 'Başlık',
     ],
-    "back"   =>   [
-        "name"      =>"Geri",
-
+    'price' => [
+        'name' => 'Fiyat',
     ],
-    "image"   =>   [
-        "name"      =>"görüntü",
-
+    'piece' => [
+        'name' => 'Adet',
     ],
-    "subject"   =>   [
-        "name"      =>"konu",
-
+    'commission' => [
+        'name' => 'Komisyon',
     ],
-    "price"   =>   [
-        "name"      =>"Fiyat",
-
+    'total' => [
+        'name' => 'Toplam',
     ],
-    "piece"   =>   [
-        "name"      =>"Parça",
-
+    'sub_total' => [
+        'name' => 'Ara Toplam',
     ],
-    "commission"   =>   [
-        "name"      =>"komisyon",
-
+    'sale' => [
+        'name' => 'İndirim',
     ],
-    "total"   =>   [
-        "name"      =>"Genel Toplam",
-
+    'awaiting_tracking_number' => [
+        'name' => 'Takip Numarası Bekliyor',
     ],
-    "sub_total"   =>   [
-        "name"      =>"Ara toplam",
-
+    'awaiting_payment_approval' => [
+        'name' => 'Ödeme Onayını Bekliyor',
     ],
-    "sale"   =>   [
-        "name"      =>"Satış",
-
+    'paid' => [
+        'name' => 'Ödendi',
     ],
-    "awaiting_tracking_number"   =>   [
-        "name"      =>"Takip Numarası Bekleniyor",
-
+    'cancelled' => [
+        'name' => 'İptal Edildi',
     ],
-    "awaiting_payment_approval"   =>   [
-        "name"      =>"Ödeme Onayı Bekleniyor",
-
+    'waiting' => [
+        'name' => 'Bekleniyor',
     ],
-    "paid"   =>   [
-        "name"      =>"Ücretli",
-
+    'awaiting_dispatch' => [
+        'name' => 'Teslimat Bekliyor',
     ],
-    "cancelled"   =>   [
-        "name"      =>"İptal edildi",
-
+    'shipped' => [
+        'name' => 'Gönderen',
     ],
-    "waiting"   =>   [
-        "name"      =>"bekleme",
-
+    'delivered' => [
+        'name' => 'Teslim Alan',
     ],
-    "awaiting_dispatch"   =>   [
-        "name"      =>"Sevk Bekliyor",
-
+    'tracking_number' => [
+        'name' => 'Takip Numarası',
     ],
-    "shipped"   =>   [
-        "name"      =>"gönderilen",
-
+    'was_delivered' => [
+        'name' => 'teslim edildi',
     ],
-    "delivered"   =>   [
-        "name"      =>"teslim",
-
+    'not_delivered' => [
+        'name' => 'teslim edilemedi',
     ],
-    "tracking_number"   =>   [
-        "name"      =>"Takip numarası",
-
+    'show_order_msg1' => [
+        'name' => 'İşlem sonucu mail ile bildirilecektir.',
     ],
-    "was_delivered"   =>   [
-        "name"      =>"teslim edildi",
-
+    'show_order_msg2' => [
+        'name' => 'Ürün bir hafta içinde teslim edilmezse geri ödeme yapılacaktır.',
     ],
-    "not_delivered"   =>   [
-        "name"      =>"teslim edilmedi",
-
+    'show_order_msg3' => [
+        'name' => 'İşlemin sonucu kayıtlı e-posta adresinize gönderildi.',
     ],
-    "show_order_msg1"   =>   [
-        "name"      =>"İşlem sonucu posta ile bildirilecektir.",
 
+    'awaiting_payment' => [
+        'name' => 'Ödeme Bekliyor',
     ],
-    "show_order_msg2"   =>   [
-        "name"      =>"Ürün bir hafta içinde teslim edilmezse geri ödeme yapılır.",
-
+    'please_entered_tracking_number' => [
+        'name' => 'Lütfen Girilen Takip Numarasını Giriniz',
     ],
-    "show_order_msg3"   =>   [
-        "name"      =>"İşlem sonucu kayıtlı e-posta adresinize gönderildi.",
-
+    'transport_days' => [
+        'name' => 'Teslimat Süresi',
     ],
-    "awaiting_payment"   =>   [
-        "name"      =>"bekleyen ödeme",
-
+    'product_not_delivered' => [
+        'name' => 'Ürün teslim edilemedi.',
     ],
-    "please_entered_tracking_number"   =>   [
-        "name"      =>"Lütfen Takip Numarasını Giriniz",
-
+    'status' => [
+        'name' => 'Durum',
     ],
-    "transport_days"   =>   [
-        "name"      =>"Ulaşım Günleri",
-
+    'cancel_sale' => [
+        'name' => 'Satışı İptal Et',
     ],
-    "product_not_delivered"   =>   [
-        "name"      =>"Ürün teslim edilmedi",
-
+    'send_again' => [
+        'name' => 'Tekrar Gönderildi',
     ],
-    "status"   =>   [
-        "name"      =>"durum",
-
+    'content' => [
+        'name' => 'Detay',
     ],
-    "cancel_sale"   =>   [
-        "name"      =>"Satışı İptal Et",
-
+    'preferences_settings' => [
+        'name' => 'Tercihler',
     ],
-    "send_again"   =>   [
-        "name"      =>"Tekrar göndereceğim",
 
-    ],
-    "content"   =>   [
-        "name"      =>"içerik",
 
+    'corporate_settings' => [
+        'name' => 'Kurumsal Ayarlar',
     ],
-    "preferences_settings"   =>   [
-        "name"      =>"Tercihler Ayarları",
-
+    'password' => [
+        'name' => 'Şifre',
     ],
-    "corporate_settings"   =>   [
-        "name"      =>"Kurumsal Ayarlar",
-
+    'new_password' => [
+        'name' => 'Yeni Şifre',
     ],
-    "change_password"   =>   [
-        "name"      =>"Şifre değiştir",
-
+    're_new_password' => [
+        'name' => 'Şifre Onayı',
     ],
-    "new_password"   =>   [
-        "name"      =>"Yeni Şifre",
-
+    'confirm_password_input' => [
+        'name' => 'Şifremin değiştirilmesini onaylıyorum',
     ],
-    "re_new_password"   =>   [
-        "name"      =>"Şifreyi Onayla",
-
+    'create_address' => [
+        'name' => 'Adres Oluştur',
     ],
-    "confirm_password_input"   =>   [
-        "name"      =>"Şifre değişikliğimi onaylıyorum",
-
+    'edit_address' => [
+        'name' => 'Adres Düzenle',
     ],
-    "create_address"   =>   [
-        "name"      =>"Adres Oluştur",
-
+    'balance_limit' => [
+        'name' => 'Bakiye',
     ],
-    "balance_limit"   =>   [
-        "name"      =>"Bakiye Sınırı",
-
+    'active_ads' => [
+        'name' => 'Aktif İlanlar',
     ],
-    "active_ads"   =>   [
-        "name"      =>"Aktif İlanlar",
-
+    'subscriptions' => [
+        'name' => 'Abonelikler',
     ],
-    "subscriptions"   =>   [
-        "name"      =>"Abonelikler",
-
+    'go_subscriptions_page' => [
+        'name' => 'Aboneliklere git',
     ],
-    "go_subscriptions_page"   =>   [
-        "name"      =>"Abonelikler Sayfasına Git",
-
+    'buy_package' => [
+        'name' => 'Paket Satın Al',
     ],
-    "buy_package"   =>   [
-        "name"      =>"Paket satın al",
-
+    'expired_date' => [
+        'name' => 'Son Kullanım',
     ],
-    "expired_date"   =>   [
-        "name"      =>"Son kullanma tarihi geçmiş",
-
+    'category' => [
+        'name' => 'Kategori',
     ],
-    "category"   =>   [
-        "name"      =>"Kategori",
-
+    'ad_limit' => [
+        'name' => 'İlan Limiti',
     ],
-    "ad_limit"   =>   [
-        "name"      =>"İlan Sınırı",
-
+    'publish_time' => [
+        'name' => 'Yayın Süresi',
     ],
-    "publish_time"   =>   [
-        "name"      =>"Yayınlanma Zamanı",
-
+    'all_categories' => [
+        'name' => 'Tüm Kategoriler',
     ],
-    "all_categories"   =>   [
-        "name"      =>"Tüm Kategoriler",
-
+    'day' => [
+        'name' => 'Gün',
     ],
-    "day"   =>   [
-        "name"      =>"Gün",
 
+    'individual' => [
+        'name' => 'Bireysel',
     ],
-
-];
\ No newline at end of file
+    'corporate' => [
+        'name' => 'Kurumsal',
+    ],
+    'details' => [
+        'name' => 'Detaylar'
+    ],
+];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/message.php b/addons/default/visiosoft/profile-module/resources/lang/tr/message.php
index d4657aae1..ce65d92bc 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/message.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/message.php
@@ -1,23 +1,22 @@
 <?php
 
- return[
-   "email"   =>"E-Posta Alanınız Zorunlu!",
-   "username"   =>"Kullanıcı Adı Alan Zorunlu!",
-   "success_update"   =>"Profil Güncellemesi Başarıyla!",
-   "adress_success_update"   =>"Adres Güncelleme Başarıyla!",
-   "adress_success_create"   =>"Adres Başarıyla Oluşturuldu!",
-   "login_error"   =>"Yanlış giriş veya şifre.",
-   "login_noMail_old_user"   =>"Girdiğiniz e-posta adresi bulunamadı.",
-   "login_noMail_old_user2"   =>"Lütfen e-posta adresini kontrol edip tekrar deneyin.",
-   "login_noMail_old_user3"   =>"Sorun devam ederse,
-   lütfen \'info@openclassify.com\' adresinden iletişim kurun.",
-   "login_info_old_user"   =>"E-posta adresinize yeni bir şifre gönderildi.",
-   "success"   =>"Başarılı",
-   "notified_new_updates"   =>"Yeni güncellemelerden haberdar olmak istiyorum",
-   "notified_about_ads"   =>"İlanlarım hakkında bildirimlere izin ver",
-   "receive_messages_email"   =>"Mesajları e-posta olarak almak istiyorum.",
-   "no_packages_module"   =>"Paket Modülü Yok!",
-   "required_add"   =>"Lütfen gerekli tüm satırları doldurunuz.",
-   "no_extend_package"   =>"İlan Paketlerini Genişletme",
-   "saved"   =>"Kaydedilen!"
-];
\ No newline at end of file
+return [
+    "email" => "Eposta alanı zorunludur!",
+    "username" => "Kullanıcı Adı alanı zorunludur!",
+    "success_update" => "Profil Başarıyla Güncellendi!",
+    "adress_success_update" => "Adres Başarıyla Güncellendi!",
+    "adress_success_create" => "Adres Başarıyla Oluşturuldu!",
+    "login_error" => "Giriş Bilgileri Hatalıdır.",
+    "login_noMail_old_user" => "Girdiğiniz e-posta adresi bulunamadı.",
+    "login_noMail_old_user2" => "Lütfen e-posta adresini kontrol edip tekrar deneyin.",
+    "login_noMail_old_user3" => "Sorun devam ederse, lütfen 'info@openclassify.com' adresinden iletişim kurun.",
+    "login_info_old_user" => "E-posta adresinize yeni bir şifre gönderildi.",
+    "success" => "İşlem Başarılı",
+    "no_packages_module" => "Paket Modülü Bulunamadı!",
+    "required_add" => "Lütfen gerekli tüm satırları doldurun.",
+    "no_extend_package" => "İlan Yayınlama Süresi paketiniz bulunamadı.",
+    "saved" => "Kayıt Edildi!",
+    'please_confirm_transaction' => 'Lütfen işlemi onaylayın',
+    'password_do_not_match' => 'Şifreler eşleşmiyor',
+    'your_password_changed' => 'Şifreniz başarıyla güncellendi',
+];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/permission.php b/addons/default/visiosoft/profile-module/resources/lang/tr/permission.php
deleted file mode 100644
index 5e7a5ebb2..000000000
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/permission.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
- return[
-   "profile"   =>   [
-      "name"      =>"Profil",
-      "option"      =>      [
-         "read"         =>"Profili okuyabilir mi?        ",
-         "write"         =>"Profil oluşturabilir / düzenleyebilir mi?        ",
-         "delete"         =>"Profili silebilir miyim?"
-      ],
-
-   ],
-   "adress"   =>   [
-      "name"      =>"Adres",
-      "option"      =>      [
-         "read"         =>"Adresleri okuyabilir miyim?        ",
-         "write"         =>"Adres oluşturabilir / düzenleyebilir mi?        ",
-         "delete"         =>"Adresini silebilir miyim?",
-
-      ],
-
-   ],
-
-];
\ No newline at end of file
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/section.php b/addons/default/visiosoft/profile-module/resources/lang/tr/section.php
index d72a81cf5..ced15c8f5 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/section.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/section.php
@@ -1,13 +1,11 @@
 <?php
 
- return[
-   "profile"   =>   [
-      "title"      =>"Profil",
-
-   ],
-   "adress"   =>   [
-      "title"      =>"Adres",
-
-   ],
-
-];
\ No newline at end of file
+return [
+    'profile' => [
+        'title' => 'Profil',
+    ],
+    'adress' => [
+        'title' => 'Adres',
+    ],
+    'general_setting' => 'Genel Ayarlar',
+];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/setting.php b/addons/default/visiosoft/profile-module/resources/lang/tr/setting.php
new file mode 100644
index 000000000..6182d746c
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/setting.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'show_my_ads' => [
+        'name' => 'İlanlarım Sekmesi Görünümü',
+    ],
+    'upload_avatar' => [
+        'name' => 'Profil Fotoğrafı',
+    ],
+];
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/stream.php b/addons/default/visiosoft/profile-module/resources/lang/tr/stream.php
index 5bdeb4b73..27b04fd27 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/stream.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/stream.php
@@ -1,13 +1,10 @@
 <?php
 
- return[
-   "profile"   =>   [
-      "name"      =>"Profil",
-
-   ],
-   "adress"   =>   [
-      "name"      =>"Adres",
-
-   ],
-
-];
\ No newline at end of file
+return [
+    'profile' => [
+        'name' => 'Profil',
+    ],
+    'adress' => [
+        'name' => 'Adres',
+    ],
+];
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 80a8d92ae..cb2498569 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig
@@ -18,10 +18,12 @@
 
                         <div class="col-md-4 p-5">
                             <div class="row">
-                                <div class="col-md-12 text-center align-middle">
-                                    <img src="{{ profile_photo }}" class="img-responsive w-100"
-                                         style="max-width: 150px">
-                                </div>
+                                {% if setting_value('visiosoft.module.profile::upload_avatar') %}
+                                    <div class="col-md-12 text-center align-middle">
+                                        <img src="{{ profile_photo }}" class="img-responsive w-100"
+                                             style="max-width: 150px">
+                                    </div>
+                                {% endif %}
                                 <div class="col-md-12 text-center align-middle text-white p-2 text-truncate">
                                     <h3>{{ user().first_name }} {{ user().last_name }}</h3>
                                     <small>{{ auth_user().last_login_at|date("d/m/Y H:i:s") }}</small>
@@ -36,105 +38,136 @@
 
                 <!-- User Profile Form Section-->
                 <div class="col-md-12 mt-5 bg-light profile-section">
-                    <nav>
 
+                    <nav>
                         <div class="nav nav-tabs nav-fill" id="nav-tab" role="tablist">
-                            <a class="nav-item nav-link active text-dark" id="nav-detail-tab" data-toggle="tab"
-                               href="#nav-detail"
-                               role="tab" aria-controls="nav-detail" aria-selected="true">Detail</a>
+                            <a class="nav-item nav-link active text-dark" id="nav-profile-tab" data-toggle="tab"
+                               href="#nav-profile"
+                               role="tab" aria-controls="nav-profile" aria-selected="true">
+                                {{ trans('visiosoft.module.profile::field.profile.name') }}
+                            </a>
+                            <a class="nav-item nav-link text-dark" id="nav-details-tab" data-toggle="tab"
+                               href="#nav-details"
+                               role="tab" aria-controls="nav-details" aria-selected="false">
+                                {{ trans('visiosoft.module.profile::field.details.name') }}
+                            </a>
                             <a class="nav-item nav-link text-dark" id="nav-password-tab" data-toggle="tab"
                                href="#nav-password"
-                               role="tab" aria-controls="nav-password" aria-selected="false">Password</a>
-                            <a class="nav-item nav-link text-dark" id="nav-other-tab" data-toggle="tab"
-                               href="#nav-other"
-                               role="tab" aria-controls="nav-other" aria-selected="false">Other</a>
+                               role="tab" aria-controls="nav-password" aria-selected="false">
+                                {{ trans('visiosoft.module.profile::field.password.name') }}
+                            </a>
                         </div>
                     </nav>
-                    {% set form = form('profile', 'profile').redirect('/profile/home').entry(profiles.id).actions(['update']).get() %}
-                    {{ form_open({
-                        'class': 'form ' ~ form.options.class ,
-                        'enctype': 'multipart/form-data',
-                        'data-name': 'profile',
-                        'url': 'profile/update'
-                    })|raw }}
+
                     <div class="tab-content py-3 px-3 px-sm-0" id="nav-tabContent">
-                        <div class="tab-pane fade show active" id="nav-detail" role="tabpanel"
-                             aria-labelledby="nav-detail-tab">
-                            <div class="form-group">
-                                {{ form.fields.file|raw }}
+                        <div class="tab-pane fade show active" id="nav-profile" role="tabpanel"
+                             aria-labelledby="nav-profile-tab">
+                            <div class="col-12">
+                                {% set userForm = form('userProfile').entry(auth_user().id).get() %}
+                                {{ userForm.open()|raw }}
+                                <div class="form-group">
+                                    <label class="control-label font-weight-bold">
+                                        {{ trans("visiosoft.module.profile::field.first_name.name") }}
+                                    </label>
+                                    {{ userForm.fields.first_name.input|raw }}
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label font-weight-bold">
+                                        {{ trans("visiosoft.module.profile::field.last_name.name") }}
+                                    </label>
+                                    {{ userForm.fields.last_name.input|raw }}
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label font-weight-bold">
+                                        {{ trans("visiosoft.module.profile::field.email.name") }}
+                                    </label>
+                                    <input value="{{ auth_user().email }}" type="text" disabled class="form-control">
+                                </div>
+                                <div class="form-group">
+                                    {{ userForm.actions|raw }}
+                                </div>
+                                {{ userForm.close()|raw }}
                             </div>
-                            <div class="form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.first_name.name") }}</label>
-                                {{ users.first_name.input|raw }}
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.last_name.name") }}</label>
-                                {{ users.last_name.input|raw }}
-                            </div>
-                            <div class="form-group required-profile-phone-field">
-                                <label class="control-label font-weight-bold">{{ form.fields.gsm_phone.label }}</label>
-                                <input type="text" class="form-control" id="phone"
-                                       value="{{ profiles.gsm_phone.value }}" name="gsm_phone">
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.email.name") }}</label>
-                                <input type="email" value="{{ users.email }}" name="email" placeholder=""
-                                       class="form-control"
-                                       data-field="email" data-field_name="email"
-                                       data-provides="anomaly.field_type.email" disabled>
-                            </div>
-                            <div class="form-group">
-                                {{ form.actions|raw }}
+                        </div>
+
+                        <div class="tab-pane fade" id="nav-details" role="tabpanel"
+                             aria-labelledby="nav-details-tab">
+                            <div class="col-12">
+                                {% set profileForm = form('profile').entry(profiles.id).get() %}
+
+                                {{ profileForm.open()|raw }}
+
+                                {% if setting_value('visiosoft.module.profile::upload_avatar') %}
+                                    <div class="form-group">
+                                        {{ profileForm.fields.file|raw }}
+                                    </div>
+                                {% endif %}
+
+                                <div class="form-group required-profile-phone-field">
+                                    <label class="control-label font-weight-bold">
+                                        {{ profileForm.fields.gsm_phone.label }}
+                                    </label>
+                                    {{ profileForm.fields.gsm_phone.input|raw }}
+                                </div>
+                                <div class="form-group required-profile-phone-field">
+                                    <label class="control-label font-weight-bold">
+                                        {{ profileForm.fields.office_phone.label }}
+                                    </label>
+                                    {{ profileForm.fields.office_phone.input|raw }}
+                                </div>
+                                <div class="form-group required-profile-phone-field">
+                                    <label class="control-label font-weight-bold">
+                                        {{ profileForm.fields.land_phone.label }}
+                                    </label>
+                                    {{ profileForm.fields.land_phone.input|raw }}
+                                </div>
+                                <div class=" form-group">
+                                    <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.adv_listing_banner.name") }}</label>
+                                    {{ profileForm.fields.adv_listing_banner.input|raw }}
+                                </div>
+                                <div class=" form-group">
+                                    <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.identification_number.name") }}</label>
+                                    {{ profileForm.fields.identification_number.input|raw }}
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.register_type.name") }}</label>
+                                    {{ profileForm.fields.register_type.input|raw }}
+                                </div>
+                                <div class="form-group">
+                                    {{ profileForm.actions|raw }}
+                                </div>
+                                {{ profileForm.close()|raw }}
                             </div>
                         </div>
 
                         <div class="tab-pane fade" id="nav-password" role="tabpanel" aria-labelledby="nav-password-tab">
+                            {% set passwordForm = form('updatePassword').get() %}
+
+                            {{ passwordForm.open()|raw }}
+
                             <div class="form-group">
                                 <label class="font-weight-bold">{{ trans("visiosoft.module.profile::field.new_password.name") }}</label>
-                                <input type="password" name="new_password" class="form-control">
+                                {{ passwordForm.fields.new_password.input|raw }}
                             </div>
 
                             <div class="form-group">
                                 <label class="font-weight-bold">{{ trans("visiosoft.module.profile::field.re_new_password.name") }}</label>
-                                <input type="password" name="re_new_password" class="form-control">
-                            </div>
-                            <div class="form-group confirm-password-field">
-                                <i class="fa fa-warning"></i>
-                                <input type="checkbox" name="confirm_password_input">
-                                <label>{{ trans("visiosoft.module.profile::field.confirm_password_input.name") }}
-                                    .</label>
-                            </div>
-                            <div class="form-group">
-                                {{ form.actions|raw }}
-                            </div>
-                        </div>
-                        <div class="tab-pane fade" id="nav-other" role="tabpanel" aria-labelledby="nav-other-tab">
-
-                            <div class=" form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.adv_listing_banner.name") }}</label>
-                                {{ form.fields.adv_listing_banner.input|raw }}
-                            </div>
-                            <div class=" form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.identification_number.name") }}</label>
-                                {{ profiles.identification_number.input|raw }}
-                            </div>
-                            <div class="form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.register_type.name") }}</label>
-                                {{ profiles.register_type.input|raw }}
-                            </div>
-                            <div class=" form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.office_phone.name") }}</label>
-                                {{ profiles.office_phone.input|raw }}
-                            </div>
-                            <div class=" form-group">
-                                <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.land_phone.name") }}</label>
-                                {{ profiles.land_phone.input|raw }}
-                            </div>
-                            <div class="form-group">
-                                {{ form.actions|raw }}
+                                {{ passwordForm.fields.re_new_password.input|raw }}
                             </div>
 
+                            <div class="form-group confirm-password-field row pl-3">
+                                {{ passwordForm.fields.confirm_password|raw }}
+                                <div class="col-10">
+                                    <label>
+                                        {{ trans("visiosoft.module.profile::field.confirm_password_input.name") }}.
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                {{ passwordForm.actions|raw }}
+                            </div>
                         </div>
+                        {{ passwordForm.close|raw }}
                     </div>
                     <!-- User Profile Form Section-->
 
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 bc8aec83e..7b31c6af7 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -65,42 +65,10 @@ class MyProfileController extends PublicController
         $advRepository->delete_empty_advs();
 
         $menu_fields = array();
-
-        $isActive = new AdvModel();
-        $isActiveMessages = $isActive->is_enabled('messages');
-        $isActivePackages = $isActive->is_enabled('packages');
-
-
-        if ($isActiveMessages) {
-
-            $myMessages = new MessageModel();
-            $myMessages = $myMessages->listMessages();
-            $message_count = count($myMessages);
-
-            $menu_messages = array();
-            $menu_messages['href'] = "msg";
-            $menu_messages['aria-controls'] = "msg";
-            $menu_messages['title'] = trans('visiosoft.module.profile::field.menu_messages.name');
-            $menu_fields[] = $menu_messages;
-        }
-
-
         $advs_count = new AdvModel();
         $advs_count = count($advs_count->myAdvsByUser()->get());
 
-
-        if ($isActivePackages) {
-            $packageModel = new PackageModel();
-            $my_packages = $packageModel->getPackageByLoggedInUser();
-            $menu_packages = array();
-            $menu_packages['href'] = "packages";
-            $menu_packages['aria-controls'] = "packages";
-            $menu_packages['title'] = trans('visiosoft.module.profile::field.menu_packages.name');
-            $menu_fields[] = $menu_packages;
-        }
-
         $profileModel = new ProfileModel();
-        $adressModel = new AdressModel();
 
         $users = UsersUsersEntryModel::find(Auth::id());
         $profiles = $profileModel->getProfile(Auth::id())->orderBy("id")->first();
@@ -120,36 +88,6 @@ class MyProfileController extends PublicController
             'mySales', 'advs_count', 'fav_count', 'userbalance', 'balancespackage'));
     }
 
-    public function update(ProfileFormBuilder $form, Request $request, UserPassword $userPassword, ProfileRepositoryInterface $profileRepository)
-    {
-        $id = Auth::id();
-        $all = $request->all();
-        //updateUserFields && remove added fields
-        $all = $profileRepository->updateUserField($all);
-        if (isset($all['confirm_password_input']) and $all['confirm_password_input'] == "on") {
-            $all = $profileRepository->changePassword($all, $userPassword);
-        } else {
-            unset($all['new_password'], $all['re_new_password'], $all['confirm_password_input']);
-        }
-        if (isset($all['error'])) {
-            return redirect('/profile')->with('error', $all['error']);
-        }
-
-        unset($all['_token'], $all['action']);
-        $all['file_id'] = $all['file'];
-        if (isset($all['adv_listing_banner'])) {
-            $all['adv_listing_banner_id'] = $all['adv_listing_banner'];
-            unset($all['adv_listing_banner']);
-        }
-        unset($all['file']);
-
-        $profileModel = new ProfileModel();
-        $profileModel->getProfile($id)->update($all);
-
-        $message = [];
-        $message[] = trans('visiosoft.module.profile::message.success_update');
-        return redirect('/profile')->with('success', $message);
-    }
 
     public function extendAds($id, $type, SettingRepositoryInterface $settings)
     {
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileRepositoryInterface.php b/addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileRepositoryInterface.php
index 961e9e7ac..f973eff3d 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileRepositoryInterface.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Contract/ProfileRepositoryInterface.php
@@ -17,4 +17,6 @@ interface ProfileRepositoryInterface extends EntryRepositoryInterface
     public function changePassword($fields, $password);
 
     public function findByUserID($id);
+
+    public function CheckPhoneNumber($phoneNumber);
 }
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php
new file mode 100644
index 000000000..a72b2a450
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php
@@ -0,0 +1,34 @@
+<?php namespace Visiosoft\ProfileModule\Profile\Password;
+
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+use Anomaly\UsersModule\User\UserModel;
+
+
+class PasswordFormBuilder extends FormBuilder
+{
+    protected $fields = [
+        'new_password' => [
+            'type' => 'anomaly.field_type.text',
+            'required' => true,
+            'config' => [
+                'type' => 'password'
+            ],
+        ],
+        're_new_password' => [
+            'type' => 'anomaly.field_type.text',
+            'required' => true,
+            'config' => [
+                'type' => 'password'
+            ],
+        ],
+        'confirm_password' => [
+            'type' => 'anomaly.field_type.boolean',
+        ],
+    ];
+
+    protected $actions = [
+        'update' => [
+            'text' => 'visiosoft.module.profile::button.update_password'
+        ],
+    ];
+}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php
new file mode 100644
index 000000000..61d0c7161
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php
@@ -0,0 +1,50 @@
+<?php namespace Visiosoft\ProfileModule\Profile\Password;
+
+use Anomaly\Streams\Platform\Message\MessageBag;
+use Anomaly\UsersModule\User\UserModel;
+use Anomaly\UsersModule\User\UserPassword;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+
+class PasswordFormHandler
+{
+    public function handle(
+        PasswordFormBuilder $builder,
+        MessageBag $messages,
+        UserModel $userModel,
+        UserPassword $userPassword
+
+    )
+    {
+        $errorList = array();
+
+        if (!$builder->canSave()) {
+            return;
+        }
+
+        if (!$builder->getPostValue('confirm_password')) {
+            $messages->error(trans('visiosoft.module.profile::message.please_confirm_transaction'));
+            return redirect()->back();
+        }
+
+        if ($builder->getPostValue('new_password') != $builder->getPostValue('re_new_password')) {
+            $messages->error(trans('visiosoft.module.profile::message.password_do_not_match'));
+            return redirect()->back();
+        }
+        $validator = $userPassword->validate($builder->getPostValue('new_password'));
+        foreach ($validator->errors()->all() as $error) {
+            $errorList[] = $error;
+        }
+
+        if (count($errorList) != 0) {
+            $messages->error($errorList);
+            return redirect()->back();
+        }
+
+        $userModel->find(Auth::id())
+            ->update([
+                'password' => Hash::make($builder->getPostValue('new_password'))
+            ]);
+        $messages->success(trans('visiosoft.module.profile::message.your_password_changed'));
+    }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
new file mode 100644
index 000000000..15c577695
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php
@@ -0,0 +1,27 @@
+<?php namespace Visiosoft\ProfileModule\Profile\Profile;
+
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+use Visiosoft\ProfileModule\Profile\ProfileModel;
+
+
+class ProfileFormBuilder extends FormBuilder
+{
+
+    protected $model = ProfileModel::class;
+
+    protected $fields = [
+        'file',
+        'gsm_phone',
+        'office_phone',
+        'land_phone',
+        'adv_listing_banner',
+        'identification_number',
+        'register_type'
+    ];
+
+    protected $actions = [
+        'update' => [
+            'text' => 'visiosoft.module.profile::button.update_profile'
+        ],
+    ];
+}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
new file mode 100644
index 000000000..025c2281e
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
@@ -0,0 +1,37 @@
+<?php namespace Visiosoft\ProfileModule\Profile\Profile;
+
+use Anomaly\Streams\Platform\Message\MessageBag;
+use Illuminate\Support\Facades\Auth;
+use Visiosoft\ProfileModule\Profile\ProfileModel;
+
+class ProfileFormHandler
+{
+    public function handle(
+        ProfileFormBuilder $builder,
+        MessageBag $messages,
+        ProfileModel $profileModel
+    )
+    {
+        if (!$builder->canSave()) {
+            return;
+        }
+
+        $parameters = [
+            'gsm_phone' => $builder->getPostValue('gsm_phone'),
+            'office_phone' => $builder->getPostValue('office_phone'),
+            'land_phone' => $builder->getPostValue('land_phone'),
+            'identification_number' => $builder->getPostValue('identification_number'),
+            'register_type' => $builder->getPostValue('register_type'),
+            'adv_listing_banner_id' => $builder->getPostValue('adv_listing_banner'),
+        ];
+
+        if ($builder->getPostValue('file') != null)
+            $parameters['file_id'] = $builder->getPostValue('file');
+
+
+        $profileModel->where('user_no_id', Auth::id())
+            ->update($parameters);
+
+        $messages->success(trans('visiosoft.module.profile::message.success_update'));
+    }
+}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php b/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php
index 2da0607d2..744b1534c 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php
@@ -6,6 +6,7 @@ use Anomaly\UsersModule\User\Password\Command\StartPasswordReset;
 use Anomaly\UsersModule\User\Password\ForgotPasswordFormHandler;
 use Anomaly\UsersModule\User\UserModel;
 use Anomaly\UsersModule\User\UserPassword;
+use function CoffeeScript\t;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Redirect;
@@ -129,5 +130,13 @@ class ProfileRepository extends EntryRepository implements ProfileRepositoryInte
         return $this->model->where('user_no_id', $id)->first();
     }
 
+    public function CheckPhoneNumber($phoneNumber)
+    {
+        return $this->model
+            ->where('gsm_phone', $phoneNumber)
+            ->where('user_no_id','!=', Auth::id())
+            ->first();
+    }
+
 
 }
diff --git a/addons/default/visiosoft/profile-module/src/Profile/User/UserFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/User/UserFormBuilder.php
new file mode 100644
index 000000000..beb5f5685
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Profile/User/UserFormBuilder.php
@@ -0,0 +1,26 @@
+<?php namespace Visiosoft\ProfileModule\Profile\User;
+
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+use Anomaly\UsersModule\User\UserModel;
+
+
+class UserFormBuilder extends FormBuilder
+{
+
+    protected $model = UserModel::class;
+
+    protected $fields = [
+        'first_name' => [
+            'required' => true,
+        ],
+        'last_name' => [
+            'required' => true,
+        ],
+    ];
+
+    protected $actions = [
+        'update' => [
+            'text' => 'visiosoft.module.profile::button.update_profile'
+        ],
+    ];
+}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/User/UserFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/User/UserFormHandler.php
new file mode 100644
index 000000000..dd9121d76
--- /dev/null
+++ b/addons/default/visiosoft/profile-module/src/Profile/User/UserFormHandler.php
@@ -0,0 +1,23 @@
+<?php namespace Visiosoft\ProfileModule\Profile\User;
+
+use Anomaly\Streams\Platform\Message\MessageBag;
+use Anomaly\UsersModule\User\UserModel;
+use Illuminate\Support\Facades\Auth;
+
+class UserFormHandler
+{
+    public function handle(
+        UserFormBuilder $builder,
+        MessageBag $messages,
+        UserModel $userModel
+    )
+    {
+        if (!$builder->canSave()) {
+            return;
+        }
+
+        $userModel->find(Auth::id())
+            ->update($builder->getPostData());
+        $messages->success(trans('visiosoft.module.profile::message.success_update'));
+    }
+}
diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
index b39eccea2..6adae3291 100644
--- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
+++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
@@ -7,12 +7,15 @@ use Visiosoft\ProfileModule\Adress\AdressRepository;
 use Anomaly\Streams\Platform\Model\Profile\ProfileAdressEntryModel;
 use Visiosoft\ProfileModule\Adress\AdressModel;
 use Visiosoft\ProfileModule\Profile\Contract\ProfileRepositoryInterface;
+use Visiosoft\ProfileModule\Profile\Password\PasswordFormBuilder;
+use Visiosoft\ProfileModule\Profile\Profile\ProfileFormBuilder;
 use Visiosoft\ProfileModule\Profile\ProfileRepository;
 use Anomaly\Streams\Platform\Model\Profile\ProfileProfileEntryModel;
 use Visiosoft\ProfileModule\Profile\ProfileModel;
 use Illuminate\Routing\Router;
 use Visiosoft\ProfileModule\Profile\Register2\Register2FormBuilder;
 use Visiosoft\ProfileModule\Profile\sites\SitesFormBuilder;
+use Visiosoft\ProfileModule\Profile\User\UserFormBuilder;
 
 class ProfileModuleServiceProvider extends AddonServiceProvider
 {
@@ -169,6 +172,9 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
      * @type array|null
      */
     protected $bindings = [
+        'updatePassword' => PasswordFormBuilder::class,
+        'userProfile' => UserFormBuilder::class,
+        'profile' => ProfileFormBuilder::class,
         ProfileAdressEntryModel::class => AdressModel::class,
         ProfileProfileEntryModel::class => ProfileModel::class,
     ];