diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py
index e4c1d5649..cbee96c30 100644
--- a/pms/models/pms_checkin_partner.py
+++ b/pms/models/pms_checkin_partner.py
@@ -160,6 +160,7 @@ class PmsCheckinPartner(models.Model):
             record.update(vals)
             if record.reservation_id.state == "confirm":
                 record.reservation_id.state = "onboard"
+        # keep the checkin reservations popup open to checkin reservation hosts
         if self._context.get("popup"):
             self.ensure_one()
             kanban_id = self.env.ref("pms.pms_checkin_partner_kanban_view").id
@@ -178,12 +179,10 @@ class PmsCheckinPartner(models.Model):
             }
 
     def action_done(self):
-        for record in self:
-            if record.state == "onboard":
-                hour = record._get_departure_hour()
-                vals = {
-                    "state": "done",
-                    "departure_hour": hour,
-                }
-                record.update(vals)
+        for record in self.filtered(lambda c: c.state == "onboard"):
+            vals = {
+                "state": "done",
+                "arrival": fields.Datetime.now(),
+            }
+            record.update(vals)
         return True
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index 70bcf692a..40c261508 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -1308,7 +1308,7 @@ class PmsReservation(models.Model):
                 "edit": True,
                 "popup": True,
             },
-            "domain": [("reservation_id", "=", self.id), ("state", "=", "precheckin")],
+            "domain": [("reservation_id", "=", self.id)],
             "target": "new",
         }
 
diff --git a/pms/views/pms_checkin_partner_views.xml b/pms/views/pms_checkin_partner_views.xml
index b9fbf1eb8..a166885ab 100644
--- a/pms/views/pms_checkin_partner_views.xml
+++ b/pms/views/pms_checkin_partner_views.xml
@@ -19,6 +19,9 @@
         <field name="model">pms.checkin.partner</field>
         <field name="arch" type="xml">
             <form create="false">
+                <header>
+                    <field name="state" widget="statusbar" />
+                </header>
                 <sheet>
                     <group name="group_top">
                         <group name="group_left">
@@ -35,7 +38,6 @@
                             <field name="reservation_id" />
                             <field name="folio_id" />
                             <field name="identifier" />
-                            <field name="state" />
                         </group>
                     </group>
                 </sheet>
@@ -161,50 +163,12 @@
                                 <div class="o_kanban_record_top">
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title">
-                                            <div
-                                                class="float-right"
-                                                t-if="record.state.raw_value == 'onboard'"
-                                                name="state"
-                                            >
-                                                <span
-                                                    class="fa fa-circle text-success"
-                                                    role="img"
-                                                    aria-label="Present"
-                                                    title="Present"
+                                            <div class="float-right">
+                                                <field
                                                     name="state"
-                                                >
-
-                                                </span>
-                                            </div>
-                                            <div
-                                                class="float-right"
-                                                t-if="record.state.raw_value == 'done'"
-                                                name="state"
-                                            >
-                                                <span
-                                                    class="fa fa-circle text-muted"
-                                                    role="img"
-                                                    aria-label="Done"
-                                                    title="Done"
-                                                    name="state"
-                                                >
-
-                                                </span>
-                                            </div>
-                                            <div
-                                                class="float-right"
-                                                t-if="record.state.raw_value == 'precheckin'"
-                                                name="state"
-                                            >
-                                                <span
-                                                    class="fa fa-circle text-warning"
-                                                    role="img"
-                                                    aria-label="Precheckin"
-                                                    title="Precheckin"
-                                                    name="state"
-                                                >
-
-                                                </span>
+                                                    widget="label_selection"
+                                                    options="{'classes': {'draft': 'default', 'precheckin': 'info', 'onboard': 'warning', 'onboard': 'success', 'done': 'secondary'}}"
+                                                />
                                             </div>
                                             <field
                                                 name="name"
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index 3a13a911d..c4e28441d 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -615,8 +615,10 @@
                     name="state"
                     decoration-success="state == 'onboard'"
                     decoration-info="state == 'confirm'"
+                    decoration-primary="state == 'no_checkout'"
                     decoration-danger="state == 'cancelled'"
-                    decoration-primary="state == 'draft'"
+                    decoration-bf="state == 'draft'"
+                    decoration-warning="state == 'no_show'"
                     widget="badge"
                     optional="show"
                 />