diff --git a/app/controllers/API/Complaints.php b/app/controllers/API/Complaints.php
index 7fae409..2785840 100644
--- a/app/controllers/API/Complaints.php
+++ b/app/controllers/API/Complaints.php
@@ -1,20 +1,32 @@
-<?php 
+<?php
 
-class Complaints{
+class Complaints
+{
     use Controller;
 
-    public function index(){
-        
+    public function index()
+    {
+
         $this->view('rental/complaints');
     }
 
-    public function cancelComplaint(string $a = '', string $b = '', string $c = ''):void {
+    public function cancelComplaint(string $a = '', string $b = '', string $c = ''): void
+    {
+
+        $complaint = new RentReturnComplaintModel;
+        $complaint->cancelComplaint($a);
+
+        $response = new JSONResponse;
+        $response->statusCode(200)->data(['complaint_id' => $a])->send();
+    }
 
-    $complaint = new RentReturnComplaintModel;
-    $complaint->cancelComplaint($a);
+    public function resolveComplaint(string $a = ''): void
+    {
 
-    $response = new JSONResponse;
-    $response->statusCode(200)->data(['complaint_id' => $a])->send();
+        $complaint = new RentComplaintModel;
+        $complaint->resolveComplaint($a);
 
+        $response = new JSONResponse;
+        $response->statusCode(200)->success(true)->data(['complaint_id' => $a])->send();
     }
-}
\ No newline at end of file
+}
diff --git a/app/models/RentComplaint.php b/app/models/RentComplaint.php
index 65a0b37..f370779 100644
--- a/app/models/RentComplaint.php
+++ b/app/models/RentComplaint.php
@@ -1,24 +1,35 @@
 <?php
-    class RentComplaintModel {
-        use Model;
-
-        protected string $table = 'rent_complaint';
-
-        protected array $allowedColumns = [
-           'rent_id',
-            'title',
-            'description',
-            'status'
-        ];
-
-        public function createComplaint($data) {
-            $data = array_filter($data, function ($key) {
-                return in_array($key, $this->allowedColumns);
-            }, ARRAY_FILTER_USE_KEY);
+class RentComplaintModel
+{
+    use Model;
+
+    protected string $table = 'rent_return_complaints';
+
+    protected array $allowedColumns = [
+        'rent_id',
+        'title',
+        'description',
+        'status'
+    ];
+
+    public function createComplaint($data)
+    {
+        $data = array_filter($data, function ($key) {
+            return in_array($key, $this->allowedColumns);
+        }, ARRAY_FILTER_USE_KEY);
+
+        $this->insert($data);
+    }
 
-            $this->insert($data);
-        }
+    public function resolveComplaint($id)
+    {
 
+        // $data = array_filter($data, function ($key) {
+        //     return in_array($key, $this->allowedColumns);
+        // }, ARRAY_FILTER_USE_KEY);
+        //$table
+        $this->update($id, ['status' => 'resolved']);
+    }
         public function getComplaints(array $data) {
             return $this->where($data);
         }
@@ -33,6 +44,10 @@ public function getComplaintsByCustomer(array $data) {
             return $this->query($q->getQuery(), $q->getData());
         }
     
-    }
 
-?>
\ No newline at end of file
+
+    public function getComplaints(array $data)
+    {
+        return $this->where($data);
+    }
+}
diff --git a/app/views/admin/complains.view.php b/app/views/admin/complains.view.php
index 91797d9..00f910d 100644
--- a/app/views/admin/complains.view.php
+++ b/app/views/admin/complains.view.php
@@ -177,7 +177,6 @@ function getComplaints(status, user = "customer") {
 
 
 
-
     $(document).on('click', '#cancel-complaint-confirm', function() {
         var complaintId = $(this).attr('data-id');
         $.ajax({
@@ -203,6 +202,37 @@ function getComplaints(status, user = "customer") {
             }
         });
     });
+
+
+
+
+
+    $(document).on('click', '#resolve-complaint', function() {
+        var complaintId = $(this).closest('.complaint').attr('data-id');
+        $('#resolve-complaint-confirm').attr('data-id', complaintId);
+        $('#resolve-complaint-modal').css('display', 'block');
+    });
+
+    $(document).on('click', '#resolve-complaint-confirm', function() {
+        var complaintId = $(this).attr('data-id');
+        $.ajax({
+            headers: {
+                'Authorization': 'Bearer ' + getCookie('jwt_auth_token')
+            },
+            url: '<?= ROOT_DIR ?>/api/complaints/resolveComplaint/' + complaintId,
+            type: 'GET',
+            success: function(response) {
+                console.log(response);
+                var id = response.data.complaint_id;
+                $('#complaint-card[data-id="' + id + '"]').remove();
+                $('#cancel-complaint-modal').css('display', 'none');
+                getComplaints('pending');
+            },
+            error: function(err) {
+                console.log(err);
+            }
+        });
+    });
 </script>
 
 
diff --git a/app/views/admin/components/complainlist.view.php b/app/views/admin/components/complainlist.view.php
index ba26a6e..788df4f 100644
--- a/app/views/admin/components/complainlist.view.php
+++ b/app/views/admin/components/complainlist.view.php
@@ -34,7 +34,7 @@
                     <?php if ($complaint->status == 'pending') {
                     ?>
                         <div class="flex-d-c">
-                            <button class="btn-text-red" id="cancel-complaint"><i class="fa fa-check" aria-hidden="true"></i> Resolve</button>
+                            <button class="btn-text-red" id="resolve-complaint"><i class="fa fa-check" aria-hidden="true"></i> Resolve</button>
 
 
                             <!-- <button class="btn-text-red" id="cancel-rented" hidden>Cancel</button> -->
@@ -105,6 +105,18 @@
     </div>
 </div>
 
+<div id="resolve-complaint-modal" class="modal">
+    <div class="modal-content">
+        <span class="close">&times;</span>
+        <h2>Resolve Complaint</h2>
+        <p>Are you sure you want to resolve this complaint?</p>
+        <div class="flex-d gap-3 mt-3">
+            <button class="btn btn-primary" id="resolve-complaint-confirm">Yes</button>
+            <button class="btn btn-danger modal-close" id="resolve-complaint-cancel">No</button>
+        </div>
+    </div>
+</div>
+
 <style>
 
 </style>
\ No newline at end of file
diff --git a/app/views/admin/customer.view.php b/app/views/admin/customer.view.php
index 3b5d9de..70a33a7 100755
--- a/app/views/admin/customer.view.php
+++ b/app/views/admin/customer.view.php
@@ -24,12 +24,12 @@
 
 
         <div class="table-container">
-            <table class="data-table">
+            <table class="data-table table-custom">
                 <thead>
                     <tr>
                         <th>Name</th>
                         <th>Number</th>
-                        <th>Address</th>
+                        <th> Address</th>
                         <th>Action</th>
                     </tr>
                 </thead>
diff --git a/app/views/admin/guides.view.php b/app/views/admin/guides.view.php
index 18703c0..68ae6ac 100755
--- a/app/views/admin/guides.view.php
+++ b/app/views/admin/guides.view.php
@@ -22,7 +22,7 @@
 
 
         <div class="table-container">
-            <table class="data-table">
+            <table class="data-table table-custom">
                 <thead>
                     <tr>
                         <th>Name</th>
diff --git a/app/views/admin/rentalServices.view.php b/app/views/admin/rentalServices.view.php
index 2761c26..87d96a0 100755
--- a/app/views/admin/rentalServices.view.php
+++ b/app/views/admin/rentalServices.view.php
@@ -22,43 +22,43 @@
 
         <div class="flex-d-r">
             <!-- <div class="flex-d-c"> -->
-
-            <table class="data-table">
-                <thead>
-                    <tr>
-                        <th>Name</th>
-                        <th>Mobile</th>
-                        <th>Status</th>
-                        <th>Action</th>
-                    </tr>
-                </thead>
-                <tbody>
-
-                    <?php
-                    // Assuming rentalServices is an array of data
-                    foreach ($rentalServices as $service) {
-                    ?>
-                        <tr key="<?php echo $service->id ?>">
-                            <td><?php echo $service->name; ?></td>
-                            <td><?php echo $service->mobile; ?></td>
-                            <td><span class="status <?php echo $service->status;  ?>"><?php echo $service->status; ?></span></td>
-                            <td><button class="btn-text-green" id="view-button"> <i class="fa fa-list"> </i> View</button></td>
+            <div class="table-container">
+                <table class="data-table table-custom">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Mobile</th>
+                            <th>Status</th>
+                            <th>Action</th>
                         </tr>
-                    <?php
-                    }
-                    ?>
-                </tbody>
+                    </thead>
+                    <tbody>
+
+                        <?php
+                        // Assuming rentalServices is an array of data
+                        foreach ($rentalServices as $service) {
+                        ?>
+                            <tr key="<?php echo $service->id ?>">
+                                <td><?php echo $service->name; ?></td>
+                                <td><?php echo $service->mobile; ?></td>
+                                <td><span class="status <?php echo $service->status;  ?>"><?php echo $service->status; ?></span></td>
+                                <td><button class="btn-text-green" id="view-button"> <i class="fa fa-list"> </i> View</button></td>
+                            </tr>
+                        <?php
+                        }
+                        ?>
+                    </tbody>
+
+                </table>
 
-            </table>
 
-
-        </div>
-        <!-- Modal  -->
-        <div class="modal" id="rental-services-modal">
-            <div class="modal-content">
-                <span class="close">&times;</span>
-                <div id="user">
-                    <!-- <div class="profile-info">
+            </div>
+            <!-- Modal  -->
+            <div class="modal" id="rental-services-modal">
+                <div class="modal-content">
+                    <span class="close">&times;</span>
+                    <div id="user">
+                        <!-- <div class="profile-info">
             <img src="<?php echo ROOT_DIR ?>/assets/images/dp.jpg" alt="Profile Image" class="profile-image">
             <h2 id="profile-name">Sandali </h2>
             <p id="profile-email">sandali@gmail.com</p>
@@ -69,68 +69,68 @@
                 <a href="#" id="link-2">Link 2</a>
             </div>
         </div> -->
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    <script>
-        // Get the modal
-        var modal = document.getElementById("rental-services-modal");
+        <script>
+            // Get the modal
+            var modal = document.getElementById("rental-services-modal");
 
-        // Get the <span> element that closes the modal
-        var span = document.getElementsByClassName("close")[0];
+            // Get the <span> element that closes the modal
+            var span = document.getElementsByClassName("close")[0];
 
-        // Get all view buttons
-        var viewButtons = document.querySelectorAll('#view-button');
+            // Get all view buttons
+            var viewButtons = document.querySelectorAll('#view-button');
 
-        // Function to handle modal display
-        function openModal(id) {
-            // document.getElementById("modal-content").innerHTML = content;
+            // Function to handle modal display
+            function openModal(id) {
+                // document.getElementById("modal-content").innerHTML = content;
 
-            modal.style.display = "block";
-            $.get(`<?php echo ROOT_DIR ?>/admin/rentalServices/viewUser/${id}`, function(data) {
-                // Update the modal content with the fetched data
-                $("#user").html(data);
-            });
-            span.onclick = function() {
-                modal.style.display = "none";
-            }
-        }
-
-        // Add click event listener to view buttons
-        viewButtons.forEach(function(button) {
-            button.addEventListener('click', function() {
-
-                var name = this.parentElement.parentElement.querySelector('td:first-child').textContent;
-                var email = this.parentElement.parentElement.querySelector('td:nth-child(2)').textContent;
-                var key = this.parentElement.parentElement.getAttribute('key');
-                var modalContent = {
-                    name: name,
-                    email: email
+                modal.style.display = "block";
+                $.get(`<?php echo ROOT_DIR ?>/admin/rentalServices/viewUser/${id}`, function(data) {
+                    // Update the modal content with the fetched data
+                    $("#user").html(data);
+                });
+                span.onclick = function() {
+                    modal.style.display = "none";
                 }
-                openModal(key);
+            }
+
+            // Add click event listener to view buttons
+            viewButtons.forEach(function(button) {
+                button.addEventListener('click', function() {
+
+                    var name = this.parentElement.parentElement.querySelector('td:first-child').textContent;
+                    var email = this.parentElement.parentElement.querySelector('td:nth-child(2)').textContent;
+                    var key = this.parentElement.parentElement.getAttribute('key');
+                    var modalContent = {
+                        name: name,
+                        email: email
+                    }
+                    openModal(key);
+                });
             });
-        });
 
-        // Close the modal when the close button is clicked
+            // Close the modal when the close button is clicked
 
 
-        // Close the modal if the user clicks outside of it
-        window.onclick = function(event) {
-            if (event.target == modal) {
-                modal.style.display = "none";
+            // Close the modal if the user clicks outside of it
+            window.onclick = function(event) {
+                if (event.target == modal) {
+                    modal.style.display = "none";
+                }
             }
-        }
-    </script>
+        </script>
 
 
 
 
-    <?php
-    require_once('../app/views/admin/layout/footer.php');
+        <?php
+        require_once('../app/views/admin/layout/footer.php');
 
 
-    ?>
+        ?>
 
-</div>
\ No newline at end of file
+    </div>
\ No newline at end of file
diff --git a/app/views/admin/tips.view.php b/app/views/admin/tips.view.php
index 33cf957..7df8a5b 100644
--- a/app/views/admin/tips.view.php
+++ b/app/views/admin/tips.view.php
@@ -10,9 +10,13 @@
     <?php require_once('../app/views/admin/layout/sidebar.php');
     ?>
 
+
+
     <div class="sidebar-flow"></div>
     <!-- Add button -->
     <!-- <div class="tips-page"> -->
+
+
     <div class="guide-dash-main">
         <h1 class="title mb-2">Tips & Knowhows</h1>
         <ul class="breadcrumbs">
@@ -24,24 +28,36 @@
 
         <div class="table-container">
             <div>
-                <button class="add-button">Add</button>
-
+                <button class="btn ml-2">Add</button>
 
+                <!-- 
+                <div class="info-data mt-5">
+                    <div class="card"> -->
+                <!-- <div class="head"> -->
 
-
-                <table class="data-table">
+                <table class="data-table table-custom my-0 px-0 mt-3">
                     <thead>
                         <tr>
-                            <th>Title</th>
-                            <th>Description</th>
-                            <th>Action</th>
+                            <th class="pl-2 pr-2">
+                                Title
+                            </th>
+                            <th class=" pl-5 pr-6">
+                                Description
+                            </th>
+                            <th class="pl-6 text-align-end pr-6">
+                                Action
+                            </th>
+
+
                         </tr>
                     </thead>
+
+
                     <tbody>
                         <?php foreach ($tips as $tip) : ?>
                             <tr>
                                 <td><?php echo $tip->title; ?></td>
-                                <td><?php echo $tip->description; ?></td>
+                                <td class="ll"><?php echo $tip->description; ?></td>
                                 <td><button key="<?php echo $tip->id; ?>" class="view-button">Update</button></td>
                             </tr>
                         <?php endforeach; ?>
diff --git a/public/assets/scss/wl/dashboard/_admin.scss b/public/assets/scss/wl/dashboard/_admin.scss
index 7291922..c3e6cac 100644
--- a/public/assets/scss/wl/dashboard/_admin.scss
+++ b/public/assets/scss/wl/dashboard/_admin.scss
@@ -78,6 +78,8 @@
                 color: $color-dark;
                 padding-top: 30px;
             }
+
+ 
             .user-progress {
             display: block;
             margin-top: 24px;
@@ -107,6 +109,7 @@
             font-size: 14px;
             font-weight: 500;
         }
+        
 
         .booking-bar{
             display: flex;
@@ -335,4 +338,46 @@
     background-position: left bottom;
     color: $info-color;
   }
-}
\ No newline at end of file
+}
+
+
+
+.tips-header{
+    display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
+	grid-gap: 20px;
+
+    display: flex;
+            justify-content: space-between;
+            align-items: flex-start;
+
+               padding: 20px;
+        border-radius: 10px;
+        background: $color-white;
+        box-shadow: $box-shadow-default;
+
+
+    // border-spacing: 1; 
+    // border-collapse: collapse; 
+    // background: $color-white;
+    // border-radius:10px;
+    // overflow:hidden;
+    // max-width:98%; 
+    // width:100%;
+    // margin:0 auto;
+    // position:relative;
+    // color: $gray-text-dark;
+    // font-family: sans-serif, 'Poppins';
+    // box-shadow: $box-shadow-default;
+      
+    position:relative;
+ padding-left:10px; 
+      height:600px;
+      background: $color-lighter;
+    //   font-size: $header4;
+	  	&.l 					{ text-align:left}
+	  	&.c 					{ text-align:center }
+	  	&.r 					{ text-align:right }
+	  
+  }
+  
diff --git a/public/assets/scss/wl/dashboard/_table.scss b/public/assets/scss/wl/dashboard/_table.scss
index ea520f5..3592e03 100644
--- a/public/assets/scss/wl/dashboard/_table.scss
+++ b/public/assets/scss/wl/dashboard/_table.scss
@@ -144,6 +144,7 @@
 	  	&.l 					{ text-align:right }
 	  	&.c 					{ text-align:center }
 	  	&.r 					{ text-align:center }
+      &.ll 					{ text-align:left }
 	  }
   }
   
diff --git a/public/assets/scss/wl/dashboard/common/_padding.scss b/public/assets/scss/wl/dashboard/common/_padding.scss
index 697f16f..0c3bf0d 100644
--- a/public/assets/scss/wl/dashboard/common/_padding.scss
+++ b/public/assets/scss/wl/dashboard/common/_padding.scss
@@ -175,6 +175,7 @@
   
   .pl-4 {
     padding-left: 1.5rem !important;
+
   }
   
   .pl-5 {