diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 0e5fd81..c394a64 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -637,12 +637,12 @@ api:
                   id(disp1).set_component_text_printf("bt_disarm_icon", "\uE99D"); //mdi:shield-off
 
                   // Alarm page - Button's text
-                  id(disp1).set_component_text_printf("bt_home_text", mui_alarm[0].c_str());
-                  id(disp1).set_component_text_printf("bt_away_text", mui_alarm[1].c_str());
-                  id(disp1).set_component_text_printf("bt_night_text", mui_alarm[2].c_str());
-                  id(disp1).set_component_text_printf("bt_vacat_text", mui_alarm[3].c_str());
-                  id(disp1).set_component_text_printf("bt_bypass_text", mui_alarm[4].c_str());
-                  id(disp1).set_component_text_printf("bt_disarm_text", mui_alarm[5].c_str());
+                  id(display_wrapped_text).execute("bt_home_text", mui_alarm[0].c_str(), 10);
+                  id(display_wrapped_text).execute("bt_away_text", mui_alarm[1].c_str(), 10);
+                  id(display_wrapped_text).execute("bt_night_text", mui_alarm[2].c_str(), 10);
+                  id(display_wrapped_text).execute("bt_vacat_text", mui_alarm[3].c_str(), 10);
+                  id(display_wrapped_text).execute("bt_bypass_text", mui_alarm[4].c_str(), 10);
+                  id(display_wrapped_text).execute("bt_disarm_text", mui_alarm[5].c_str(), 10);
 
                   // Alarm page - Buttons
                   if (supported_features & 1) // Alarm - Button - Home
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 5324ec1..cdcd004 100644
Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index 06c4f2d..2c6cd69 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt
index e01d943..d5c57cb 100644
--- a/nspanel_eu_code/alarm.txt
+++ b/nspanel_eu_code/alarm.txt
@@ -116,7 +116,7 @@ Text bt_home_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Home
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_away_text
     Attributes
@@ -126,7 +126,7 @@ Text bt_away_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Away
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_night_text
     Attributes
@@ -136,7 +136,7 @@ Text bt_night_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Night
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_vacat_text
     Attributes
@@ -146,7 +146,7 @@ Text bt_vacat_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Vacation
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_bypass_text
     Attributes
@@ -156,7 +156,7 @@ Text bt_bypass_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Bypass
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_disarm_text
     Attributes
@@ -166,7 +166,7 @@ Text bt_disarm_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Disarm
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_home_icon
     Attributes
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index c2144b9..4def032 100644
Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
index f8539ae..0e9b040 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ
diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt
index e01d943..d5c57cb 100644
--- a/nspanel_us_code/alarm.txt
+++ b/nspanel_us_code/alarm.txt
@@ -116,7 +116,7 @@ Text bt_home_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Home
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_away_text
     Attributes
@@ -126,7 +126,7 @@ Text bt_away_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Away
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_night_text
     Attributes
@@ -136,7 +136,7 @@ Text bt_night_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Night
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_vacat_text
     Attributes
@@ -146,7 +146,7 @@ Text bt_vacat_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Vacation
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_bypass_text
     Attributes
@@ -156,7 +156,7 @@ Text bt_bypass_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Bypass
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_disarm_text
     Attributes
@@ -166,7 +166,7 @@ Text bt_disarm_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Disarm
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_home_icon
     Attributes
diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI
index 2c965c1..58fbf80 100644
Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ
diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft
index 60b0dde..19da1b1 100644
Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ
diff --git a/nspanel_us_land_code/alarm.txt b/nspanel_us_land_code/alarm.txt
index e01d943..d5c57cb 100644
--- a/nspanel_us_land_code/alarm.txt
+++ b/nspanel_us_land_code/alarm.txt
@@ -116,7 +116,7 @@ Text bt_home_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Home
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_away_text
     Attributes
@@ -126,7 +126,7 @@ Text bt_away_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Away
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_night_text
     Attributes
@@ -136,7 +136,7 @@ Text bt_night_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Night
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_vacat_text
     Attributes
@@ -146,7 +146,7 @@ Text bt_vacat_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Vacation
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_bypass_text
     Attributes
@@ -156,7 +156,7 @@ Text bt_bypass_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Bypass
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_disarm_text
     Attributes
@@ -166,7 +166,7 @@ Text bt_disarm_text
         Send Component ID  : disabled
         Associated Keyboard: none
         Text               : Disarm
-        Max. Text Size     : 10
+        Max. Text Size     : 22
     
 Text bt_home_icon
     Attributes
diff --git a/nspanel_us_land_code/home.txt b/nspanel_us_land_code/home.txt
index 987fc73..211bd17 100644
--- a/nspanel_us_land_code/home.txt
+++ b/nspanel_us_land_code/home.txt
@@ -25,8 +25,6 @@ Page home
             vis bt_qrcode,is_qrcode
             vis bt_entities,is_entities
             vis bt_alarm,is_alarm
-            vis left_bt_text,0
-            vis right_bt_text,0
             if(display_mode==3)
             {
                 vis left_bt_text,0