diff --git a/esphome/ha-remote/ha-remote-1.ui.yaml b/esphome/ha-remote/ha-remote-1.ui.yaml
index cc0e5de..304b974 100644
--- a/esphome/ha-remote/ha-remote-1.ui.yaml
+++ b/esphome/ha-remote/ha-remote-1.ui.yaml
@@ -118,18 +118,6 @@ lvgl:
                   y: 20
                   text_color: 0xE3E2E6
                   text: "Family Room"
-              - obj:
-                  x: 590
-                  y: 12
-                  width: 186
-                  height: 40
-                  styles: md3_chip
-                  widgets:
-                    - label:
-                        id: battery_label
-                        align: center
-                        text: " n/a"
-
         - button:
             id: btn_family_room_tv_stand
             x: 24
@@ -263,10 +251,20 @@ lvgl:
             height: 72
             styles: md3_nav_bar
             widgets:
+              - obj:
+                  x: 8
+                  y: 16
+                  width: 84
+                  height: 40
+                  styles: md3_chip
+                  widgets:
+                    - label:
+                        align: center
+                        text: " n/a"
               - button:
-                  x: 1
+                  x: 100
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -293,9 +291,9 @@ lvgl:
                         text_color: 0xE3E2E6
                         text: "Family"
               - button:
-                  x: 115
+                  x: 200
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -322,9 +320,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Living"
               - button:
-                  x: 229
+                  x: 300
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -351,9 +349,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Kitchen"
               - button:
-                  x: 343
+                  x: 400
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -380,9 +378,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Upstairs"
               - button:
-                  x: 457
+                  x: 500
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -409,9 +407,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Office"
               - button:
-                  x: 571
+                  x: 600
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -438,9 +436,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Garage"
               - button:
-                  x: 685
+                  x: 700
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -660,10 +658,20 @@ lvgl:
             height: 72
             styles: md3_nav_bar
             widgets:
+              - obj:
+                  x: 8
+                  y: 16
+                  width: 84
+                  height: 40
+                  styles: md3_chip
+                  widgets:
+                    - label:
+                        align: center
+                        text: " n/a"
               - button:
-                  x: 1
+                  x: 100
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -690,9 +698,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Family"
               - button:
-                  x: 115
+                  x: 200
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -719,9 +727,9 @@ lvgl:
                         text_color: 0xE3E2E6
                         text: "Living"
               - button:
-                  x: 229
+                  x: 300
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -748,9 +756,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Kitchen"
               - button:
-                  x: 343
+                  x: 400
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -777,9 +785,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Upstairs"
               - button:
-                  x: 457
+                  x: 500
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -806,9 +814,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Office"
               - button:
-                  x: 571
+                  x: 600
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -835,9 +843,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Garage"
               - button:
-                  x: 685
+                  x: 700
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -931,10 +939,20 @@ lvgl:
             height: 72
             styles: md3_nav_bar
             widgets:
+              - obj:
+                  x: 8
+                  y: 16
+                  width: 84
+                  height: 40
+                  styles: md3_chip
+                  widgets:
+                    - label:
+                        align: center
+                        text: " n/a"
               - button:
-                  x: 1
+                  x: 100
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -961,9 +979,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Family"
               - button:
-                  x: 115
+                  x: 200
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -990,9 +1008,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Living"
               - button:
-                  x: 229
+                  x: 300
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1019,9 +1037,9 @@ lvgl:
                         text_color: 0xE3E2E6
                         text: "Kitchen"
               - button:
-                  x: 343
+                  x: 400
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1048,9 +1066,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Upstairs"
               - button:
-                  x: 457
+                  x: 500
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1077,9 +1095,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Office"
               - button:
-                  x: 571
+                  x: 600
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1106,9 +1124,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Garage"
               - button:
-                  x: 685
+                  x: 700
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1244,10 +1262,20 @@ lvgl:
             height: 72
             styles: md3_nav_bar
             widgets:
