diff --git a/app/Http/Controllers/Admin/DashboardController.php b/app/Http/Controllers/Admin/DashboardController.php
index d45b654..ee88f6f 100644
--- a/app/Http/Controllers/Admin/DashboardController.php
+++ b/app/Http/Controllers/Admin/DashboardController.php
@@ -198,6 +198,7 @@ class DashboardController extends Controller
         // dd(auth()->user()->id);
 
         $tasks = LeadTasksMeeting::where('owner', auth()->user()->id)->orderBy('created_at', 'desc')->tasks()->get();
+        // $tasks = [];
         // dd($tasks, auth()->user()->id);
         $meetings = LeadTasksMeeting::where('host', (string)auth()->user()->id)->orderBy('created_at', 'desc')->meetings()->get();
         // dd($meetings);
diff --git a/app/Http/Controllers/Admin/ManageCommissionController.php b/app/Http/Controllers/Admin/ManageCommissionController.php
index 69983bd..5702db4 100644
--- a/app/Http/Controllers/Admin/ManageCommissionController.php
+++ b/app/Http/Controllers/Admin/ManageCommissionController.php
@@ -58,30 +58,24 @@ class ManageCommissionController extends Controller
             // ->orderBy('products.created_at')
             ->latest('products.created_at')
             ->get();
