diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 22f62e5..00b870e 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -1245,7 +1245,7 @@ text_sensor:
     on_value:
       then:
         - lambda: |-
-            if (x != "climate" and x != "cover" and x != "fan" and x != "light" and x != "media_player" ) id(entity_id) = "";
+            if (x != "climate" and x != "cover" and x != "fan" and x != "light" and x != "media_player" and x != "confirm" and x != "keyb_num" ) id(entity_id) = "";
             ESP_LOGD("text_sensor.current_page", "New page: %s", x.c_str());
             if (!id(entity_id).empty()) ESP_LOGD("text_sensor.current_page", "Entity shown: %s", id(entity_id).c_str());
             id(timer_reset_all).execute(x.c_str());
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index 56c4d3a..3427b86 100644
Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index c2851a8..b681a15 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_eu_code/keyb_num.txt b/nspanel_eu_code/keyb_num.txt
index b9bf190..706ffcf 100644
--- a/nspanel_eu_code/keyb_num.txt
+++ b/nspanel_eu_code/keyb_num.txt
@@ -52,30 +52,23 @@ Variable (string) key
         Text          : 
         Max. Text Size: 10
     
-Variable (string) entity
-    Attributes
-        ID            : 20
-        Scope         : local
-        Text          : 
-        Max. Text Size: 100
-    
 Variable (string) domain
     Attributes
-        ID            : 21
+        ID            : 20
         Scope         : local
         Text          : alarm
         Max. Text Size: 10
     
 Variable (string) aux
     Attributes
-        ID            : 22
+        ID            : 21
         Scope         : local
         Text          : 
         Max. Text Size: 255
     
 Variable (string) value
     Attributes
-        ID            : 23
+        ID            : 22
         Scope         : local
         Text          : 
         Max. Text Size: 10
@@ -345,7 +338,7 @@ Button benter
     
     Events
         Touch Release Event
-            aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"entity\": \""+entity.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
+            aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -375,7 +368,7 @@ Button bview
         
 Timer wakeup_timer
     Attributes
-        ID         : 24
+        ID         : 23
         Scope      : local
         Period (ms): 100
         Enabled    : yes
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index 50aac6c..613f8fd 100644
Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
deleted file mode 100644
index a635a5a..0000000
Binary files a/nspanel_us.tft and /dev/null differ
diff --git a/nspanel_us_code/keyb_num.txt b/nspanel_us_code/keyb_num.txt
index 6fd2239..74dd901 100644
--- a/nspanel_us_code/keyb_num.txt
+++ b/nspanel_us_code/keyb_num.txt
@@ -52,30 +52,23 @@ Variable (string) key
         Text          : 
         Max. Text Size: 10
     
-Variable (string) entity
-    Attributes
-        ID            : 20
-        Scope         : local
-        Text          : 
-        Max. Text Size: 100
-    
 Variable (string) domain
     Attributes
-        ID            : 21
+        ID            : 20
         Scope         : local
         Text          : alarm
         Max. Text Size: 10
     
 Variable (string) aux
     Attributes
-        ID            : 22
+        ID            : 21
         Scope         : local
         Text          : 
         Max. Text Size: 255
     
 Variable (string) value
     Attributes
-        ID            : 23
+        ID            : 22
         Scope         : local
         Text          : 
         Max. Text Size: 10
@@ -345,7 +338,7 @@ Button benter
     
     Events
         Touch Release Event
-            aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"entity\": \""+entity.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
+            aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -375,7 +368,7 @@ Button bview
         
 Timer wakeup_timer
     Attributes
-        ID         : 24
+        ID         : 23
         Scope      : local
         Period (ms): 100
         Enabled    : yes
diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI
index 6b6ff4d..93a1e94 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 b29f0f8..ee2396e 100644
Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ
diff --git a/nspanel_us_land_code/keyb_num.txt b/nspanel_us_land_code/keyb_num.txt
index b9bf190..706ffcf 100644
--- a/nspanel_us_land_code/keyb_num.txt
+++ b/nspanel_us_land_code/keyb_num.txt
@@ -52,30 +52,23 @@ Variable (string) key
         Text          : 
         Max. Text Size: 10
     
-Variable (string) entity
-    Attributes
-        ID            : 20
-        Scope         : local
-        Text          : 
-        Max. Text Size: 100
-    
 Variable (string) domain
     Attributes
-        ID            : 21
+        ID            : 20
         Scope         : local
         Text          : alarm
         Max. Text Size: 10
     
 Variable (string) aux
     Attributes
-        ID            : 22
+        ID            : 21
         Scope         : local
         Text          : 
         Max. Text Size: 255
     
 Variable (string) value
     Attributes
-        ID            : 23
+        ID            : 22
         Scope         : local
         Text          : 
         Max. Text Size: 10
@@ -345,7 +338,7 @@ Button benter
     
     Events
         Touch Release Event
-            aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"entity\": \""+entity.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
+            aux.txt="{\"page\": \"keyb_num\", \"key\": \""+key.txt+"\", \"value\": \""+value.txt+"\", \"pin\": \""+pin.txt+"\", \"base_domain\": \""+domain.txt+"\"}"
             printh 92
             prints "localevent",0
             printh 00
@@ -375,7 +368,7 @@ Button bview
         
 Timer wakeup_timer
     Attributes
-        ID         : 24
+        ID         : 23
         Scope      : local
         Period (ms): 100
         Enabled    : yes