+              - obj:
+                  x: 8
+                  y: 16
+                  width: 84
+                  height: 40
+                  styles: md3_chip
+                  widgets:
+                    - label:
+                        align: center
+                        text: " n/a"
               - button:
-                  x: 1
+                  x: 100
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1274,9 +1302,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Family"
               - button:
-                  x: 115
+                  x: 200
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1303,9 +1331,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Living"
               - button:
-                  x: 229
+                  x: 300
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1332,9 +1360,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Kitchen"
               - button:
-                  x: 343
+                  x: 400
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1361,9 +1389,9 @@ lvgl:
                         text_color: 0xE3E2E6
                         text: "Upstairs"
               - button:
-                  x: 457
+                  x: 500
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1390,9 +1418,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Office"
               - button:
-                  x: 571
+                  x: 600
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1419,9 +1447,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Garage"
               - button:
-                  x: 685
+                  x: 700
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1683,10 +1711,20 @@ lvgl:
             height: 72
             styles: md3_nav_bar
             widgets:
+              - obj:
+                  x: 8
+                  y: 16
+                  width: 84
+                  height: 40
+                  styles: md3_chip
+                  widgets:
+                    - label:
+                        align: center
+                        text: " n/a"
               - button:
-                  x: 1
+                  x: 100
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1713,9 +1751,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Family"
               - button:
-                  x: 115
+                  x: 200
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1742,9 +1780,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Living"
               - button:
-                  x: 229
+                  x: 300
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1771,9 +1809,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Kitchen"
               - button:
-                  x: 343
+                  x: 400
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1800,9 +1838,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Upstairs"
               - button:
-                  x: 457
+                  x: 500
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1829,9 +1867,9 @@ lvgl:
                         text_color: 0xE3E2E6
                         text: "Office"
               - button:
-                  x: 571
+                  x: 600
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -1858,9 +1896,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Garage"
               - button:
-                  x: 685
+                  x: 700
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2038,10 +2076,20 @@ lvgl:
             height: 72
             styles: md3_nav_bar
             widgets:
+              - obj:
+                  x: 8
+                  y: 16
+                  width: 84
+                  height: 40
+                  styles: md3_chip
+                  widgets:
+                    - label:
+                        align: center
+                        text: " n/a"
               - button:
-                  x: 1
+                  x: 100
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2068,9 +2116,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Family"
               - button:
-                  x: 115
+                  x: 200
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2097,9 +2145,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Living"
               - button:
-                  x: 229
+                  x: 300
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2126,9 +2174,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Kitchen"
               - button:
-                  x: 343
+                  x: 400
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2155,9 +2203,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Upstairs"
               - button:
-                  x: 457
+                  x: 500
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2184,9 +2232,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Office"
               - button:
-                  x: 571
+                  x: 600
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2213,9 +2261,9 @@ lvgl:
                         text_color: 0xE3E2E6
                         text: "Garage"
               - button:
-                  x: 685
+                  x: 700
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2435,10 +2483,20 @@ lvgl:
             height: 72
             styles: md3_nav_bar
             widgets:
+              - obj:
+                  x: 8
+                  y: 16
+                  width: 84
+                  height: 40
+                  styles: md3_chip
+                  widgets:
+                    - label:
+                        align: center
+                        text: " n/a"
               - button:
-                  x: 1
+                  x: 100
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2465,9 +2523,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Family"
               - button:
-                  x: 115
+                  x: 200
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2494,9 +2552,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Living"
               - button:
-                  x: 229
+                  x: 300
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2523,9 +2581,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Kitchen"
               - button:
-                  x: 343
+                  x: 400
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2552,9 +2610,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Upstairs"
               - button:
-                  x: 457
+                  x: 500
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2581,9 +2639,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Office"
               - button:
-                  x: 571
+                  x: 600
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click:
@@ -2610,9 +2668,9 @@ lvgl:
                         text_color: 0xC4C6CF
                         text: "Garage"
               - button:
-                  x: 685
+                  x: 700
                   y: 0
-                  width: 114
+                  width: 100
                   height: 72
                   styles: md3_nav_item
                   on_click: