diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index 7d5ed34..8f0b534 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -1804,6 +1804,22 @@ text_sensor:
 
 ### Scripts ######
 script:
+  - id: boot_progress
+    mode: restart
+    parameters:
+      step: uint
+    then:
+      - lambda: |-
+          timer_reset_all->execute();
+          if (step == 10) {
+            ESP_LOGD("script.boot_progress", "Progress: Completed");
+            disp1->set_component_value("boot.progress", 100);
+          } else {
+            step = int(round((blueprint_status->state + (step/10))/2));
+            ESP_LOGD("script.boot_progress", "Progress: %i%%", step);
+            disp1->set_component_value("boot.progress", step);
+          }
+
   - id: change_climate_state
     mode: restart
     parameters:
@@ -2137,22 +2153,6 @@ script:
           ESP_LOGD("script.page_boot", "Jump to wake-up page: %s", wakeup_page_name->state.c_str());
           goto_page->execute(wakeup_page_name->state.c_str());
 
-  - id: boot_progress
-    mode: restart
-    parameters:
-      step: uint
-    then:
-      - lambda: |-
-          timer_reset_all->execute();
-          if (step == 10) {
-            ESP_LOGD("script.boot_progress", "Progress: Completed");
-            disp1->set_component_value("boot.progress", 100);
-          } else {
-            step = int(round((blueprint_status->state + (step/10))/2));
-            ESP_LOGD("script.boot_progress", "Progress: %i%%", step);
-            disp1->set_component_value("boot.progress", step);
-          }
-
   - id: page_buttonpage
     mode: restart
     parameters:
@@ -2189,6 +2189,10 @@ script:
       - lambda: |-
           // Report new page to logs
           ESP_LOGD("script.page_changed", "New page: %s", current_page->state.c_str());
+          if (current_page->state.empty()) {
+            goto_page->execute("boot");
+            page_changed->stop();
+          }
 
           // Reset globals
           if (current_page->state != "alarm" &&
@@ -2713,6 +2717,7 @@ script:
     mode: restart
     then:
       - lambda: |-
+          boot_progress->stop();
           change_climate_state->stop();
           check_versions->stop();
           display_embedded_temp->stop();
diff --git a/hmi/dev/nspanel_eu_code/boot.txt b/hmi/dev/nspanel_eu_code/boot.txt
index 0b81cec..21ba60f 100644
--- a/hmi/dev/nspanel_eu_code/boot.txt
+++ b/hmi/dev/nspanel_eu_code/boot.txt
@@ -16,12 +16,6 @@ Page boot
             covx baud,baud_rate.txt,0,0
             baud_rate.txt+=" bps"
             vis unavailable,0
-            printh 92
-            prints "current_page",0
-            printh 00
-            prints "boot",0
-            printh 00
-            printh FF FF FF
         
         Page Exit Event
             dim=0
@@ -188,11 +182,15 @@ Timer tm_esphome
     Attributes
         ID         : 13
         Scope      : local
-        Period (ms): 10000
+        Period (ms): 1000
         Enabled    : yes
     
     Events
         Timer Event
+            if(tm_esphome.tim!=10000)
+            {
+                tm_esphome.tim=10000
+            }
             counter.val++
             if(counter.val>30)
             {
diff --git a/hmi/dev/nspanel_us_code/boot.txt b/hmi/dev/nspanel_us_code/boot.txt
index d4e42f0..250c1fb 100644
--- a/hmi/dev/nspanel_us_code/boot.txt
+++ b/hmi/dev/nspanel_us_code/boot.txt
@@ -16,12 +16,6 @@ Page boot
             covx baud,baud_rate.txt,0,0
             baud_rate.txt+=" bps"
             vis unavailable,0
-            printh 92
-            prints "boot.current_page",0
-            printh 00
-            prints "boot",0
-            printh 00
-            printh FF FF FF
         
         Page Exit Event
             dim=0
@@ -195,11 +189,15 @@ Timer tm_esphome
     Attributes
         ID         : 13
         Scope      : local
-        Period (ms): 10000
+        Period (ms): 1000
         Enabled    : yes
     
     Events
         Timer Event
+            if(tm_esphome.tim!=10000)
+            {
+                tm_esphome.tim=10000
+            }
             counter.val++
             if(counter.val>30)
             {
@@ -222,7 +220,7 @@ Timer tm_esphome
             prints charset,0
             printh FF FF FF
             printh 92
-            prints "tft_version",0
+            prints "boot.tft_version",0
             printh 00
             prints tft_version.txt,0
             printh 00
diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt
index d5b61e1..21ba60f 100644
--- a/hmi/dev/nspanel_us_land_code/boot.txt
+++ b/hmi/dev/nspanel_us_land_code/boot.txt
@@ -16,12 +16,6 @@ Page boot
             covx baud,baud_rate.txt,0,0
             baud_rate.txt+=" bps"
             vis unavailable,0
-            printh 92
-            prints "boot.current_page",0
-            printh 00
-            prints "boot",0
-            printh 00
-            printh FF FF FF
         
         Page Exit Event
             dim=0
@@ -188,11 +182,15 @@ Timer tm_esphome
     Attributes
         ID         : 13
         Scope      : local
-        Period (ms): 10000
+        Period (ms): 1000
         Enabled    : yes
     
     Events
         Timer Event
+            if(tm_esphome.tim!=10000)
+            {
+                tm_esphome.tim=10000
+            }
             counter.val++
             if(counter.val>30)
             {
@@ -215,7 +213,7 @@ Timer tm_esphome
             prints charset,0
             printh FF FF FF
             printh 92
-            prints "tft_version",0
+            prints "boot.tft_version",0
             printh 00
             prints tft_version.txt,0
             printh 00
diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI
index 98c5618..275d9d6 100644
Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ
diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft
index 8ec652b..28e2048 100644
Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ
diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI
index 8ed9ed1..89b60d3 100644
Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ
diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft
index 528abec..91d61e1 100644
Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ
diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI
index 4b9fda1..8e192bf 100644
Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ
diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft
index 066a5de..e850834 100644
Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