diff --git a/pms_base/models/pms_property.py b/pms_base/models/pms_property.py
index 93aa1c6b0..79ebf297b 100644
--- a/pms_base/models/pms_property.py
+++ b/pms_base/models/pms_property.py
@@ -34,7 +34,9 @@ class PmsProperty(models.Model):
         "pms.property", "parent_id", string="Children Property"
     )
     company_id = fields.Many2one(string="Company", comodel_name="res.company")
-    team_id = fields.Many2one(string="Team", comodel_name="pms.team")
+    team_id = fields.Many2one(
+        "pms.team", string="Team", default=lambda self: self._default_team_id()
+    )
     room_ids = fields.One2many(
         string="Rooms",
         help="List of rooms in the property.",
@@ -85,9 +87,6 @@ class PmsProperty(models.Model):
     childs_property_count = fields.Integer(
         "Children Count", compute="_compute_childs_property"
     )
-    team_id = fields.Many2one(
-        "pms.team", string="Team", default=lambda self: self._default_team_id()
-    )
     floors_num = fields.Integer(string="Floor")
     unit_floor = fields.Integer(string="Unit Floor")
     balcony = fields.Boolean(string="Balcony", compute="_compute_balcony", store=True)
@@ -111,6 +110,9 @@ class PmsProperty(models.Model):
     qty_kitchen = fields.Integer(
         string="Qty Kitchen", compute="_compute_qty_kitchen", store=True
     )
+    qty_bedroom = fields.Integer(
+        string="Qty Bedroom", compute="_compute_qty_bedroom", store=True
+    )
 
     @api.depends("property_child_ids")
     def _compute_childs_property(self):
@@ -244,6 +246,14 @@ class PmsProperty(models.Model):
             )
             rec.qty_kitchen = len(rec.room_ids.filtered(lambda x: x.type_id == type_id))
 
+    @api.depends("room_ids")
+    def _compute_qty_bedroom(self):
+        for rec in self:
+            type_id = self.env.ref(
+                "pms_base.pms_room_type_bed", raise_if_not_found=False
+            )
+            rec.qty_bedroom = len(rec.room_ids.filtered(lambda x: x.type_id == type_id))
+
     def action_view_childs_property_list(self):
         action = self.env["ir.actions.actions"]._for_xml_id(
             "pms_base.action_pms_property"
diff --git a/pms_base/views/pms_property.xml b/pms_base/views/pms_property.xml
index 7595cc0ea..4638baf1e 100644
--- a/pms_base/views/pms_property.xml
+++ b/pms_base/views/pms_property.xml
@@ -77,7 +77,10 @@
                         <group id="main-right">
                             <field name="parent_id" domain="[('id', '!=', id)]" />
                             <field name="tz" />
-                            <field name="owner_id" domain="[('is_property', '=', False)]" />
+                            <field
+                                name="owner_id"
+                                domain="[('is_property', '=', False)]"
+                            />
                             <field
                                 name="company_id"
                                 groups="base.group_multi_company"
@@ -106,18 +109,30 @@
                                 <field name="floors_num" />
                                 <field name="unit_floor" />
                             </group>
-                            <group col="4">
-                                <field name="balcony" />
-                                <field name="laundry_room" />
-                                <field name="parking_lot" />
-                                <field name="pets" />
-                                <field name="terrace" />
-                            </group>
-                            <group col="4">
-                                <field name="qty_half_bathroom" />
-                                <field name="qty_living_room" />
-                                <field name="qty_dining_room" />
-                                <field name="qty_kitchen" />
+                            <group id="room">
+                                <group id="room-left" string="Quantities">
+                                    <field name="qty_bedroom" string="Bedroom(s)" />
+                                    <field
+                                        name="qty_half_bathroom"
+                                        string="Half Bathroom(s)"
+                                    />
+                                    <field
+                                        name="qty_living_room"
+                                        string="Living Rom(s)"
+                                    />
+                                    <field
+                                        name="qty_dining_room"
+                                        string="Dining Room(s)"
+                                    />
+                                    <field name="qty_kitchen" string="Kitchen(s)" />
+                                </group>
+                                <group id="room-right">
+                                    <field name="balcony" />
+                                    <field name="laundry_room" />
+                                    <field name="parking_lot" />
+                                    <field name="pets" />
+                                    <field name="terrace" />
+                                </group>
                             </group>
                             <field name="room_ids">
                                 <tree editable="bottom">