diff --git a/app/Http/Controllers/Admin/FaqController.php b/app/Http/Controllers/Admin/FaqController.php
index 0cb3774..67478ad 100644
--- a/app/Http/Controllers/Admin/FaqController.php
+++ b/app/Http/Controllers/Admin/FaqController.php
@@ -30,6 +30,7 @@ class FaqController extends Controller
     public function index()
     {
         $data = $this->faqServices->viewfaq();
+        // return $data;
         return view('Admin.pages.manage_cms.manage_faq.manage_faq')->with($data);
     }
     /**
diff --git a/resources/views/Admin/pages/manage_cms/manage_faq/manage_faq.blade.php b/resources/views/Admin/pages/manage_cms/manage_faq/manage_faq.blade.php
index ee70c03..e1047ff 100644
--- a/resources/views/Admin/pages/manage_cms/manage_faq/manage_faq.blade.php
+++ b/resources/views/Admin/pages/manage_cms/manage_faq/manage_faq.blade.php
@@ -35,22 +35,17 @@ $currentPage = 'manage-faq';
     }
 </style>
 
-
-
 <div class="layout-px-spacing">
     <div class="middle-content container-xxl p-0">
-        <div class="row layout-top-spacing ">
+        <div class="row layout-top-spacing">
             <div class="top-tabel">
                 <div class="row">
                     <div class="col-md-4">
                         <h6 class="card-title">Manage FAQ</h6>
                     </div>
-                    <div class="col-md-8">
-
-                    </div>
                 </div>
             </div>
-            <div class="col-xl-12 col-lg-12 col-sm-12  layout-spacing">
+            <div class="col-xl-12 col-lg-12 col-sm-12 layout-spacing">
                 <div class="widget-content widget-content-area br-8 position-btn" style="overflow: auto;">
                     <table id="zero-config" class="table dt-table-hover" style="width:100%">
                         <thead class="text-center">
@@ -64,7 +59,7 @@ $currentPage = 'manage-faq';
                                 <th class="no-content">Action</th>
                             </tr>
                         </thead>
-                        <tbody class="text-center">
+                        <tbody class="text-center" id="faq-tbody">
                             @foreach ($faq as $index => $faqs)
                             <tr>
                                 <td class="text-start">{{ $index + 1 }}</td>
@@ -86,50 +81,6 @@ $currentPage = 'manage-faq';
                                     {{ \Carbon\Carbon::parse($faqs['created_at'])->format('d/m/Y') }}
                                     @endif
                                 </td>
-
-                                <!-- <td>
-                                            <div class="dropout">
-                                                <button class="more">
-                                                    <span></span>
-                                                    <span></span>
-                                                    <span></span>
-                                                </button>
-                                                <ul>
-                                                    <li>
-                                                        <div class="switch-btn">
-                                                            <input data-id="{{ $faqs['id'] }}"
-                                                                {{ $faqs['is_active'] ? 'checked' : '' }} type="checkbox"
-                                                                class="active_newsletter" id="switch{{ $faqs['id'] }}"
-                                                                switch="bool" />
-                                                            <label for="switch{{ $faqs['id'] }}" data-on-label="Active"
-                                                                data-off-label="Expired"></label>
-                                                        </div>
-                                                    </li>
-                                                    <li>
-                                                        <a href="#" data-toggle="modal" data-target="#edit-faq-modal"
-                                                            class="edit-faq-btn" data-faq-id="{{ $faqs['id'] }}"
-                                                            data-faq-question="{{ $faqs['question'] }}"
-                                                            data-faq-answer="{{ $faqs['answers'] }}"
-                                                            data-faq-category="{{ $faqs['faq_category_id'] }}">
-                                                            <img src="{{ asset('public/assets/img/edit.svg') }}" />
-                                                            <span>Edit</span>
-                                                        </a>
-
-                                                    </li>
-                                                    <li>
-                                                        <a href="#" class="delete-faq-btn"
-                                                            data-faq-id="{{ $faqs['id'] }}"
-                                                            data-faq-question="{{ $faqs['question'] }}"
-                                                            data-faq-answer="{{ $faqs['answers'] }}"
-                                                            data-faq-category="{{ $faqs['faq_category_id'] }}">
-                                                            <img src="{{ asset('public/assets/img/delete-recycle.svg') }}" />
-                                                            <span>Delete</span>
-                                                        </a>
-                                                    </li>
-
-                                                </ul>
-                                            </div>
-                                        </td> -->
                                 <td>
                                     <div class="action-buttons">
                                         <!-- Active Switch Button -->
@@ -141,25 +92,15 @@ $currentPage = 'manage-faq';
                                         <!-- Edit Button -->
                                         <a href="#" data-toggle="modal" data-target="#edit-faq-modal" class="edit-faq-btn" data-faq-id="{{ $faqs['id'] }}" data-faq-question="{{ $faqs['question'] }}" data-faq-answer="{{ $faqs['answers'] }}" data-faq-category="{{ $faqs['faq_category_id'] }}">
                                             <img src="{{ asset('public/assets/img/edit.svg') }}" />
-                                           
                                         </a>
 
                                         <!-- Delete Button -->
-                                        <!-- <a href="#" class="delete-faq-btn" data-faq-id="{{ $faqs['id'] }}" data-faq-question="{{ $faqs['question'] }}" data-faq-answer="{{ $faqs['answers'] }}" data-faq-category="{{ $faqs['faq_category_id'] }}">
-                                            <img src="{{ asset('public/assets/img/delete-recycle.svg') }}" />
-                                            <span>Delete</span>
-                                        </a> -->
-
-
                                         <a href="#" class="delete_about" data-faq-id="{{ $faqs['id'] }}" data-toggle="modal" data-target="#delete-modal">
                                             <img src="{{ asset('public/assets/img/delete-recycle.svg') }}" />
-                                          
                                         </a>
                                         <input type="hidden" id="delete_about_id">
-
                                     </div>
                                 </td>
-
                             </tr>
                             @endforeach
                         </tbody>
@@ -169,89 +110,86 @@ $currentPage = 'manage-faq';
         </div>
     </div>
 </div>
-<div class="modal fade" id="add_faq_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-        aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered" role="document">
-            <div class="modal-content">
-                <div class="modal-body">
-                    <div class="modal-header p-0">
-                        <h5 class="modal-title">Add FAQ</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="row">
-                        <form id="store_faq">
-                            @csrf
-                            <div class="col-md-12 mb-3">
-                                <label for="add-faq-question">Question</label>
-                                <input id="add_faq_question" name="question" class="form-control" type="text">
-                            </div>
-                            <div class="col-md-12">
-                                <label for="add-faq-answer">Answer</label>
-                                <textarea id="add_faq_answer" name="answer" rows="5" cols="50" class="form-control"></textarea>
-                            </div>
-                            <div class="col-md-12">
-                                <label for="add-faq-category">Select Category</label>
-                                <select class="form-control input_class w-30 mr-2" name="faq_categ" id="add_faq_category">
-                                    <option value="">Select</option>
-                                    <option value="1">Customer</option>
-                                    <option value="2">Restaurant</option>
-                                </select>
-                            </div>
-                            <button type="submit" id="submit_faq" class="download-btn-custom mt-4 mx-auto w-25">
-                                <span>Save</span>
-                            </button>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-<div class="modal fade" id="edit-faq-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
-        aria-hidden="true">
-        <div class="modal-dialog modal-dialog-centered" role="document">
-            <div class="modal-content">
-                <div class="modal-body">
-                    <div class="modal-header p-0">
-                        <h5 class="modal-title">Edit FAQ</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="row">
-                        <form id="edit_faq">
-                            <div class="col-md-12 mb-3">
-                                @csrf
-                                <label for="">Question</label>
-                                <input class="form-control" name="question" type="text"
-                                    value="{{ $faqs['question'] }}" id="edit-question">
-                            </div>
-                            <input type="hidden" value="{{ $faqs['id'] }}">
-                            <div class="col-md-12">
-                                <label for="">Answer</label>
-                                <textarea name="answer" id="edit-answer" rows="5" cols="50" class="form-control">{{ $faqs['answers'] }}</textarea>
-                            </div>
-                            <div class="col-md-12">
-                                <label for="add-faq-category">Select Category</label>
-                                <select class="form-control w-30 mr-2 input_class" name="faq_categ" id="add_faq_category">
-                                    <option value="">Select</option>
-                                    <option value="1" {{ $faqs['faq_category_id'] == 1 ? 'selected' : '' }}>Customer
-                                    </option>
-                                    <option value="2" {{ $faqs['faq_category_id'] == 2 ? 'selected' : '' }}>
-                                        Restaurant</option>
-                                </select>
-                            </div>
 
-                            <button type="submit" id="update_faq" class="download-btn-custom mt-4 mx-auto w-25">
-                                <span>Save</span>
-                            </button>
-                        </form>
-                    </div>
+<div class="modal fade" id="add_faq_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-body">
+                <div class="modal-header p-0">
+                    <h5 class="modal-title">Add FAQ</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="row">
+                    <form id="store_faq">
+                        @csrf
+                        <div class="col-md-12 mb-3">
+                            <label for="add-faq-question">Question</label>
+                            <input id="add_faq_question" name="question" class="form-control" type="text">
+                        </div>
+                        <div class="col-md-12">
+                            <label for="add-faq-answer">Answer</label>
+                            <textarea id="add_faq_answer" name="answer" rows="5" cols="50" class="form-control"></textarea>
+                        </div>
+                        <div class="col-md-12">
+                            <label for="add-faq-category">Select Category</label>
+                            <select class="form-control input_class w-30 mr-2" name="faq_categ" id="add_faq_category">
+                                <option value="">Select</option>
+                                <option value="1">Customer</option>
+                                <option value="2">Restaurant</option>
+                            </select>
+                        </div>
+                        <button type="submit" id="submit_faq" class="download-btn-custom mt-4 mx-auto w-25">
+                            <span>Save</span>
+                        </button>
+                    </form>
                 </div>
             </div>
         </div>
     </div>
+</div>
+
+<div class="modal fade" id="edit-faq-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-body">
+                <div class="modal-header p-0">
+                    <h5 class="modal-title">Edit FAQ</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="row">
+                    <form id="edit_faq">
+                        <div class="col-md-12 mb-3">
+                            @csrf
+                            <label for="">Question</label>
+                            <input class="form-control" name="question" type="text" id="edit-question">
+                        </div>
+                        <input type="hidden" id="edit-faq-id">
+                        <div class="col-md-12">
+                            <label for="">Answer</label>
+                            <textarea name="answer" id="edit-answer" rows="5" cols="50" class="form-control"></textarea>
+                        </div>
+                        <div class="col-md-12">
+                            <label for="add-faq-category">Select Category</label>
+                            <select class="form-control w-30 mr-2 input_class" name="faq_categ" id="edit_faq_category">
+                                <option value="">Select</option>
+                                <option value="1">Customer</option>
+                                <option value="2">Restaurant</option>
+                            </select>
+                        </div>
+                        <button type="submit" id="update_faq" class="download-btn-custom mt-4 mx-auto w-25">
+                            <span>Save</span>
+                        </button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="modal fade" id="delete-modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered" role="document">
         <div class="modal-content">
@@ -262,31 +200,52 @@ $currentPage = 'manage-faq';
             </div>
             <div class="modal-body">
                 <input type="hidden" id="delete_about_id" name="about_id">
-                <!-- <p class="modal-text">Are you sure you want to<br>Delete </p> -->
-                <p class="modal-text">Are you sure you ? </p>
-                <!-- <h6>Are you sure want to delete this content</h6> -->
-                <div class="modal-btn d-flex ">
+                <p class="modal-text">Are you sure you ?</p>
+                <div class="modal-btn d-flex">
                     <a type="button" class="extra-btn" data-dismiss="modal">Cancel</a>
                     <a type="button" class="download-btn-custom delete_about_button" data-dismiss="modal">Delete</a>
                 </div>
-
             </div>
         </div>
     </div>
 </div>
 
 @endsection
+
 @section('section_script')
-
-
-
 <script src="{{ asset('public/assets/js/admin/manage_cms/manage_faq/main.js') }}"></script>
 <script src="{{ asset('public/assets/js/admin/manage_cms/manage_faq/add_faq.js') }}"></script>
 <script src="{{ asset('public/assets/js/admin/manage_cms/manage_faq/edit_faq.js') }}"></script>
 <script>
     $(document).ready(function() {
-        $(' <button><a class="extra-btn width-max-content" data-toggle="modal" data-target="#add_faq_modal" href="">Add</a></button>')
+        // Insert Add button
+        $('<button><a class="extra-btn width-max-content" data-toggle="modal" data-target="#add_faq_modal" href="">Add</a></button>')
             .insertBefore("#zero-config_filter label");
+
+        // Insert Filter dropdown
+        $('<select id="filter" class="form-control"><option value="all">All</option><option value="1">Customer</option><option value="2">Restaurant</option></select>')
+            .insertBefore("#zero-config_filter label");
+
+        // Filter FAQ
+        $('#filter').on('change', function() {
+            var filterValue = $(this).val();
+            filterFAQs(filterValue);
+        });
+
+        function filterFAQs(filterValue) {
+            if (filterValue === "all") {
+                $("#faq-tbody tr").show();
+            } else {
+                $("#faq-tbody tr").each(function() {
+                    var category = $(this).find('td:eq(3)').text().trim();
+                    if ((filterValue == 1 && category === 'Customer') || (filterValue == 2 && category === 'Restaurant')) {
+                        $(this).show();
+                    } else {
+                        $(this).hide();
+                    }
+                });
+            }
+        }
     });
 </script>
 @endsection
diff --git a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php
index 6d85d41..0ca6500 100644
--- a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php
+++ b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php
@@ -4,6 +4,34 @@
 @php
 $currentPage = 'manage-customer';
 @endphp
+<style>
+    .message {
+        background-color: #f8f9fa;
+        border-radius: 10px;
+        padding: 15px;
+        margin-bottom: 10px;
+    }
+    .reply {
+        background-color: #e2e3e5;
+        border-radius: 10px;
+        padding: 15px;
+        margin-bottom: 10px;
+        margin-left: 30px;
+    }
+    .message-label {
+        font-size: 1.1em;
+        color: #007bff;
+    }
+    .reply-label {
+        font-size: 1.1em;
+        color: #28a745;
+    }
+    .message p, .reply p {
+        margin: 0;
+        padding: 0;
+    }
+</style>
+
 <div class="layout-px-spacing">
     <div class="middle-content container-xxl p-0">
         <div class="row layout-top-spacing ">
@@ -15,107 +43,80 @@ $currentPage = 'manage-customer';
                             <h6 class="card-title p-0">View Details</h6>
                         </a>
                     </div>
-                    <!-- <div class="col-md-8 float-right">
-                            <a class="extra-btn" href="manage-customers.php">
-                                <img class="back-btn" src="../src/assets/img/left-arrow.svg">
-                                Back
-                            </a>
-                        </div> -->
                 </div>
-
-
             </div>
-            <div class="col-xl-12 col-lg-12 col-sm-12  layout-spacing">
+            <div class="col-xl-12 col-lg-12 col-sm-12 layout-spacing">
                 <div class="widget-content widget-content-area br-8 position-btn p-0">
                     <div class="view-details">
                         <div class="simple-tab">
-                            <!-- <ul class="nav nav-tabs" id="myTab" role="tablist">
-                                    <li class="nav-item" role="presentation">
-                                        <button class="nav-link active" id="home-tab" data-toggle="tab"
-                                            data-target="#home-tab-pane" type="button" role="tab"
-                                            aria-controls="home-tab-pane" aria-selected="true">Personal & Medical
-                                            details</button>
-                                    </li>
-                                    <li class="nav-item" role="presentation">
-                                        <button class="nav-link" id="profile-tab" data-toggle="tab"
-                                            data-target="#profile-tab-pane" type="button" role="tab"
-                                            aria-controls="profile-tab-pane" aria-selected="false">Medical records &
-                                            schedules</button>
-                                    </li>
-                                </ul> -->
-
                             <div class="tab-content" id="myTabContent">
                                 <div class="tab-pane fade show active" id="home-tab-pane" role="tabpanel" aria-labelledby="home-tab" tabindex="0">
                                     <div class="row">
                                         <div class="col-md-6 mb-10 tabs23">
                                             <table>
-                                                <!-- <h4 class="tab-title">Personal information</h4> -->
                                                 <tr class="title">
                                                     <td>Name :</td>
                                                     <td>User ID :</td>
                                                     <td>Date of birth :</td>
-                                                    <!-- <td class="description">Address :</td> -->
                                                     <td>Phone Number :</td>
-                                                    {{-- <td>End Date :</td> --}}
                                                 </tr>
                                                 <tr class="w-100">
                                                     <td>{{ $customers_data->first_name }} {{ $customers_data->last_name }}</td>
                                                     <td>{{ $customers_data->id }}</td>
-                                                    <td>{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('d/m/Y') }}
-                                                    </td>
+                                                    <td>{{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('d/m/Y') }}</td>
                                                     <td>{{ $customers_data->phone_number }}</td>
-                                                    {{-- <td>22/10/2023</td> --}}
                                                 </tr>
-
                                             </table>
                                             <a class="download-btn-custom mt-3" href="{{ url('/create-pdf-file', $customers_data->id) }}">
                                                 <span>Download user report</span>
                                                 <img src="{{ asset('public/assets/img/download.svg') }}" />
                                             </a>
+
                                         </div>
                                         <div class="col-md-6 mb-10">
                                             <table>
-                                                <!-- <h4 class="empty-title"></h4> -->
                                                 <tr class="title">
                                                     <td>Location :</td>
-
                                                     <td>Email ID :</td>
-                                                    <td>Contact History : </td>
                                                     <td>Onboarded date :</td>
-                                                    {{-- <td>Location :</td> --}}
-                                                    {{-- <td>Start Date :</td> --}}
                                                 </tr>
                                                 <tr class="w-100">
                                                     <td>{{ $customers_data->state->name}}</td>
-
                                                     <td>{{ $customers_data->email_address }}</td>
-                                                    @if($customers_data->contactMessages->isNotEmpty())
-                                                    @foreach($customers_data->contactMessages as $messages)
-                                                    <td>{{$messages->message}}</td>
-                                                    @endforeach
-                                                    @else
-                                                    <td>Message is not available</td>
-                                                    @endif
-
                                                     <td>{{ \Carbon\Carbon::parse($customers_data->created_at)->format('d-m-y') }}</td>
-                                                    <td>{{ $customers_data->country_xid }}</td>
-                                                    {{-- <td>03/07/2023</td> --}}
                                                 </tr>
-
                                             </table>
                                         </div>
-
+                                        <div class="col-md-12 mb-10">
+                                            <div class="card">
+                                                <div class="card-header">
+                                                  <b>  Contact History </b>
+                                                </div>
+                                                <div class="card-body">
+                                                    @if($customers_data->contactMessages->isNotEmpty())
+                                                        @foreach($customers_data->contactMessages as $message)
+                                                            <div class="message">
+                                                                <strong>Message:</strong>
+                                                                <p>{{ $message->message }}</p>
+                                                            </div>
+                                                            @if($message->reply_message)
+                                                                <div class="reply">
+                                                                    <strong>Reply:</strong>
+                                                                    <p>{{ $message->reply_message }}</p>
+                                                                </div>
+                                                            @endif
+                                                        @endforeach
+                                                    @else
+                                                        <p>No contact history available.</p>
+                                                    @endif
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-
                                 </div>
-
                             </div>
-
                         </div>
-
-
                     </div>
-
                 </div>
             </div>
         </div>
@@ -123,7 +124,6 @@ $currentPage = 'manage-customer';
 </div>
 @endsection
 
-
 @section('section_script')
 <script src="{{ asset('assets/js/admin/manage_customer/main.js') }}"></script>
 @endsection