-            // dd($products);
-        $products->each(function($value){
-            $monthlyData = MonthlyUpdateMaster::where('products_id',$value->id)->get();
+        // dd($products);
+        $products->each(function ($value) {
+            $monthlyData = MonthlyUpdateMaster::where('products_id', $value->id)->get();
             $totalCommission = 0;
             $totalInvestment = 0;
-            if($monthlyData->isNotEmpty())
-            {
-                foreach($monthlyData as $monthlyDataRow)
-                {
-                    if(MonthlyUpdateFractionalRealEstate::where('custom_id',$monthlyDataRow->custom_id)->exists())
-                    {
-                        $freData = MonthlyUpdateFractionalRealEstate::where('custom_id',$monthlyDataRow->custom_id)->first();
+            if ($monthlyData->isNotEmpty()) {
+                foreach ($monthlyData as $monthlyDataRow) {
+                    if (MonthlyUpdateFractionalRealEstate::where('custom_id', $monthlyDataRow->custom_id)->exists()) {
+                        $freData = MonthlyUpdateFractionalRealEstate::where('custom_id', $monthlyDataRow->custom_id)->first();
                         $totalInvestment += floatval($freData->getRawOriginal()['investment_value']);
                     }
-                    if(MonthlyUpdateAlternativeInvestmentFund::where('custom_id',$monthlyDataRow->custom_id)->exists())
-                    {
-                        $aifData = MonthlyUpdateAlternativeInvestmentFund::where('custom_id',$monthlyDataRow->custom_id)->first();
+                    if (MonthlyUpdateAlternativeInvestmentFund::where('custom_id', $monthlyDataRow->custom_id)->exists()) {
+                        $aifData = MonthlyUpdateAlternativeInvestmentFund::where('custom_id', $monthlyDataRow->custom_id)->first();
                         $totalInvestment += floatval($aifData->getRawOriginal()['commitment_amount']);
                     }
-                    $data = MonthlyUpdateMasterCommission::where('monthly_id',$monthlyDataRow->id)->get();
-                    if($data->isNotEmpty())
-                    {
-                        foreach($data as $dataRow)
-                        {
+                    $data = MonthlyUpdateMasterCommission::where('monthly_id', $monthlyDataRow->id)->get();
+                    if ($data->isNotEmpty()) {
+                        foreach ($data as $dataRow) {
                             $totalCommission += floatval($dataRow->getRawOriginal()['gross_commissioned_earned_inr']);
                         }
                     }
@@ -193,6 +187,12 @@ class ManageCommissionController extends Controller
         if (!$check) {
             abort(404);
         }
+        // $data = MonthlyUpdateMasterCommission::query()
+        //     ->with('monthlyUpdate.products.fractional_real_estate')
+        //     ->latest()
+        //     ->get();
+        //     // ->select('*');
+        // dd($data->toArray());
         return view('Admin.Pages.manage_commission.user_commission');
     }
 
@@ -262,7 +262,7 @@ class ManageCommissionController extends Controller
                     return '<div class="text-center">' . $row->monthlyUpdate->investor_name . ' </div>';
                 })
                 ->editColumn('product_sold', function ($row) {
-                    return '<div class="text-center">' . 'ABC' . '</div>';
+                    return '<div class="text-center">' . $row->monthlyUpdate->product_name . '</div>';
                 })
                 ->editColumn('month', function ($row) {
                     return '<div class="text-center">' . $row->created_at->format('M') . ' </div>';
@@ -283,11 +283,11 @@ class ManageCommissionController extends Controller
                     <a href=$view>
                     <i class='fa-regular fa-eye'></i>
                 </a>
-                <a href=$edit style='float:right'>
-                    <i class='fa-solid fa-pen-to-square'></i>
-                </a>
                 </div>
                 ";
+                    // <a href=$edit style='float:right'>
+                    //     <i class='fa-solid fa-pen-to-square'></i>
+                    // </a>
                     return $btn;
                 })
                 ->rawColumns(['investor_name', 'product_sold', 'month', 'total_investment', 'applicable_rate', 'commission_type', 'created_at', 'action'])
@@ -298,8 +298,7 @@ class ManageCommissionController extends Controller
     public function trailCommission()
     {
         $check = checkSidebarAccess('trail-commission');
-        if(!$check)
-        {
+        if (!$check) {
             abort(404);
         }
         return view('Admin.Pages.manage_commission.trail_commission', [
diff --git a/app/Http/Controllers/Admin/ManageSellerProfileController.php b/app/Http/Controllers/Admin/ManageSellerProfileController.php
index 138c0fa..6540125 100644
--- a/app/Http/Controllers/Admin/ManageSellerProfileController.php
+++ b/app/Http/Controllers/Admin/ManageSellerProfileController.php
@@ -24,7 +24,7 @@ class ManageSellerProfileController extends Controller
             ->withCount(['aif', 'fre', 'op'])
             ->latest()
             ->get();
-        // dd($sellerProfile->toArray());
+        dd($sellerProfile->toArray());
         return view('Admin.Pages.pre_owned_investment.manage_seller_profile', compact('sellerProfile'));
     }
 
diff --git a/app/Http/Controllers/Admin/ManageSubAdminController.php b/app/Http/Controllers/Admin/ManageSubAdminController.php
index 9d4e1c6..2fb4717 100644
--- a/app/Http/Controllers/Admin/ManageSubAdminController.php
+++ b/app/Http/Controllers/Admin/ManageSubAdminController.php
@@ -67,73 +67,55 @@ class ManageSubAdminController extends Controller
 
     public function addSubAdmin(Request $request)
     {
-        // dd($request->all());
-        $validator = Validator::make($request->post(), [
+        $validator = Validator::make($request->all(), [
             'name' => 'required',
-            // 'address' => 'required',
             'mobile_number' => 'required',
             'password' => 'required',
-            'email' => 'required',
+            'email' => 'required|email|unique:users,email',
         ], [
-            'unique' => ':attribute should be unique',
-            'required' => ':attribute is required'
+            'required' => ':attribute is required',
+            'unique' => 'The :attribute has already been taken.',
+            'email' => 'The :attribute must be a valid email address.',
         ]);
-        $validationMessage = validationErrorMessage($validator);
-        if ($validationMessage) {
-            return response()->json(['status' => 400, 'message' => $validationMessage]);
-        }
-        // $principalType = Iam_Principal_Type::find($request->role_type);
-        $emailAlreadyExists = User::where('email',$request->email)->exists();
-        $contactAlreadyExists = User::where('contact_number',$request->contact_number)->exists();
-        if($emailAlreadyExists)
-        {
-            return response()->json(['status' => 400, 'message' =>'email should be unique']);
-        }
-        if($contactAlreadyExists)
-        {
-            return response()->json(['status' => 400, 'message' =>'Mobile number should be unique']);
+
+        if ($validator->fails()) {
+            return response()->json(['status' => 400, 'message' => $validator->errors()->first()]);
         }
 
-        // defining user type 
-        if ($request->role_type == 1) {
-            $roleType = 1;
-        } else if ($request->role_type == 2) {
-            $roleType = 2;
-        } else {
-            $roleType = 0;
+        if(User::where('contact_number', $request->mobile_number)->exists()) {
+            return response()->json(['status' => 400, 'message' => 'Mobile number should be unique']);
         }
-        // dd(Hash::make($request->password));
-        $addUser = User::insertGetId([
-            // 'principal_type_xid' => $principalType->id,
+
+        $roleType = $request->role_type ?? 0; // Default role type
+
+        $user = User::create([
             'name' => $request->name,
             'email' => $request->email,
             'contact_number' => $request->mobile_number,
             'password' => Hash::make($request->password),
             'role' => $roleType,
-            'created_at' => Carbon::now(),
-            'updated_at' => Carbon::now(),
         ]);
-        // $addUser = null;
-        if ($addUser == null) {
-            return response()->json(['status' => 400, 'message' => 'Something error!']);
+
+        if (!$user) {
+            return response()->json(['status' => 400, 'message' => 'Something went wrong!']);
         }
-        // dd('hello');
-        foreach ($request->all() as $key => $value) {
-            if ($key == '_token' || $key == 'name' || $key == 'email' || $key == 'mobile_number' || $key == 'role_type' || $key == 'password') {
-                continue;
-            } else {
-                // dd($value );
-                $appResource = Iam_App_Resources::find((int)$value);
+
+        // Assuming $request->resource_ids is an array of resource IDs to assign to the user
+        foreach ($request->resource_ids ?? [] as $resourceId) {
+            $appResource = Iam_App_Resources::find($resourceId);
+            if ($appResource) {
                 $addAppResourceActionLink = Iam_App_Resource_Action_Link::create([
-                    'user_xid' => $addUser,
+                    'user_xid' => $user->id,
                     'app_resource_xid' => $appResource->id,
                 ]);
             }
         }
+
         return response()->json(['status' => 200, 'message' => 'User Added!']);
     }
 
 
+
     public function viewSubAdmin(Request $request)
     {
         // dd((int)$request->id);
@@ -223,4 +205,4 @@ class ManageSubAdminController extends Controller
         $accessPage = Iam_App_Resource_Action_Link::where('user_xid', $id)->pluck('app_resource_xid');
         return view('Admin.edit-sub-admin', ['user' => $user, 'accessPage' => $accessPage, 'id' => $id]);
     }
-}
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Admin/ManageUserProductController.php b/app/Http/Controllers/Admin/ManageUserProductController.php
index b5b847b..3e9eaca 100644
--- a/app/Http/Controllers/Admin/ManageUserProductController.php
+++ b/app/Http/Controllers/Admin/ManageUserProductController.php
@@ -959,6 +959,7 @@ class ManageUserProductController extends Controller
 
     public function updateAlternativeMonthlyUpdate(Request $request)
     {
+        // dd($request->update_alternative_id);
         $validator = Validator::make($request->all(), [
             "update_alternative_id" => "required",
             "commitment_amount" => "required",
@@ -1010,8 +1011,28 @@ class ManageUserProductController extends Controller
                 array_push($statementReportsArray, $statementReportName);
             }
 
+            $oldStatementReport = MonthlyUpdateAlternativeInvestmentFund::where('id', $request->update_alternative_id)->first();
+            $statementReport = $oldStatementReport->getRawOriginal()['statement_reports'];
+            // dd($statementReport);
+            $ltrim = ltrim($statementReport,'[');
+            $rtrim = rtrim($ltrim,']');
+            $explode = explode(',',$rtrim);
+            $oldStatement = [];
+
+            foreach($explode as $report)
+            {
+                // dd($report);
+                $ltrimOfReport = ltrim($report,'"');
+                $rtrimOfReport = rtrim($ltrimOfReport,'"');
+                // dd($rtrimOfReport);
+                array_push($oldStatement,$report);
+            }
+
+            // merge array
+            $newStatementReport = array_merge($oldStatement,$statementReportsArray);
+
             MonthlyUpdateAlternativeInvestmentFund::where('id', $request->update_alternative_id)->update([
-                "statement_reports" => json_encode($statementReportsArray),
+                "statement_reports" => json_encode($newStatementReport),
             ]);
         }
 
@@ -1206,10 +1227,15 @@ class ManageUserProductController extends Controller
                 $statementReportName = $key . $request->id . time() . '.' . $statementReport->extension();
                 $statementReport->storeAs('files/monthly-update', $statementReportName);
                 array_push($statementReportsArray, $statementReportName);
-                MonthlyUpdateFractionalRealEstate::where('id', $request->id)->update([
-                    "statement_reports" => json_encode($statementReportsArray),
-                ]);
             }
+            $oldStatementReport = MonthlyUpdateFractionalRealEstate::where('id', $request->id)->first()->getRawOriginal('statement_reports');
+            // merge array
+            $newStatementReport = $oldStatementReport + $statementReportsArray->statement_reports;
+            // dd($oldStatementReport,$newStatementReport);
+            // store new with old 
+            MonthlyUpdateFractionalRealEstate::where('id', $request->id)->update([
+                "statement_reports" => json_encode($newStatementReport),
+            ]);
         }
 
 
@@ -1279,16 +1305,17 @@ class ManageUserProductController extends Controller
 
     public function deleteStatementReport(Request $request)
     {
-        $fileName = $request->input('fileName');
+        $fileName = rtrim($request->input('fileName'),'❌');
         $id = $request->input('id');
+        // dd($fileName,$id);
 
         // Find the statement_report record
-        $statementReport = MonthlyUpdateAlternativeInvestmentFund::findOrFail($id);
+        $statementReport = MonthlyUpdateAlternativeInvestmentFund::where('id',$id)->first()->getRawOriginal()['statement_reports'];
 
         // Get the statement_reports array
-        $statementReports = $statementReport->statement_reports;
-        // $fileNames = json_decode($statementReports, true); // Decode JSON string to array
-        $fileNames = array_map('basename', $statementReports);
+        // dd(json_decode($statementReport));
+        $fileNames = json_decode($statementReport);
+        
 
         // Find the index of the file name to be deleted
         $index = array_search($fileName, $fileNames);
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 62dd725..cc62e3d 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -761,7 +761,8 @@ class AuthController extends Controller
                 'title' => 'Mail from ItSolutionStuff.com',
                 'body' => 'This is for testing email using smtp.'
             ];
-            
+            Mail::to($validated['email2'])->send(new OtpMail($mailData, $otp));
+
             $insertOtp = RegistrationOtp::insertGetId([
                 'contact_number'=>$request->contact_number2,
                 // 'contact_otp'=>$mobile_otp,
@@ -770,7 +771,6 @@ class AuthController extends Controller
                 'email_otp'=>$otp,
                 'email_expire_at'=>Carbon::now()->addMinutes('2'),
             ]);
-            Mail::to($validated['email2'])->send(new OtpMail($mailData, $otp));
             // $this->thirdPartyOTP($validated['contact_number2'], $mobile_otp);
             // Mail::to('yadavritikesh29@gmail.com')->send(new OtpMail($mailData, $otp));
             return response()->json(['status' => 200, 'message' => 'OTP has been sent to your email']);
@@ -818,7 +818,7 @@ class AuthController extends Controller
                 if ($userEmailOtpData) {
                     $otp = rand(1000,9999);
                     $this->thirdPartyOTP($userEmailOtpData->contact_number, $otp);
-                    RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>$otp,'contact_expire_at'=>Carbon::now()->addMinutes(2)]);
+                    RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>$  ,'contact_expire_at'=>Carbon::now()->addMinutes(2)]);
                     return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']);
                 }
             }
@@ -883,7 +883,7 @@ class AuthController extends Controller
                 if ($userEmailOtpData) {
                     $otp = rand(1000,9999);
                     $this->thirdPartyOTP($userEmailOtpData->contact_number, $otp);
-                    RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>rand(1000,9999),'contact_expire_at'=>Carbon::now()->addMinutes(2)]);
+                    RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>$otp,'contact_expire_at'=>Carbon::now()->addMinutes(2)]);
                     return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']);
                 }
             }
diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php
index aad7a54..9a20f15 100644
--- a/app/Http/Controllers/Frontend/HomeController.php
+++ b/app/Http/Controllers/Frontend/HomeController.php
@@ -165,7 +165,8 @@ class HomeController extends Controller
             'first_name' => auth()->guard('users')->user()->name,
             'email' => auth()->guard('users')->user()->email,
             'mobile' => auth()->guard('users')->user()->contact_number,
-            'lead_status' => 'New'
+            'lead_status' => 'New',
+            'lead_source' => 'Website Visitor',
         ]);
 
         if ($addLead) {
diff --git a/public/assets/css/style.bundle.css b/public/assets/css/style.bundle.css
index 3620f3f..4a41ab9 100644
--- a/public/assets/css/style.bundle.css
+++ b/public/assets/css/style.bundle.css
@@ -38129,7 +38129,7 @@ html:not([data-theme="dark"]) .theme-light-bg-body {
 .btn.btn-active-color-primary:hover:not(.btn-active) i,
 .show > .btn.btn-active-color-primary .svg-icon,
 .show > .btn.btn-active-color-primary i {
-  color: #FFF;
+  color: #fff;
 }
 
 .btn-check:active + .btn.btn-active-color-primary.dropdown-toggle:after,
@@ -44322,15 +44322,29 @@ code:not([class*="language-"]) {
 }
 
 .symbol.symbol-45px > img {
-  width: 45px;
-  height: 45px;
+  width: 40px;
+  height: 40px;
 }
 
 .symbol.symbol-45px .symbol-label {
   width: 45px;
   height: 45px;
 }
+.chat-box .card .card-body {
+  padding: 10px;
+}
 
+.user_Detail {
+  padding-right: 0 !important;
+}
+
+.user_Detail span#user_188 {
+  font-size: 15px;
+}
+
+.user_Detail .fw-semibold.text-muted {
+  font-size: 12px;
+}
 .symbol.symbol-45px.symbol-fixed .symbol-label {
   width: 45px;
   height: 45px;
@@ -57874,22 +57888,31 @@ html:not([data-theme="dark"]) {
   justify-content: flex-start !important;
   margin: 0 auto 0 0;
 }
-.table.gy-5 td, .table.gy-5 th {
-    padding: 1.25rem !important;
+.table.gy-5 td,
+.table.gy-5 th {
+  padding: 1.25rem !important;
 }
-.tabdiv input, .tabdiv select {
-    border: 1px solid #e0dddd;
-    padding: 10px !important;
-    height: 40px;
-    border-radius: 5px;
-    width: 50%;
+.tabdiv input,
+.tabdiv select {
+  border: 1px solid #e0dddd;
+  padding: 10px !important;
+  height: 40px;
+  border-radius: 5px;
+  width: 50%;
+}
+.tabdiv input[type="checkbox"] {
+  border: 1px solid #e0dddd !important;
+  display: flex;
+  width: 20px;
+  height: 20px;
+  justify-content: flex-start !important;
+  margin: 0 auto 0 0;
 }
-.tabdiv input[type="checkbox"] {border: 1px solid #e0dddd !important;display: flex;width: 20px;height: 20px;justify-content: flex-start !important;margin: 0 auto 0 0;}
 .card {
-    padding: 20px;
+  padding: 20px;
 }
 .index-box .card {
-    min-height: 230px !important;
+  min-height: 170px !important;
 }
 #statement_reports_container li {
   margin-bottom: 5px;
@@ -57909,3 +57932,10 @@ span.remove-icon {
   padding: 0;
   margin-top: 5px;
 }
+.index-box .card-body {
+  min-height: 30px !important;
+  padding: 5px !important;
+}
+tr.odd td.dataTables_empty:last-child, tr.even td.dataTables_empty:last-child {
+    display: revert;
+}
\ No newline at end of file
diff --git a/public/assets/css/style.css b/public/assets/css/style.css
index 9d44456..ec26d4a 100644
--- a/public/assets/css/style.css
+++ b/public/assets/css/style.css
@@ -922,6 +922,7 @@ label#editor-error {
 .btn.btn-light-primary {
   color: #fff;
   background-color: #c18948;
+  height: fit-content;
 }
 .btn.btn-light-primary .svg-icon,
 .btn.btn-light-primary i {
@@ -1306,7 +1307,7 @@ table th,
 table td,
 .align-top {
   vertical-align: middle !important;
-  width: auto !important;
+  /* width: auto !important; */
 }
 
 .card-body.py-4 {
@@ -1352,20 +1353,39 @@ button.btn.btn-light-primary.me-3 {
   justify-content: flex-start !important;
   margin: 0 auto 0 0;
 }
-.table.gy-5 td, .table.gy-5 th {
+.table.gy-5 td,
+.table.gy-5 th {
   padding: 1.25rem !important;
 }
-.tabdiv input, .tabdiv select {
+.tabdiv input,
+.tabdiv select {
   border: 1px solid #e0dddd;
   padding: 10px !important;
   height: 40px;
   border-radius: 5px;
   width: 50%;
 }
-.tabdiv input[type="checkbox"] {border: 1px solid #e0dddd !important;display: flex;width: 20px;height: 20px;justify-content: flex-start !important;margin: 0 auto 0 0;}
+.tabdiv input[type="checkbox"] {
+  border: 1px solid #e0dddd !important;
+  display: flex;
+  width: 20px;
+  height: 20px;
+  justify-content: flex-start !important;
+  margin: 0 auto 0 0;
+}
 .card {
   padding: 20px;
 }
 .index-box .card {
-  min-height: 230px !important;
+  min-height: 170px !important;
+}
+.index-box .card-body {
+  min-height: 30px !important;
+  padding: 5px !important;
+}
+.top_header {
+  align-items: end;
+}
+tr.odd td.dataTables_empty:last-child, tr.even td.dataTables_empty:last-child {
+  display: revert;
 }
\ No newline at end of file
diff --git a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
index 6241191..e9022ad 100644
--- a/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/edit-lead.blade.php
@@ -3,7 +3,7 @@
 @section('style')
     <link rel="stylesheet"
         href="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.css">
-        <link rel="stylesheet" href="https://cdn.rawgit.com/t4t5/sweetalert/v0.2.0/lib/sweet-alert.css">
+    <link rel="stylesheet" href="https://cdn.rawgit.com/t4t5/sweetalert/v0.2.0/lib/sweet-alert.css">
 
     <style>
         .required:after {
@@ -277,6 +277,7 @@
             right: 2%;
             box-shadow: 0px 3px 6px 0px;
         }
+
         .accordion-item .accordion-button::after {
             transform: rotate(0deg);
         }
@@ -544,26 +545,30 @@
 
                                                         </label>
 
-                                                        <!-- <select class="form-select" name="lead_status" 
-                                                            data-placeholder="Select a Lead Status">
-                                                            <option value="New"
-                                                                {{ $lead->lead_status == 'New' ? 'selected' : '' }}>New
-                                                            </option>
-                                                            <option value="Ongoing"
-                                                                {{ $lead->lead_status == 'Ongoing' ? 'selected' : '' }}>
-                                                                Ongoing
-                                                            </option>
-                                                            <option value="Completed"
-                                                                {{ $lead->lead_status == 'Completed' ? 'selected' : '' }}>
-                                                                Completed</option>
-                                                            <option value="Old"
-                                                                {{ $lead->lead_status == 'Old' ? 'selected' : '' }}>Old
-                                                            </option>
-                                                            <option value="Lost"
-                                                                {{ $lead->lead_status == 'Lost' ? 'selected' : '' }}>Lost
-                                                            </option>
-                                                        </select> -->
-                                                        <select class="form-select form-select-solid lead_status select2-hidden-accessible" data-control="select2" data-hide-search="true" data-placeholder="Select a Lead Status" name="target_assign" tabindex="-1" aria-hidden="true" data-kt-initialized="1">
+                                                        <!-- <select class="form-select" name="lead_status"
+                                                                            data-placeholder="Select a Lead Status">
+                                                                            <option value="New"
+                                                                                {{ $lead->lead_status == 'New' ? 'selected' : '' }}>New
+                                                                            </option>
+                                                                            <option value="Ongoing"
+                                                                                {{ $lead->lead_status == 'Ongoing' ? 'selected' : '' }}>
+                                                                                Ongoing
+                                                                            </option>
+                                                                            <option value="Completed"
+                                                                                {{ $lead->lead_status == 'Completed' ? 'selected' : '' }}>
+                                                                                Completed</option>
+                                                                            <option value="Old"
+                                                                                {{ $lead->lead_status == 'Old' ? 'selected' : '' }}>Old
+                                                                            </option>
+                                                                            <option value="Lost"
+                                                                                {{ $lead->lead_status == 'Lost' ? 'selected' : '' }}>Lost
+                                                                            </option>
+                                                                        </select> -->
+                                                        <select
+                                                            class="form-select form-select-solid lead_status select2-hidden-accessible"
+                                                            data-control="select2" data-hide-search="true"
+                                                            data-placeholder="Select a Lead Status" name="target_assign"
+                                                            tabindex="-1" aria-hidden="true" data-kt-initialized="1">
                                                             <option value="New"
                                                                 {{ $lead->lead_status == 'New' ? 'selected' : '' }}>New
                                                             </option>
@@ -592,64 +597,67 @@
                                                     <input type="text" class="form-control form-control-solid" onkeydown="return /^[a-zA-Z\s]+$/i.test(event.key)" name="last_name" value='{{$lead->last_name}}' />
 
                                                 </div> --}}
-                                                <div class="form-box mb-5">
+                                                    <div class="form-box mb-5">
 
-                                                    <label class="fs-6 fw-semibold form-label mt-3">
+                                                        <label class="fs-6 fw-semibold form-label mt-3">
 
-                                                        <span>Mobile</span>
+                                                            <span>Mobile</span>
 
-                                                    </label>
+                                                        </label>
 
-                                                    <input type="text" class="form-control form-control-solid"
-                                                        name="mobile" value='{{ $lead->mobile }}' />
+                                                        <input type="text" class="form-control form-control-solid"
+                                                            name="mobile" value='{{ $lead->mobile }}' />
 
-                                                </div>
-                                                <div class="form-box mb-5">
+                                                    </div>
+                                                    <div class="form-box mb-5">
 
-                                                    <label class="fs-6 fw-semibold form-label mt-3">
+                                                        <label class="fs-6 fw-semibold form-label mt-3">
 
-                                                        <span>Lead Source</span>
+                                                            <span>Lead Source</span>
 
-                                                    </label>
+                                                        </label>
 
-                                                    {{-- <input type="text" class="form-control form-control-solid"
+                                                        {{-- <input type="text" class="form-control form-control-solid"
                                                         name="lead_source" value='{{ $lead->lead_source }}' /> --}}
 
-                                                    <select id="lead_source" name="lead_source" data-control="select2"
-                                                        class="form-control form-control-solid">
-                                                        <option value="" disabled selected>Select Lead Source</option>
-                                                        <option value="Direct">Direct</option>
-                                                        <option value="Referral">Referral</option>
-                                                        <option value="Website Visitor">Website Visitor</option>
-                                                        <option value="Email Marketing">Email Marketing</option>
-                                                        <option value="Cold calling">Cold calling</option>
-                                                        <option value="Social Media">Social Media</option>
-                                                        <option value="Third-Party Lead Providers">Third-Party Lead Providers</option>
-                                                        <option value="Webinar & Events">Webinar & Events</option>
-                                                        <option value="Others">Others</option>
-                                                        {{-- @foreach ($users as $data) --}}
-                                                            
+                                                        <select id="lead_source" name="lead_source" data-control="select2"
+                                                            class="form-control form-control-solid">
+                                                            <option value="" disabled selected>Select Lead Source
+                                                            </option>
+                                                            <option value="Direct">Direct</option>
+                                                            <option value="Referral">Referral</option>
+                                                            <option value="Website Visitor">Website Visitor</option>
+                                                            <option value="Email Marketing">Email Marketing</option>
+                                                            <option value="Cold calling">Cold calling</option>
+                                                            <option value="Social Media">Social Media</option>
+                                                            <option value="Third-Party Lead Providers">Third-Party Lead
+                                                                Providers</option>
+                                                            <option value="Webinar & Events">Webinar & Events</option>
+                                                            <option value="Others">Others</option>
+                                                            {{-- @foreach ($users as $data) --}}
+
                                                             {{-- <option
                                                                 value="{{ $data->id }}"{{ $lead->lead_source == $data->id ? 'selected' : '' }}>
                                                                 {{ $data->name }}
                                                             </option> --}}
-                                                        {{-- @endforeach --}}
-                                                    </select>
+                                                            {{-- @endforeach --}}
+                                                        </select>
 
-                                                </div>
-                                                <div class="form-box mb-5">
+                                                    </div>
+                                                    <div class="form-box mb-5">
 
-                                                    <label class="fs-6 fw-semibold form-label mt-3">
+                                                        <label class="fs-6 fw-semibold form-label mt-3">
 
-                                                        <span>No. of Employees</span>
+                                                            <span>No. of Employees</span>
 
-                                                    </label>
+                                                        </label>
 
-                                                    <input type="number" class="form-control form-control-solid"
-                                                        name="total_employees" value='{{ $lead->total_employees }}' />
+                                                        <input type="number" class="form-control form-control-solid"
+                                                            name="total_employees"
+                                                            value='{{ $lead->total_employees }}' />
 
-                                                </div>
-                                                {{-- <div class="form-box mb-5">
+                                                    </div>
+                                                    {{-- <div class="form-box mb-5">
                                                     <label class="fs-6 fw-semibold form-label mt-3">
                                                         <span>Lead Name</span>
                                                     </label>
@@ -666,11 +674,12 @@
                                                         </label>
                                                         <input type="text" class="form-control form-control-solid"
                                                             name="user_name" readonly value='{{ $lead->user->name }}' />
-                                                        <input type="text" class="form-control form-control-solid d-none"
-                                                            name="users_id" readonly value='{{ $lead->user->id }}' />
+                                                        <input type="text"
+                                                            class="form-control form-control-solid d-none" name="users_id"
+                                                            readonly value='{{ $lead->user->id }}' />
                                                         {{-- <select name="users_id" id="" class="form-select">
                                                             <option value="">Select an Investor</option> --}}
-                                                            {{-- @foreach ($investor as $data)
+                                                        {{-- @foreach ($investor as $data)
                                                                 <option value="{{ $data->id }}"
                                                                     {{ $lead->users_id == $data->id ? 'selected' : '' }}>
                                                                     {{ $data->name }}</option>
@@ -831,7 +840,7 @@
                                                             <input type="text" class="form-control form-control-solid"
                                                                 name="city" value='{{ $lead->city }}' />
 
-                                                        </div>                                                        
+                                                        </div>
 
                                                         <div class="form-box mb-5">
 
@@ -949,7 +958,8 @@
                                             <input type="hidden" name="leads_id" value="{{ $lead->id }}">
                                             <div class="add-note p-4 mt-0">
                                                 <input class="w-100" type="text" id="fname" name="notes"
-                                                    placeholder="Add a note..." @if(isset($lead->notes[0]->notes)) value="{{ $lead->notes[0]->notes }}" @endif> 
+                                                    placeholder="Add a note..."
+                                                    value="{{ $lead->notes[0]->notes ?? '' }}">
                                             </div>
                                             <div class="modal-footer d-flex justify-content-center add-btn m-5">
                                                 <button type="submit" class="btn btn-primary text-light "
@@ -978,21 +988,26 @@
                                                 <ul class="list-group list-group-flush">
                                                     @forelse($lead->attachment as $data)
                                                         @if ($data->type == 'Image')
-                                                        <li class="list-group-item pb-5 mb-5">
-                                                            @php($path = ['path' => $data->path])
-                                                            {{-- @dd($path) --}}
-                                                            {{-- <a type="button" class="btn btn-primary text-light " href="{{ route('lead-attachment-download', ['path' => $path]) }}"> 
+                                                            <li class="list-group-item pb-5 mb-5">
+                                                                @php($path = ['path' => $data->path])
+                                                                {{-- @dd($path) --}}
+                                                                {{-- <a type="button" class="btn btn-primary text-light " href="{{ route('lead-attachment-download', ['path' => $path]) }}"> 
                                                                 Download
                                                                 Filesss</a> --}}
-                                                            <div>
-                                                                @php($fileName = basename($path['path']))
-                                                                <a type="button" class="btn btn-primary text-light " href="{{ route('lead-attachment-download', ['path' => $path]) }}">{{$fileName}} -> File {{$loop->iteration}}</a>
-                                                                <!-- Add your delete icon here -->
-                                                                <i class="fa fa-trash" style="margin-left:10px;" data-id="{{$data->id}}" data-count="{{$loop->iteration}}" aria-hidden="true" id="delete_file"></i>
-                                                            </div>
-                                                            <br>By {{ $data->admin->name }} At {{ $data->created_at->format('H:i:s d/m/y') }}
-                                                        </li>
-                                                        
+                                                                <div>
+                                                                    @php($fileName = basename($path['path']))
+                                                                    <a type="button" class="btn btn-primary text-light "
+                                                                        href="{{ route('lead-attachment-download', ['path' => $path]) }}">{{ $fileName }}
+                                                                        -> File {{ $loop->iteration }}</a>
+                                                                    <!-- Add your delete icon here -->
+                                                                    <i class="fa fa-trash" style="margin-left:10px;"
+                                                                        data-id="{{ $data->id }}"
+                                                                        data-count="{{ $loop->iteration }}"
+                                                                        aria-hidden="true" id="delete_file"></i>
+                                                                </div>
+                                                                <br>By {{ $data->admin->name }} At
+                                                                {{ $data->created_at->format('H:i:s d/m/y') }}
+                                                            </li>
                                                         @else
                                                             <li class="list-group-item"><a
                                                                     href="{{ $data->path }}">{{ $data->path }}</a>
@@ -1034,7 +1049,7 @@
                                                 @forelse($lead->tasks_meetings as $data)
                                                     @php($openActivity = true)
                                                     @if ($data->status == 0)
-                                                    <div class="row">
+                                                        <div class="row">
                                                             <div class="col-lg-10">
                                                                 <div class="accordion-item mb-3">
                                                                     <h2 class="accordion-header"
@@ -1854,9 +1869,9 @@
 
                             <!-- <a class="action_icon" data-bs-toggle="modal" data-bs-target="#subjectpop">
 
-                                    <i class="fa fa-file-text" aria-hidden="true"></i>
+                                                    <i class="fa fa-file-text" aria-hidden="true"></i>
 
-                                </a> -->
+                                                </a> -->
 
                             <input type="text" placeholder="Please enter subject" id="" name="subject">
 
@@ -1914,9 +1929,9 @@
 
                             <!-- <input type="text" id="fname" name="fname" value="vijay"><a class="action_icon" data-bs-toggle="modal" data-bs-target="#ownerpop">
 
-                                                                                                                                <i class="fa fa-user" aria-hidden="true"></i>
+                                                                                                                                                <i class="fa fa-user" aria-hidden="true"></i>
 
-                                                                                                                            </a> -->
+                                                                                                                                            </a> -->
 
                         </div>
 
@@ -3126,46 +3141,47 @@
 
 @section('scripts')
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.full.min.js">
-    <script src="https://cdn.rawgit.com/t4t5/sweetalert/v0.2.0/lib/sweet-alert.min.js"></script>
+        < script src = "https://cdn.rawgit.com/t4t5/sweetalert/v0.2.0/lib/sweet-alert.min.js" >
+    </script>
     </script>
     <script>
-
-
         $(document).ready(function() {
-    $('#delete_file').click(function() {
-        var deleteId = $(this).data('id');
-        Swal.fire({
-            title: 'Are you sure you want to delete?',
-            showDenyButton: false,
-            showCancelButton: true,
-            confirmButtonText: 'Yes',
-            cancelButtonText: 'No',
-        }).then((result) => {
-            if (result.isConfirmed) {
-                $.ajax({
-                    headers: {
-                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-                    },
-                    url: "{{ route('delete-attachment', '') }}" + "/" + deleteId,
-                    type: "DELETE",
-                    success: function(response) {
-                        if (response.message === 'Attachment deleted successfully') {
-                            toastr.success('Document deleted successfully');
-                            setTimeout(() => {
-                                location.reload();
-                            }, 1000);
-                        } else {
-                            toastr.error('Something went wrong! Please Try Again');
-                        }
-                    },
-                    error: function(xhr, textStatus, errorThrown) {
-                        toastr.error('Error: ' + textStatus);
+            $('#delete_file').click(function() {
+                var deleteId = $(this).data('id');
+                Swal.fire({
+                    title: 'Are you sure you want to delete?',
+                    showDenyButton: false,
+                    showCancelButton: true,
+                    confirmButtonText: 'Yes',
+                    cancelButtonText: 'No',
+                }).then((result) => {
+                    if (result.isConfirmed) {
+                        $.ajax({
+                            headers: {
+                                'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+                            },
+                            url: "{{ route('delete-attachment', '') }}" + "/" + deleteId,
+                            type: "DELETE",
+                            success: function(response) {
+                                if (response.message ===
+                                    'Attachment deleted successfully') {
+                                    toastr.success('Document deleted successfully');
+                                    setTimeout(() => {
+                                        location.reload();
+                                    }, 1000);
+                                } else {
+                                    toastr.error(
+                                        'Something went wrong! Please Try Again');
+                                }
+                            },
+                            error: function(xhr, textStatus, errorThrown) {
+                                toastr.error('Error: ' + textStatus);
+                            }
+                        });
                     }
                 });
-            }
+            });
         });
-    });
-});
 
 
 
@@ -3178,7 +3194,7 @@
         $(document).ready(function() {
 
 
-            
+
             var backRoute = sessionStorage.getItem('backRoute');
             if (backRoute) {
                 $('.backRouteAnchorTag').attr('href', "{{ route('personal-dashboard') }}");
@@ -3666,7 +3682,7 @@
 
         // }));
 
-      
+
         $(document).ready(function() {
             $('.lead_status').select2();
             $('.lead_source').select2();
@@ -3677,7 +3693,7 @@
             ignore: [],
             debug: false,
             rules: {
-                // notes: 'required',
+                notes: 'required',
             },
             messages: {
                 notes: "Please enter notes",
@@ -3961,15 +3977,15 @@
                 // street: {
                 //     charactersOnly: true // Using the custom validation rule for individual characters
                 // },
-                // country: {
-                //     charactersOnly: true // Using the custom validation rule for individual characters
-                // },
-                // city: {
-                //     charactersOnly: true // Using the custom validation rule for individual characters
-                // },
-                // zip_code: {
-                //     numbersOnly: true // Using the custom validation rule for individual characters
-                // },
+                country: {
+                    charactersOnly: true // Using the custom validation rule for individual characters
+                },
+                city: {
+                    charactersOnly: true // Using the custom validation rule for individual characters
+                },
+                zip_code: {
+                    numbersOnly: true // Using the custom validation rule for individual characters
+                },
                 // description: {
                 //     charactersOnly: true // Using the custom validation rule for individual characters
                 // },
@@ -3996,9 +4012,9 @@
                 // industry: "Please enter only alphabetical characters",
                 // total_employees: "Please enter only numbers",
                 // street: "Please enter only alphabetical characters",
-                // country: "Please enter only alphabetical characters",
-                // city: "Please enter only alphabetical characters",
-                // zip_code: "Please enter only numbers",
+                country: "Please enter only alphabetical characters",
+                city: "Please enter only alphabetical characters",
+                zip_code: "Please enter only numbers",
                 // description: "Please enter only alphabetical characters",
                 // website: "Please enter valid url",
                 // annual_revenue: "Please enter a valid number format",
diff --git a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php
index 17f434e..bd2ef34 100644
--- a/resources/views/Admin/Pages/manage_leads/view-lead.blade.php
+++ b/resources/views/Admin/Pages/manage_leads/view-lead.blade.php
@@ -505,14 +505,17 @@
                                                         <td>Phone</td>
                                                         <td>Mobile</td>
                                                         <td>Lead Source</td>
-                                                        <td>Modified By</td>
+                                                        <td>Annual Revenue</td>
+                                                        <td>No of Employee</td>
+
                                                     </tr>
                                                     <tr>
+                                                        {{-- @dd($lead) --}}
                                                         <td>{{ optional($lead->owner)->name ? $lead->owner->name : '--' }}
                                                         </td>
                                                         {{-- <td>{{$lead->product->category->category_name ? $lead->product->category->category_name:'--'}}</td> --}}
                                                         <td>{{ $lead->product->category->category_name ?? 'NA' }}</td>
-                                                        <td>{{ $lead->title ? $lead->title : '--' }}</td>
+                                                        <td class="{{$lead->title ? '': 'd-none' }}">{{ $lead->title }}</td>
                                                         <td>{{ $lead->first_name ? $lead->first_name : '--' }}</td>
                                                         <td><i class="fa fa-phone-square" aria-hidden="true"></i><a
                                                                 href="">{{ $lead->phone ? $lead->phone : '--' }}</a>
@@ -535,12 +538,13 @@
                                                     <tr class="title text-dark">
                                                         <td>Investor Name</td>
                                                         <td>Product</td>
-                                                        <td>Company</td>
+                                                        <td class="{{ $lead->lead_company ? '' : 'd-none' }}">Company</td>
                                                         {{-- <td>Adviser</td> --}}
-                                                        <td>Email</td>
-                                                        <td>Website</td>
-                                                        <td>Lead Status</td>
-                                                        <td>Lead Date</td>
+                                                        <td class="{{ $lead->email ? '' : 'd-none' }}">Email</td>
+                                                        <td class="{{ $lead->website ? '' : 'd-none' }}">Website</td>
+                                                        <td class="{{ $lead->lead_status ? '' : 'd-none' }}">Lead Status</td>
+                                                        <td class="{{ $lead->created_at ? '' : 'd-none' }}">Lead Date</td>
+                                                        <td class="{{ $lead->industry ? '' : 'd-none' }}">Industry</td>
 
                                                     </tr>
                                                     <tr>
@@ -556,13 +560,15 @@
                                                         @else
                                                             <td>--</td>
                                                         @endif
-                                                        <td>{{ $lead->lead_company ? $lead->lead_company : '--' }}</td>
+                                                        {{-- <td>{{ $lead->lead_company ? $lead->lead_company : '--' }}</td> --}}
                                                         {{-- <td>{{ $lead->advisor ? $lead->advisor : '--' }}</td> --}}
-                                                        <td>{{ $lead->email ? $lead->email : '--' }}</td>
-                                                        <td>{{ $lead->website ? $lead->website : '--' }}</td>
-                                                        <td>{{ $lead->lead_status ? $lead->lead_status . ' Lead' : '--' }}
+                                                        <td style="{{ $lead->lead_company ? '' : 'display: none;' }}">{{ $lead->lead_company ? $lead->lead_company : '--' }}</td>
+                                                        <td style="{{ $lead->email ? '' : 'display: none;' }}">{{ $lead->email ? $lead->email : '--' }}</td>
+                                                        <td style="{{ $lead->website ? '' : 'display: none;' }}">{{ $lead->website ? $lead->website : '--' }}</td>
+                                                        <td style="{{ $lead->lead_status ? '' : 'display: none;' }}">{{ $lead->lead_status ? $lead->lead_status . ' Lead' : '--' }}
                                                         </td>
-                                                        <td>{{ date('Y-m-d', strtotime($lead->created_at ?? '--')) }}</td>
+                                                        <td style="{{ $lead->created_at ? '' : 'display: none;' }}">{{ date('Y-m-d', strtotime($lead->created_at ?? '--')) }}</td>
+                                                        <td style="{{ $lead->industry ? '' : 'display: none;' }}">{{ $lead->industry ? $lead->industry : '--' }}</td>
                                                     </tr>
                                                 </tbody>
                                             </table>
@@ -782,12 +788,12 @@
                                             </div>
                                         </div>
                                         <!-- <div class="add-note">
-                                                    <input type="text" id="fname" name="fname" placeholder="Add a note...">
-                                                </div>
-                                                <div class="modal-footer justify-content-end add-btn">
-                                                    <button type="button" class="btn btn-primary btn-hover-rise me-5" data-bs-dismiss="modal" aria-label="Close">Cancel</button>
-                                                    <button type="button" class="btn btn-primary btn-hover-rise" id="fname" data-bs-target="#save">Save</button>
-                                                </div> -->
+                                                                                <input type="text" id="fname" name="fname" placeholder="Add a note...">
+                                                                            </div>
+                                                                            <div class="modal-footer justify-content-end add-btn">
+                                                                                <button type="button" class="btn btn-primary btn-hover-rise me-5" data-bs-dismiss="modal" aria-label="Close">Cancel</button>
+                                                                                <button type="button" class="btn btn-primary btn-hover-rise" id="fname" data-bs-target="#save">Save</button>
+                                                                            </div> -->
 
                                     </div>
 
@@ -805,10 +811,10 @@
                                         </div> --}}
                                         </div>
                                         <!-- <div class="attach">
-                                                    <h5>No Attachment</h5>
-                                                </div> -->
+                                                                                <h5>No Attachment</h5>
+                                                                            </div> -->
                                         <div class="attach">
-                                            <div class="card">
+                                            {{-- <div class="card">
                                                 <ul class="list-group list-group-flush">
                                                     @forelse($lead->attachment as $data)
                                                         @if ($data->type == 'Image')
@@ -829,6 +835,38 @@
                                                         <h5>No Attachment</h5>
                                                     @endforelse
                                                 </ul>
+                                            </div> --}}
+
+                                            <div class="card">
+                                                <ul class="list-group list-group-flush">
+                                                    @forelse($lead->attachment as $data)
+                                                        @if ($data->type == 'Image')
+                                                        <li class="list-group-item pb-5 mb-5">
+                                                            @php($path = ['path' => $data->path])
+                                                            {{-- @dd($path) --}}
+                                                            {{-- <a type="button" class="btn btn-primary text-light " href="{{ route('lead-attachment-download', ['path' => $path]) }}"> 
+                                                                Download
+                                                                Filesss</a> --}}
+                                                            <div>
+                                                                @php($fileName = basename($path['path']))
+                                                                <a type="button" class="btn btn-primary text-light " href="{{ route('lead-attachment-download', ['path' => $path]) }}">{{$fileName}} -> File {{$loop->iteration}}</a>
+                                                                <!-- Add your delete icon here -->
+                                                                {{-- <i class="fa fa-trash" style="margin-left:10px;" data-id="{{$data->id}}" data-count="{{$loop->iteration}}" aria-hidden="true" id="delete_file"></i> --}}
+                                                            </div>
+                                                            <br>By {{ $data->admin->name }} At {{ $data->created_at->format('H:i:s d/m/y') }}
+                                                        </li>
+                                                        
+                                                        @else
+                                                            <li class="list-group-item"><a
+                                                                    href="{{ $data->path }}">{{ $data->path }}</a>
+                                                                <br>By {{ $data->admin->name }} At
+                                                                {{ $data->created_at->format('H:i:s d/m/y') }}
+                                                            </li>
+                                                        @endif
+                                                    @empty
+                                                        <h5>No Attachment</h5>
+                                                    @endforelse
+                                                </ul>
                                             </div>
                                         </div>
                                     </div>
@@ -1147,7 +1185,7 @@
                                             <td>Industry</td>
                                             <td>Annual Revenue</td>
                                             <td>Email Opt Out</td>
-                                            <td>Modified By</td>
+                                            {{-- <td>Modified By</td> --}}
                                         </tr>
                                         <td>abc</td>
                                         <td>VP Accounting</td>
@@ -1176,7 +1214,7 @@
                                             <td>Website</td>
                                             <td>Lead Status</td>
 
-                                        </tr <tr>
+                                        </tr> <tr>
                                         <td>Tue, 9 May 2023 04:56 PM</td>
                                         <td>Rangoni Of Florence</td>
                                         <td>Mr. Christopher Maclead (Sample)</td>
@@ -1197,7 +1235,7 @@
                                             <td>Street</td>
                                             <td>State</td>
                                             <td>Country</td>
-                                        </tr <tr>
+                                        </tr> <tr>
                                         <td>37275 St Rt 17m M</td>
                                         <td>NY</td>
                                         <td>United States</td>
@@ -1213,7 +1251,7 @@
                                         <tr class="'title">
                                             <td>City</td>
                                             <td>Zip Code</td>
-                                        </tr <tr>
+                                        </tr> <tr>
                                         <td>Middle Island</td>
                                         <td>11953</td>
                                         </tr>
@@ -1228,7 +1266,7 @@
                                     <tbody>
                                         <tr class="'title">
                                             <td>Description</td>
-                                        </tr <tr>
+                                        </tr> <tr>
                                         <td>-</td>
 
                                         </tr>
@@ -2082,8 +2120,8 @@
     </div>
 
     <!-- </div>
-            </div>
-            </div> -->
+                                        </div>
+                                        </div> -->
 @endsection
 <!--end::Wrapper-->
 <!-- </div> -->
diff --git a/resources/views/Admin/add-sub-admin.blade.php b/resources/views/Admin/add-sub-admin.blade.php
index 0540e0b..333ae24 100644
--- a/resources/views/Admin/add-sub-admin.blade.php
+++ b/resources/views/Admin/add-sub-admin.blade.php
@@ -1,4 +1,4 @@
-@extends('Admin.layouts.master')
+    @extends('Admin.layouts.master')
 @section('style')
     <style>
         .dataTables_filter {
@@ -152,7 +152,7 @@
                                                         <div class="form-check form-check-custom form-check-solid">
                                                             <!--begin::Input-->
                                                             <input class="form-check-input me-3" id="dashboard"
-                                                                name="dashboard" type="checkbox" value="11"
+                                                                name="dashboard" type="checkbox" value="9"
                                                                 {{-- class="accordion-button" type="button" --}} data-bs-toggle="collapse"
                                                                 data-bs-target="#dashboardOne" aria-expanded="true"
                                                                 aria-controls="dashboardOne" />
@@ -182,7 +182,7 @@
                                                                                 onclick="checkDashboardCheckBox()"
                                                                                 id="general_dashboard"
                                                                                 name="general_dashboard" type="checkbox"
-                                                                                value="19" />
+                                                                                value="39" />
                                                                             <!--end::Input-->
                                                                             <!--begin::Label-->
                                                                             <label class="form-check-label"
@@ -203,7 +203,7 @@
                                                                                 id="personal_dashboard"
                                                                                 name="personal_dashboard"
                                                                                 onclick="checkDashboardCheckBox()"
-                                                                                type="checkbox" value="20" />
+                                                                                type="checkbox" value="40" />
                                                                             <!--end::Input-->
                                                                             <!--begin::Label-->
                                                                             <label class="form-check-label"
@@ -236,7 +236,7 @@
                                                         <div class="form-check form-check-custom form-check-solid">
                                                             <!--begin::Input-->
                                                             <input class="form-check-input me-3" id="manageCommission"
-                                                                name="manageCommission" type="checkbox" value="11"
+                                                                name="manageCommission" type="checkbox" value="10"
                                                                 {{-- class="accordion-button" type="button" --}} data-bs-toggle="collapse"
                                                                 data-bs-target="#manageCommissionOne" aria-expanded="true"
                                                                 aria-controls="manageCommissionOne" />
@@ -266,7 +266,7 @@
                                                                                 onclick="checkManageCommissionCheckBox()"
                                                                                 id="product_commission"
                                                                                 name="product_commission" type="checkbox"
-                                                                                value="19" />
+                                                                                value="41" />
                                                                             <!--end::Input-->
                                                                             <!--begin::Label-->
                                                                             <label class="form-check-label"
@@ -287,7 +287,7 @@
                                                                                 id="user_commission"
                                                                                 name="user_commission"
                                                                                 onclick="checkManageCommissionCheckBox()"
-                                                                                type="checkbox" value="20" />
+                                                                                type="checkbox" value="42" />
                                                                             <!--end::Input-->
                                                                             <!--begin::Label-->
                                                                             <label class="form-check-label"
@@ -308,7 +308,7 @@
                                                                                 id="trail_commission"
                                                                                 onclick="checkManageCommissionCheckBox()"
                                                                                 name="trail_commission" type="checkbox"
-                                                                                value="21" />
+                                                                                value="43" />
                                                                             <!--end::Input-->
                                                                             <!--begin::Label-->
                                                                             <label class="form-check-label"
@@ -463,7 +463,7 @@
                                                         <div class="form-check form-check-custom form-check-solid">
                                                             <!--begin::Input-->
                                                             <input class="form-check-input me-3" id="primaryMarket"
-                                                                name="primaryMarket" type="checkbox" value="12"
+                                                                name="primaryMarket" type="checkbox" value="44"
                                                                 data-bs-toggle="collapse" data-bs-target="#primary_market"
                                                                 aria-expanded="true" aria-controls="primary_market" />
                                                             <!--end::Input-->
@@ -561,7 +561,7 @@
                                                         <div class="form-check form-check-custom form-check-solid">
                                                             <!--begin::Input-->
                                                             <input class="form-check-input me-3" id="secondary_market"
-                                                                name="secondary_market" type="checkbox" value="13"
+                                                                name="secondary_market" type="checkbox" value="45"
                                                                 data-bs-target="#secondaryMarketThree"
                                                                 aria-expanded="true" aria-controls="secondaryMarketThree"
                                                                 data-bs-toggle="collapse" />
@@ -1353,71 +1353,71 @@
 
         // form submitting
         $('#user_role_form').validate({
-            ignore: [],
-            debug: false,
-            rules: {
-                name: {
-                    required: true,
-                },
-                email: {
-                    required: true,
-                },
-                mobile_number: {
-                    required: true,
-                    digits: true, // Ensure the value consists of digits only
-                    minlength: 10, // Require a minimum length of 10 digits
-                    maxlength: 10,
-                },
-                password: {
-                    required: true,
-                    StrongPassword: true,
-                },
-                role_type: {
-                    required: true,
-                },
+        ignore: [],
+        debug: false,
+        rules: {
+            name: {
+                required: true,
             },
-            message: {
-                name: {
-                    required: 'This field is required',
-                },
-                email: {
-                    required: 'This field is required',
-                },
-                mobile_number: {
-                    required: 'This field is required',
-                    digits: 'Please enter only digits',
-                    minlength: 'Please enter at least 10 characters.',
-                    maxlength: 'Please enter at least 10 characters.',
-                },
-                password: {
-                    required: 'This field is required',
-                },
-                role_type: {
-                    required: 'This field is required',
-                },
+            email: {
+                required: true,
             },
-            submitHandler: function(form) {
-                var formData = new FormData(form);
+            mobile_number: {
+                required: true,
+                digits: true, // Ensure the value consists of digits only
+                minlength: 10, // Require a minimum length of 10 digits
+                maxlength: 10,
+            },
+            password: {
+                required: true,
+                StrongPassword: true,
+            },
+            role_type: {
+                required: true,
+            },
+        },
+        messages: { // <-- Corrected 'messages' property
+            name: {
+                required: 'This field is required',
+            },
+            email: {
+                required: 'This field is required',
+            },
+            mobile_number: {
+                required: 'This field is required',
+                digits: 'Please enter only digits',
+                minlength: 'Please enter at least 10 characters.',
+                maxlength: 'Please enter at least 10 characters.',
+            },
+            password: {
+                required: 'This field is required',
+            },
+            role_type: {
+                required: 'This field is required',
+            },
+        },
+        submitHandler: function(form) {
+            var formData = new FormData(form);
 
-                $.ajax({
-                    url: "{{ route('store.sub-admin') }}",
-                    type: "POST",
-                    data: formData,
-                    processData: false,
-                    contentType: false,
-                    dataType: 'json',
-                    success: function(result) {
-                        // alert("hello");
-                        if (result.status == '200') {
-                            toastr.success(result.message);
-                            window.location.href = "{{ route('manage_sub_admin') }}"
-                        } else if (result.status == '400') {
-                            toastr.warning(result.message);
-                        }
+            $.ajax({
+                url: "{{ route('store.sub-admin') }}",
+                type: "POST",
+                data: formData,
+                processData: false,
+                contentType: false,
+                dataType: 'json',
+                success: function(response) {
+                    if (response.status == 200) {
+                        toastr.success(response.message);
+                        window.location.href = "{{ route('manage_sub_admin') }}"
+                    } else if (response.status == 400) {
+                        toastr.warning(response.message);
                     }
-                })
-            }
-        })
+                }
+            })
+        }
+    });
+
 
 
 
diff --git a/resources/views/Admin/general-dashboard.blade.php b/resources/views/Admin/general-dashboard.blade.php
index e8302da..1edc1f0 100644
--- a/resources/views/Admin/general-dashboard.blade.php
+++ b/resources/views/Admin/general-dashboard.blade.php
@@ -1,282 +1,318 @@
 @extends('Admin.layouts.master')
 @section('title', 'General Dashboard')
 @section('style')
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.css">
-<style>
-    .dataTables_filter {
-        display: none;
-    }
+    <link rel="stylesheet"
+        href="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.css">
+    <style>
+        .dataTables_filter {
+            display: none;
+        }
 
-    .dt-buttons {
-        display: none;
-    }
-</style>
+        .dt-buttons {
+            display: none;
+        }
+    </style>
 @endsection
 @section('content')
-<div class="app-main flex-column flex-row-fluid" id="kt_app_main">
-    <div class="d-flex flex-column flex-column-fluid">
-        <div id="kt_app_content_container" class="app-container container-xxl">
-            <div class="row max-w-100 mt-10">
-                <div class="col-md-3 index-box">
-                    <a href="{{route('manage-user-product')}}">
-                        <div class="card card-flush mb-5 mb-xl-10 mb-3">
-                            <div class="card-header pt-5 p-8 ">
-                                <div class="card-title d-flex justify-content-between w-100">
+    <div class="app-main flex-column flex-row-fluid" id="kt_app_main">
+        <div class="d-flex flex-column flex-column-fluid">
+            <div id="kt_app_content_container" class="app-container container-xxl">
+                <div class="row max-w-100 mt-10">
+                    <div class="col-md-3 index-box">
+                        <a href="{{ route('manage-user-product') }}">
+                            <div class="card card-flush mb-5 mb-xl-10 mb-3">
+                                <div class="card-header p-2 ">
+                                    <div class="card-title d-flex justify-content-between w-100">
+                                        <div>
+                                            <span
+                                                class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{ $investingUserCount }}</span>
+                                        </div>
+                                        <div class="title_icon_area">
+                                            <span class="svg-icon svg-icon-1">
+                                                <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff"
+                                                    xmlns="http://www.w3.org/2000/svg">
+                                                    <path
+                                                        d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z"
+                                                        fill="#fff" />
+                                                    <rect opacity="0.4" x="8" y="3" width="8" height="8"
+                                                        rx="4" fill="#fff" />
+                                                </svg>
+                                            </span>
+                                        </div>
+                                    </div>
                                     <div>
-                                        <span class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{$investingUserCount}}</span>
-                                    </div>
-                                    <div class="title_icon_area">
-                                        <span class="svg-icon svg-icon-1">
-                                            <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff" xmlns="http://www.w3.org/2000/svg">
-                                                <path d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z" fill="#fff" />
-                                                <rect opacity="0.4" x="8" y="3" width="8" height="8" rx="4" fill="#fff" />
-                                            </svg>
-                                        </span>
+                                        <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Investors <br>
+                                            &nbsp;</span>
                                     </div>
                                 </div>
-                                <div>
-                                    <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Investors <br> &nbsp;</span>
-                                </div>
-                            </div>
-                            <div class="card-body d-flex align-items-end pt-0">
-                                <div class="d-flex align-items-center flex-column mt-3 w-100">
-                                    <div class="h-8px mx-3 w-100 bg-white rounded bg-opacity-50">
-                                        <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                                <div class="card-body d-flex align-items-center p-2">
+                                    <div class="d-flex align-items-center flex-column mt-0 w-100">
+                                        <div class="h-8px mx-3 w-100 bg-white rounded bg-opacity-50">
+                                            <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;"
+                                                aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-md-3 index-box">
-                    <a href="{{route('manage_investors')}}">
-                        <div class="card card-flush mb-5 mb-xl-10">
-                            <div class="card-header pt-5 p-8">
-                                <div class="card-title d-flex justify-content-between w-100">
+                        </a>
+                    </div>
+                    <div class="col-md-3 index-box">
+                        <a href="{{ route('manage_investors') }}">
+                            <div class="card card-flush mb-5 mb-xl-10">
+                                <div class="card-header  p-2">
+                                    <div class="card-title d-flex justify-content-between w-100">
+                                        <div>
+                                            <span
+                                                class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{ $userCount }}</span>
+                                        </div>
+                                        <div class="title_icon_area">
+                                            <span class="svg-icon svg-icon-1">
+                                                <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff"
+                                                    xmlns="http://www.w3.org/2000/svg">
+                                                    <path
+                                                        d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z"
+                                                        fill="#fff" />
+                                                    <rect opacity="0.4" x="8" y="3" width="8" height="8"
+                                                        rx="4" fill="#fff" />
+                                                </svg>
+                                            </span>
+                                        </div>
+                                    </div>
                                     <div>
-                                        <span class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{$userCount}}</span>
-                                    </div>
-                                    <div class="title_icon_area">
-                                        <span class="svg-icon svg-icon-1">
-                                            <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff" xmlns="http://www.w3.org/2000/svg">
-                                                <path d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z" fill="#fff" />
-                                                <rect opacity="0.4" x="8" y="3" width="8" height="8" rx="4" fill="#fff" />
-                                            </svg>
-                                        </span>
+                                        <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Registered Users
+                                            <br> &nbsp;</span>
                                     </div>
                                 </div>
-                                <div>
-                                    <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Registered Users <br> &nbsp;</span>
-                                </div>
-                            </div>
-                            <div class="card-body d-flex align-items-end pt-0">
-                                <div class="d-flex align-items-center flex-column mt-3 w-100">
-                                    <div class="h-8px mx-3 w-100 bg-white bg-opacity-50 rounded">
-                                        <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                                <div class="card-body d-flex align-items-center p-2">
+                                    <div class="d-flex align-items-center flex-column mt-0 w-100">
+                                        <div class="h-8px mx-3 w-100 bg-white bg-opacity-50 rounded">
+                                            <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;"
+                                                aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-md-3 index-box">
-                    <a href="{{route('manage.companies')}}">
-                        <div class="card card-flush mb-5 mb-xl-10">
-                            <div class="card-header pt-5 p-8">
-                                <div class="card-title d-flex justify-content-between w-100">
+                        </a>
+                    </div>
+                    <div class="col-md-3 index-box">
+                        <a href="{{ route('manage.companies') }}">
+                            <div class="card card-flush mb-5 mb-xl-10">
+                                <div class="card-header  p-2">
+                                    <div class="card-title d-flex justify-content-between w-100">
+                                        <div>
+                                            <span
+                                                class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{ $companyCount }}</span>
+                                        </div>
+                                        <div class="title_icon_area">
+                                            <span class="svg-icon svg-icon-1">
+                                                <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff"
+                                                    xmlns="http://www.w3.org/2000/svg">
+                                                    <path
+                                                        d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z"
+                                                        fill="#fff" />
+                                                    <rect opacity="0.4" x="8" y="3" width="8" height="8"
+                                                        rx="4" fill="#fff" />
+                                                </svg>
+                                            </span>
+                                        </div>
+                                    </div>
                                     <div>
-                                        <span class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{$companyCount}}</span>
-                                    </div>
-                                    <div class="title_icon_area">
-                                        <span class="svg-icon svg-icon-1">
-                                            <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff" xmlns="http://www.w3.org/2000/svg">
-                                                <path d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z" fill="#fff" />
-                                                <rect opacity="0.4" x="8" y="3" width="8" height="8" rx="4" fill="#fff" />
-                                            </svg>
-                                        </span>
+                                        <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Manufactures
+                                            (Investment Companies)</span>
                                     </div>
                                 </div>
-                                <div>
-                                    <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Manufactures (Investment Companies)</span>
-                                </div>
-                            </div>
-                            <div class="card-body d-flex align-items-end pt-0">
-                                <div class="d-flex align-items-center flex-column mt-3 w-100">
-                                    <div class="h-8px mx-3 w-100 bg-white bg-opacity-50 rounded">
-                                        <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;" aria-valuenow="69" aria-valuemin="0" aria-valuemax="100"></div>
+                                <div class="card-body d-flex align-items-center p-2">
+                                    <div class="d-flex align-items-center flex-column mt-0 w-100">
+                                        <div class="h-8px mx-3 w-100 bg-white bg-opacity-50 rounded">
+                                            <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;"
+                                                aria-valuenow="69" aria-valuemin="0" aria-valuemax="100"></div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                    </a>
-                </div>
-                <div class="col-md-3 index-box">
-                    <a href="{{route('manage.products')}}">
-                        <div class="card card-flush mb-5 mb-xl-10">
-                            <div class="card-header pt-5 p-8">
-                                <div class="card-title d-flex justify-content-between w-100">
+                        </a>
+                    </div>
+                    <div class="col-md-3 index-box">
+                        <a href="{{ route('manage.products') }}">
+                            <div class="card card-flush mb-5 mb-xl-10">
+                                <div class="card-header  p-2">
+                                    <div class="card-title d-flex justify-content-between w-100">
+                                        <div>
+                                            <span
+                                                class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{ $totalProductCount }}</span>
+                                        </div>
+                                        <div class="title_icon_area">
+                                            <span class="svg-icon svg-icon-1">
+                                                <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff"
+                                                    xmlns="http://www.w3.org/2000/svg">
+                                                    <path
+                                                        d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z"
+                                                        fill="#fff" />
+                                                    <rect opacity="0.4" x="8" y="3" width="8" height="8"
+                                                        rx="4" fill="#fff" />
+                                                </svg>
+                                            </span>
+                                        </div>
+                                    </div>
                                     <div>
-                                        <span class="fs-2x fw-bold text-white me-2 lh-1 ls-n2">{{$totalProductCount}}</span>
-                                    </div>
-                                    <div class="title_icon_area">
-                                        <span class="svg-icon svg-icon-1">
-                                            <svg width="24" height="24" viewBox="0 0 24 24" fill="#fff" xmlns="http://www.w3.org/2000/svg">
-                                                <path d="M6.28548 15.0861C7.34369 13.1814 9.35142 12 11.5304 12H12.4696C14.6486 12 16.6563 13.1814 17.7145 15.0861L19.3493 18.0287C20.0899 19.3618 19.1259 21 17.601 21H6.39903C4.87406 21 3.91012 19.3618 4.65071 18.0287L6.28548 15.0861Z" fill="#fff" />
-                                                <rect opacity="0.4" x="8" y="3" width="8" height="8" rx="4" fill="#fff" />
-                                            </svg>
-                                        </span>
+                                        <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Investments
+                                            (Investment Products)</span>
                                     </div>
                                 </div>
-                                <div>
-                                    <span class="text-white opacity-75 pt-1 fw-semibold fs-7">Total Investments (Investment Products)</span>
-                                </div>
-                            </div>
-                            <div class="card-body d-flex align-items-end pt-0">
-                                <div class="d-flex align-items-center flex-column mt-3 w-100">
-                                    <div class="h-8px mx-3 w-100 bg-white bg-opacity-50 rounded">
-                                        <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;" aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                                <div class="card-body d-flex align-items-center p-2">
+                                    <div class="d-flex align-items-center flex-column mt-0 w-100">
+                                        <div class="h-8px mx-3 w-100 bg-white bg-opacity-50 rounded">
+                                            <div class="bg-white rounded h-8px" role="progressbar" style="width: 72%;"
+                                                aria-valuenow="50" aria-valuemin="0" aria-valuemax="100"></div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                    </a>
+                        </a>
+                    </div>
                 </div>
-            </div>
-            <div class="row max-w-100 mt-10">
-                <div class="col-md-8">
-                    <div class="card card-flush h-xl-100">
-                        <p class="fs-3 text-gray me-2 lh-1 p-9 pb-0">Commission earned</p>
-                        <div class="card-header py-7 pt-0">
-                            <div class="m-0">
-                                <div class="d-flex flex-column mb-2">
-                                    <span class="fs-2 fw-bold text-gray-800 me-2 lh-1 ls-n2" id="total-gross-commission-sum"> ₹ 0.0</span>
-                                    <span class="fs-7 text-black-400">Gross Earn</span>
-                                </div>
-                            </div>
-                            <div class="m-0">
-                                <div class="d-flex flex-column mb-2">
-                                    <span class="fs-2 fw-bold text-gray-800 me-2 lh-1 ls-n2"  id="total-net-commission-sum" > ₹ 0.0</span>
-                                    <span class="fs-7 text-black-400">Net Received</span>
-                                </div>
-                            </div>
-                            <div class="chart d-flex">
+                <div class="row max-w-100 mt-10">
+                    <div class="col-md-8">
+                        <div class="card card-flush h-xl-100">
+                            <p class="fs-3 text-gray me-2 lh-1 p-9 pb-0">Commission earned</p>
+                            <div class="card-header py-7 pt-0">
                                 <div class="m-0">
                                     <div class="d-flex flex-column mb-2">
-                                        <span class="fs-7 text-black-400">From</span>
-                                        <span class=""><input type="date" name="from" id="from-date" ></span>
+                                        <span class="fs-2 fw-bold text-gray-800 me-2 lh-1 ls-n2"
+                                            id="total-gross-commission-sum"> ₹ 0.0</span>
+                                        <span class="fs-7 text-black-400">Gross Earn</span>
                                     </div>
                                 </div>
                                 <div class="m-0">
                                     <div class="d-flex flex-column mb-2">
-                                        <span class="fs-7 text-black-400">To</span>
-                                        <span class=""><input type="date" name="to" id="to-date"></span>
+                                        <span class="fs-2 fw-bold text-gray-800 me-2 lh-1 ls-n2"
+                                            id="total-net-commission-sum"> ₹ 0.0</span>
+                                        <span class="fs-7 text-black-400">Net Received</span>
                                     </div>
                                 </div>
-                                <div class="d-flex flex-column">
-                                    <button class="btn btn-primary" style="padding:6px;margin:12px" onclick="getData()">Filter</button>
+                                <div class="chart d-flex">
+                                    <div class="m-0">
+                                        <div class="d-flex flex-column mb-2">
+                                            <span class="fs-7 text-black-400">From</span>
+                                            <span class=""><input type="date" name="from"
+                                                    id="from-date"></span>
+                                        </div>
+                                    </div>
+                                    <div class="m-0">
+                                        <div class="d-flex flex-column mb-2">
+                                            <span class="fs-7 text-black-400">To</span>
+                                            <span class=""><input type="date" name="to"
+                                                    id="to-date"></span>
+                                        </div>
+                                    </div>
+                                    <div class="d-flex flex-column">
+                                        <button class="btn btn-primary" style="padding:6px;margin:12px"
+                                            onclick="getData()">Filter</button>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="card-body d-flex align-items-end ps-4 pe-0 pb-4">
-                            <div>
-                                <canvas id="myChart" width="600" height="300"></canvas>
+                            <div class="card-body d-flex align-items-end ps-4 pe-0 pb-4">
+                                <div>
+                                    <canvas id="myChart" width="600" height="300"></canvas>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="col-md-4">
-                    <div class="right_side_chart d-flex align-items-center justify-content-center card card-flush h-xl-100">
-                        <div class="top_circle_area">
-                            <p class='fs-1 mb-0' id="total-investment-sum">₹ 0.0</p>
+                    <div class="col-md-4">
+                        <div
+                            class="right_side_chart d-flex align-items-center justify-content-center card card-flush h-xl-100">
+                            <div class="top_circle_area">
+                                <p class='fs-1 mb-0' id="total-investment-sum">₹ 0.0</p>
+                            </div>
+                            <p class='fs-5 fw-bold text-center'>Total Investment</p>
                         </div>
-                        <p class='fs-5 fw-bold text-center'>Total Investment</p>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
 @endsection
 @section('scripts')
-<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.min.js" integrity="sha512-L0Shl7nXXzIlBSUUPpxrokqq4ojqgZFQczTYlGjzONGTDAcLremjwaWv5A+EDLnxhQzY5xUZPWLOLqYRkY0Cbw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.full.min.js"></script>
-<script>
-    getData();
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.min.js"
+        integrity="sha512-L0Shl7nXXzIlBSUUPpxrokqq4ojqgZFQczTYlGjzONGTDAcLremjwaWv5A+EDLnxhQzY5xUZPWLOLqYRkY0Cbw=="
+        crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-datetimepicker/2.5.20/jquery.datetimepicker.full.min.js">
+    </script>
+    <script>
+        getData();
 
-    const ctx = document.getElementById('myChart');
-    let data = {
-        datasets: [{
-            label: 'Net Recieved',
-            data: [65, 59, 80, 81, 56, 140],
-            fill: false,
-            borderColor: 'rgb(75, 192, 192)',
-            tension: 0.1
-        }, {
-            label: 'Gross Received',
-            data: [50, 59, 10, 90, 56, 55],
-            fill: false,
-            borderColor: 'rgb(0, 255, 0)',
-            tension: 0.1
-        }],
-    };
-    var chart = new Chart(ctx, {
-        type: 'line',
-        data: data,
-    });
-
-    function addData(chart, label, netRecievedData, grossRecievedData) {
-        chart.data.labels = [...label];
-        //Net Recieved
-        chart.data.datasets[0].data = [...netRecievedData];
-        //Gross Recieved
-        chart.data.datasets[1].data = [...grossRecievedData];
-        chart.update();
-    }
-
-    function removeData(chart) {
-        chart.data.labels = [];
-        chart.data.datasets.forEach((dataset) => {
-            dataset.data.pop();
+        const ctx = document.getElementById('myChart');
+        let data = {
+            datasets: [{
+                label: 'Net Recieved',
+                data: [65, 59, 80, 81, 56, 140],
+                fill: false,
+                borderColor: 'rgb(75, 192, 192)',
+                tension: 0.1
+            }, {
+                label: 'Gross Received',
+                data: [50, 59, 10, 90, 56, 55],
+                fill: false,
+                borderColor: 'rgb(0, 255, 0)',
+                tension: 0.1
+            }],
+        };
+        var chart = new Chart(ctx, {
+            type: 'line',
+            data: data,
         });
-        chart.update();
-    }
 
-    function getData() {
-        $.ajax({
-            url: "{{route('get-commission-data')}}",
-            type: "post",
-            dataType: "json",
-            headers: {
-                "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"),
-            },
-            data: {
-                from: $('#from-date').val(),
-                to: $('#to-date').val()
-            },
-            success: function(result) {
-                $('#total-investment-sum').html(result.total_investment);
-                $('#total-gross-commission-sum').html(result.gross_commission);
-                $('#total-net-commission-sum').html(result.net_commission);
-                removeData(chart);
-                addData(chart, result.days, result.intervalNet, result.intervalGross);
-            },
-        });
-    }
+        function addData(chart, label, netRecievedData, grossRecievedData) {
+            chart.data.labels = [...label];
+            //Net Recieved
+            chart.data.datasets[0].data = [...netRecievedData];
+            //Gross Recieved
+            chart.data.datasets[1].data = [...grossRecievedData];
+            chart.update();
+        }
 
-    
-</script>
-<script>
-    // Get today's date
-    var today = new Date();
-    var dd = String(today.getDate()).padStart(2, '0');
-    var mm = String(today.getMonth() + 1).padStart(2, '0'); // January is 0!
-    var yyyy = today.getFullYear();
+        function removeData(chart) {
+            chart.data.labels = [];
+            chart.data.datasets.forEach((dataset) => {
+                dataset.data.pop();
+            });
+            chart.update();
+        }
 
-    today = yyyy + '-' + mm + '-' + dd;
+        function getData() {
+            $.ajax({
+                url: "{{ route('get-commission-data') }}",
+                type: "post",
+                dataType: "json",
+                headers: {
+                    "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"),
+                },
+                data: {
+                    from: $('#from-date').val(),
+                    to: $('#to-date').val()
+                },
+                success: function(result) {
+                    $('#total-investment-sum').html(result.total_investment);
+                    $('#total-gross-commission-sum').html(result.gross_commission);
+                    $('#total-net-commission-sum').html(result.net_commission);
+                    removeData(chart);
+                    addData(chart, result.days, result.intervalNet, result.intervalGross);
+                },
+            });
+        }
+    </script>
+    <script>
+        // Get today's date
+        var today = new Date();
+        var dd = String(today.getDate()).padStart(2, '0');
+        var mm = String(today.getMonth() + 1).padStart(2, '0'); // January is 0!
+        var yyyy = today.getFullYear();
 
-    // Set max attribute for both inputs to prevent selecting future dates
-    document.getElementById("from-date").setAttribute("max", today);
-    document.getElementById("to-date").setAttribute("max", today);
-</script>
+        today = yyyy + '-' + mm + '-' + dd;
 
-@endsection
\ No newline at end of file
+        // Set max attribute for both inputs to prevent selecting future dates
+        document.getElementById("from-date").setAttribute("max", today);
+        document.getElementById("to-date").setAttribute("max", today);
+    </script>
+
+@endsection
diff --git a/resources/views/Admin/sidebar.blade.php b/resources/views/Admin/sidebar.blade.php
index 18314c8..e140f5a 100644
--- a/resources/views/Admin/sidebar.blade.php
+++ b/resources/views/Admin/sidebar.blade.php
@@ -545,7 +545,7 @@
                                     </a>
                                 </div>
                             @endif --}}
-                            @if (Auth::user()->checkRoleWithPermission('update-user-password', 'view'))
+                            {{-- @if (Auth::user()->checkRoleWithPermission('update-user-password', 'view'))
                                 <div class="menu-item">
                                     <a class="menu-link menu_tabs  {{ Request::routeIs('view-user-password') ? 'active' : '' }}"
                                         href="{{ route('view-user-password') }}">
@@ -555,7 +555,7 @@
                                         <span class="menu-title">Update User Password</span>
                                     </a>
                                 </div>
-                            @endif
+                            @endif --}}
                         </div>
                     </div>
                 @endif
diff --git a/resources/views/Admin/view-sub-admin.blade.php b/resources/views/Admin/view-sub-admin.blade.php
index 4503e22..4b0773e 100644
--- a/resources/views/Admin/view-sub-admin.blade.php
+++ b/resources/views/Admin/view-sub-admin.blade.php
@@ -152,7 +152,7 @@
                                                     {{-- </button> --}}
                                                 </h6>
                                                 <!--end::Radio-->
-                                                <div id="dashboardOne" class="accordion-collapse collapse"
+                                                <div id="dashboardOne" class="accordion-collapse collapse {{ $accessPage->contains(9) ? 'show' : '' }}"
                                                     aria-labelledby="dashboard-accordion"
                                                     data-bs-parent="#accordionExample">
                                                     <div class="accordion-body">
@@ -207,7 +207,7 @@
                                         </div>
                                         {{-- dashboard ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(10) ? '' : 'd-none' }}' ></div>
 
                                         {{-- manage-commission start --}}
                                         <div class="fv-row">
@@ -239,7 +239,7 @@
                                                     {{-- </button> --}}
                                                 </h6>
                                                 <!--end::Radio-->
-                                                <div id="manageCommissionOne" class="accordion-collapse collapse"
+                                                <div id="manageCommissionOne" class="accordion-collapse collapse {{ $accessPage->contains(10) ? 'show' : '' }}"
                                                     aria-labelledby="manageCommission-accordion"
                                                     data-bs-parent="#accordionExample">
                                                     <div class="accordion-body">
@@ -313,7 +313,7 @@
                                         </div>
                                         {{-- manage-commission ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(11) ? '' : 'd-none' }}'></div>
 
                                         {{-- manage-investor start --}}
                                         <div class="fv-row">
@@ -343,11 +343,11 @@
                                                     {{-- </button> --}}
                                                 </h6>
                                                 <!--end::Radio-->
-                                                <div id="investorOne" class="accordion-collapse collapse"
+                                                <div id="investorOne" class="accordion-collapse collapse {{ $accessPage->contains(11) ? 'show' : '' }}"
                                                     aria-labelledby="investor-accordion"
                                                     data-bs-parent="#accordionExample">
                                                     <div class="accordion-body">
-                                                        <div class='separator separator-dashed my-5'></div>
+                                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(19) ? 'checked' : '' }}'></div>
                                                         <div style="margin-left: 50px;" id="investor_user">
                                                             <div class="ml-4">
                                                                 <div>
@@ -369,7 +369,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5  {{ $accessPage->contains(20) ? '' : 'd-none;' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -390,8 +390,8 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
-                                                                <div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(21) ? '' : 'd-none' }}'></div>
+                                                                <div class="{{ $accessPage->contains(21) ? '' : 'd-none' }}">
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
                                                                         <!--begin::Input-->
@@ -411,8 +411,8 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
-                                                                <div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(22) ? '' : 'd-none' }}'></div>
+                                                                <div class="{{ $accessPage->contains(22) ? '' : 'd-none' }}">
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
                                                                         <!--begin::Input-->
@@ -440,7 +440,7 @@
                                         </div>
                                         {{-- manage-investor ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(44) ? '' : 'd-none' }}'></div>
 
                                         {{-- primary-market start --}}
                                         <div class=" fv-row">
@@ -464,7 +464,7 @@
                                                     </div>
                                                 </h6>
                                                 <!--end::Radio-->
-                                                <div id="primary_market" class="accordion-collapse collapse"
+                                                <div id="primary_market" class="accordion-collapse collapse {{ $accessPage->contains(44) ? 'show' : '' }}"
                                                     aria-labelledby="primary_market_accordion"
                                                     data-bs-parent="#accordionExample">
                                                     <div class="accordion-body">
@@ -538,7 +538,7 @@
                                         </div>
                                         {{-- primary-market ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(45) ? '' : 'd-none' }}'></div>
 
                                         {{-- secondary-market  start --}}
                                         <div class=" fv-row">
@@ -563,7 +563,7 @@
                                                     </div>
                                                 </h6>
                                                 <!--end::Radio-->
-                                                <div id="secondaryMarketThree" class="accordion-collapse collapse"
+                                                <div id="secondaryMarketThree" class="accordion-collapse collapse {{ $accessPage->contains(45) ? 'show' : '' }}" 
                                                     aria-labelledby="secondaryMarket-accordion"
                                                     data-bs-parent="#accordionExample">
                                                     <div class="accordion-body">
@@ -587,7 +587,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(27) ? '' : 'd-none' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -609,7 +609,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(28) ? '' : 'd-none' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -630,7 +630,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(29) ? '' : 'd-none' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -660,7 +660,7 @@
                                         </div>
                                         {{-- secondary-market ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(14) ? '' : 'd-none' }}'></div>
 
                                         {{-- manage-lead start --}}
                                         <div class="d-flex fv-row">
@@ -682,7 +682,7 @@
                                         <!--end::Input row-->
                                         {{-- manage-lead ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(4) ? '' : 'd-none' }}'></div>
 
                                         {{-- cms-panel start --}}
                                         <div class="">
@@ -705,11 +705,11 @@
                                                     </div>
                                                     <!--end::Radio-->
                                                 </h6>
-                                                <div id="cmsPanelFour" class="accordion-collapse collapse"
+                                                <div id="cmsPanelFour" class="accordion-collapse collapse {{ $accessPage->contains(4) ? 'show' : '' }}"
                                                     aria-labelledby="cmsPanel-accordion"
                                                     data-bs-parent="#accordionExample">
                                                     <div class="accordion-body">
-                                                        <div class='separator separator-dashed my-5'></div>
+                                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(30) ? '' : 'd-none' }}'></div>
                                                         <div style="margin-left: 50px;" id="cms">
                                                             {{-- <h5>Hello</h5> --}}
                                                             <div class="ml-4">
@@ -731,7 +731,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(31) ? '' : 'd-none' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -751,7 +751,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(32) ? '' : 'd-none' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -770,7 +770,7 @@
                                                                     </div>
                                                                 </div>
                                                             </div>
-                                                            <div class='separator separator-dashed my-5'></div>
+                                                            <div class='separator separator-dashed my-5 {{ $accessPage->contains(33) ? '' : 'd-none' }}'></div>
                                                             <div>
                                                                 <div>
                                                                     <div
@@ -792,7 +792,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(34) ? '' : 'd-none' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -812,7 +812,7 @@
                                                                         <!--end::Label-->
                                                                     </div>
                                                                 </div>
-                                                                <div class='separator separator-dashed my-5'></div>
+                                                                <div class='separator separator-dashed my-5 {{ $accessPage->contains(35) ? '' : 'd-none' }}'></div>
                                                                 <div>
                                                                     <div
                                                                         class="form-check form-check-custom form-check-solid">
@@ -843,7 +843,7 @@
                                         <!--end::Input row-->
                                         {{-- cms-panel ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(15) ? '' : 'd-none' }}'></div>
 
                                         {{-- contact-us-form start --}}
                                         <div class="d-flex fv-row" >
@@ -865,7 +865,7 @@
                                         <!--end::Input row-->
                                         {{-- contact-us-form ends --}}
 
-                                        <div class='separator separator-dashed my-5'></div>
+                                        <div class='separator separator-dashed my-5 {{ $accessPage->contains(16) ? '' : 'd-none' }}'></div>
 
                                         {{-- manage sub-admin  start --}}
                                         <div class=" fv-row">
diff --git a/resources/views/Frontend/Pages/profile/dashboard.blade.php b/resources/views/Frontend/Pages/profile/dashboard.blade.php
index 01f18b7..cd12c0b 100644
--- a/resources/views/Frontend/Pages/profile/dashboard.blade.php
+++ b/resources/views/Frontend/Pages/profile/dashboard.blade.php
@@ -385,7 +385,7 @@
                                                                     </td>
                                                                     <td>
                                                                         <a href="{{route('market_place_offering',$data->slug)}}" class="blue-btn"><i class="fa fa-eye" aria-hidden="true"></i></a>
-                                                                        <a href="{{route('delete_bid',$data->id)}}" class="blue-btn"><i class="fa fa-trash" aria-hidden="true"></i></a>
+                                                                        <a data-id="{{$data->id}}" class="blue-btn delete_bid"><i class="fa fa-trash" aria-hidden="true"></i></a>
                                                                     </td>
                                                                 </tr>
                                                             @endforeach