diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index afa125c..fafd2d3 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -6123,6 +6123,14 @@ action:
                       - alias: Home page
                         conditions: '{{ nspanel_event.page == page.home }}'
                         sequence: &refresh_page_home
+                          ##### Set entity variable #####
+                          - &set_entity_variable
+                            service: '{{ nextion.command.text_printf }}'
+                            data:
+                              component: home.entity
+                              message: '{{ climate }}'
+                            continue_on_error: true
+
                           ##### Weather Icon Home Page #####
                           - *delay-default
                           - &refresh-page_home-weather_pic
@@ -7200,6 +7208,13 @@ action:
                                 }}
                               hvac_modes: '{{ state_attr(climate_entity, "hvac_modes") if settings_entity_domain == "climate" }}'
 
+                          - if: '{{ climate_entity == climate }}'
+                            then:
+                              - service: '{{ nextion.command.text_printf }}'
+                                data:
+                                  component: page_label
+                                  message: '{{ state_attr(climate, "friendly_name") }}'
+                                continue_on_error: true
                           - if: '{{ settings_entity_domain == "climate" }}'
                             then:
                               ##### Values #####
diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 0143c14..824ca56 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -300,8 +300,7 @@ api:
         - wait_until:
             binary_sensor.is_on: nextion_init
         - lambda: |-
-            std::string entity_component = page.c_str() + std::string(".entity");
-            id(disp1).set_component_text_printf(entity_component.c_str(), "%s", entity.c_str());
+            id(disp1).set_component_text_printf("home.entity", "%s", entity.c_str());
             std::string cmd_page = std::string("page ") + page.c_str();
             id(disp1).send_command_printf(cmd_page.c_str());
             id(disp1).set_component_text_printf("page_label", "%s", page_label.c_str());
diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI
index fd916da..5735bca 100644
Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ
diff --git a/nspanel_eu.tft b/nspanel_eu.tft
index 46d5b22..0fc8d2b 100644
Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ
diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt
index b9006e4..10246df 100644
--- a/nspanel_eu_code/cover.txt
+++ b/nspanel_eu_code/cover.txt
@@ -13,16 +13,17 @@ Page cover
     Events
         Preinitialize Event
             dim=home.brightness.val
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
             prints coversetting.txt,0
             printh 00
             printh FF FF FF
+            page_label.txt=home.entity.txt
         
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -31,7 +32,7 @@ Page cover
             printh FF FF FF
         
         Touch Release Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -39,6 +40,9 @@ Page cover
             printh 00
             printh FF FF FF
         
+        Page Exit Event
+            home.entity.txt=""
+        
 Variable (string) va1
     Attributes
         ID            : 9
@@ -53,16 +57,9 @@ Variable (string) coversetting
         Text          : 
         Max. Text Size: 255
     
-Variable (string) entity
-    Attributes
-        ID            : 16
-        Scope         : global
-        Text          : 
-        Max. Text Size: 100
-    
 Variable (string) back_page
     Attributes
-        ID            : 17
+        ID            : 16
         Scope         : local
         Text          : home
         Max. Text Size: 15
@@ -138,7 +135,7 @@ Slider coverslider
         Touch Release Event
             covx coverslider.val,va1.txt,0,0
             cover_value.txt=va1.txt+"%"
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"cover_position\", \"value\": "+va1.txt+", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"cover_position\", \"value\": "+va1.txt+", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -158,7 +155,7 @@ Button cover_open
     
     Events
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"open_cover\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"open_cover\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -178,7 +175,7 @@ Button cover_close
     
     Events
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"close_cover\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"close_cover\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -198,7 +195,7 @@ Button cover_stop
     
     Events
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"stop_cover\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"stop_cover\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_eu_code/home.txt b/nspanel_eu_code/home.txt
index d821007..4d8b83a 100644
--- a/nspanel_eu_code/home.txt
+++ b/nspanel_eu_code/home.txt
@@ -53,6 +53,13 @@ Variable (string) lastclick
         Text          : 
         Max. Text Size: 100
     
+Variable (string) entity
+    Attributes
+        ID            : 55
+        Scope         : global
+        Text          : 
+        Max. Text Size: 100
+    
 Text time
     Attributes
         ID                 : 7
@@ -429,22 +436,34 @@ Hotspot jump_climate
     
     Events
         Touch Press Event
-            lastclick.txt="{\"page\": \"home\", \"component\": \"climate\", \"value\": \"press\"}"
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints lastclick.txt,0
-            printh 00
-            printh FF FF FF
+            if(entity.txt=="")
+            {
+                lastclick.txt="{\"page\": \"home\", \"component\": \"climate\", \"value\": \"press\"}"
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints lastclick.txt,0
+                printh 00
+                printh FF FF FF
+            }else
+            {
+                page climate
+            }
         
         Touch Release Event
-            lastclick.txt="{\"page\": \"home\", \"component\": \"climate\", \"value\": \"release\"}"
-            printh 92
-            prints "nspanelevent",0
-            printh 00
-            prints lastclick.txt,0
-            printh 00
-            printh FF FF FF
+            if(entity.txt=="")
+            {
+                lastclick.txt="{\"page\": \"home\", \"component\": \"climate\", \"value\": \"release\"}"
+                printh 92
+                prints "nspanelevent",0
+                printh 00
+                prints lastclick.txt,0
+                printh 00
+                printh FF FF FF
+            }else
+            {
+                page climate
+            }
         
 Hotspot button01
     Attributes
diff --git a/nspanel_eu_code/light.txt b/nspanel_eu_code/light.txt
index 842b2d9..062c640 100644
--- a/nspanel_eu_code/light.txt
+++ b/nspanel_eu_code/light.txt
@@ -13,7 +13,7 @@ Page light
     Events
         Preinitialize Event
             dim=home.brightness.val
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -33,9 +33,10 @@ Page light
             // #### OFF Slider #####
             vis tempslider,0
             vis colorwheel,0
+            page_label.txt=home.entity.txt
         
         Touch Press Event
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -44,7 +45,7 @@ Page light
             printh FF FF FF
         
         Touch Release Event
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -52,6 +53,9 @@ Page light
             printh 00
             printh FF FF FF
         
+        Page Exit Event
+            home.entity.txt=""
+        
 Variable (int32) rgb565
     Attributes
         ID   : 22
@@ -92,16 +96,9 @@ Variable (string) lightsetting
         Text          : 
         Max. Text Size: 255
     
-Variable (string) entity
-    Attributes
-        ID            : 33
-        Scope         : global
-        Text          : 
-        Max. Text Size: 100
-    
 Variable (string) back_page
     Attributes
-        ID            : 34
+        ID            : 33
         Scope         : local
         Text          : home
         Max. Text Size: 15
@@ -379,7 +376,7 @@ Picture colorwheel
             covx r,va1.txt,0,0
             covx g,va2.txt,0,0
             covx b,va3.txt,0,0
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+","+va2.txt+","+va3.txt+"], \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+","+va2.txt+","+va3.txt+"], \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -412,7 +409,7 @@ Slider lightslider
             covx lightslider.val,va1.txt,0,0
             light_value.txt=va1.txt+"%"
             light_value_2.txt=va1.txt+"%"
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"brightness_pct\", \"value\": "+va1.txt+", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"brightness_pct\", \"value\": "+va1.txt+", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -435,7 +432,7 @@ Slider tempslider
             covx tempslider.val,va1.txt,0,0
             temp_value.txt=va1.txt
             temp_value_2.txt=va1.txt
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"color_temp\", \"value\": "+va1.txt+", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"color_temp\", \"value\": "+va1.txt+", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_us.HMI b/nspanel_us.HMI
index 81fa5d2..1ca47cd 100644
Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ
diff --git a/nspanel_us.tft b/nspanel_us.tft
index 472819a..28e704f 100644
Binary files a/nspanel_us.tft and b/nspanel_us.tft differ
diff --git a/nspanel_us_code/cover.txt b/nspanel_us_code/cover.txt
index b9006e4..10246df 100644
--- a/nspanel_us_code/cover.txt
+++ b/nspanel_us_code/cover.txt
@@ -13,16 +13,17 @@ Page cover
     Events
         Preinitialize Event
             dim=home.brightness.val
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
             prints coversetting.txt,0
             printh 00
             printh FF FF FF
+            page_label.txt=home.entity.txt
         
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -31,7 +32,7 @@ Page cover
             printh FF FF FF
         
         Touch Release Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -39,6 +40,9 @@ Page cover
             printh 00
             printh FF FF FF
         
+        Page Exit Event
+            home.entity.txt=""
+        
 Variable (string) va1
     Attributes
         ID            : 9
@@ -53,16 +57,9 @@ Variable (string) coversetting
         Text          : 
         Max. Text Size: 255
     
-Variable (string) entity
-    Attributes
-        ID            : 16
-        Scope         : global
-        Text          : 
-        Max. Text Size: 100
-    
 Variable (string) back_page
     Attributes
-        ID            : 17
+        ID            : 16
         Scope         : local
         Text          : home
         Max. Text Size: 15
@@ -138,7 +135,7 @@ Slider coverslider
         Touch Release Event
             covx coverslider.val,va1.txt,0,0
             cover_value.txt=va1.txt+"%"
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"cover_position\", \"value\": "+va1.txt+", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"cover_position\", \"value\": "+va1.txt+", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -158,7 +155,7 @@ Button cover_open
     
     Events
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"open_cover\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"open_cover\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -178,7 +175,7 @@ Button cover_close
     
     Events
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"close_cover\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"close_cover\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -198,7 +195,7 @@ Button cover_stop
     
     Events
         Touch Press Event
-            coversetting.txt="{\"page\": \"cover\", \"component\": \"stop_cover\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            coversetting.txt="{\"page\": \"cover\", \"component\": \"stop_cover\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
diff --git a/nspanel_us_code/light.txt b/nspanel_us_code/light.txt
index 842b2d9..062c640 100644
--- a/nspanel_us_code/light.txt
+++ b/nspanel_us_code/light.txt
@@ -13,7 +13,7 @@ Page light
     Events
         Preinitialize Event
             dim=home.brightness.val
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"currentpage\", \"value\": \"pagechange\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -33,9 +33,10 @@ Page light
             // #### OFF Slider #####
             vis tempslider,0
             vis colorwheel,0
+            page_label.txt=home.entity.txt
         
         Touch Press Event
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -44,7 +45,7 @@ Page light
             printh FF FF FF
         
         Touch Release Event
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "touchevent",0
             printh 00
@@ -52,6 +53,9 @@ Page light
             printh 00
             printh FF FF FF
         
+        Page Exit Event
+            home.entity.txt=""
+        
 Variable (int32) rgb565
     Attributes
         ID   : 22
@@ -92,16 +96,9 @@ Variable (string) lightsetting
         Text          : 
         Max. Text Size: 255
     
-Variable (string) entity
-    Attributes
-        ID            : 33
-        Scope         : global
-        Text          : 
-        Max. Text Size: 100
-    
 Variable (string) back_page
     Attributes
-        ID            : 34
+        ID            : 33
         Scope         : local
         Text          : home
         Max. Text Size: 15
@@ -379,7 +376,7 @@ Picture colorwheel
             covx r,va1.txt,0,0
             covx g,va2.txt,0,0
             covx b,va3.txt,0,0
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+","+va2.txt+","+va3.txt+"], \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"rgb_color\", \"value\": ["+va1.txt+","+va2.txt+","+va3.txt+"], \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -412,7 +409,7 @@ Slider lightslider
             covx lightslider.val,va1.txt,0,0
             light_value.txt=va1.txt+"%"
             light_value_2.txt=va1.txt+"%"
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"brightness_pct\", \"value\": "+va1.txt+", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"brightness_pct\", \"value\": "+va1.txt+", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00
@@ -435,7 +432,7 @@ Slider tempslider
             covx tempslider.val,va1.txt,0,0
             temp_value.txt=va1.txt
             temp_value_2.txt=va1.txt
-            lightsetting.txt="{\"page\": \"light\", \"component\": \"color_temp\", \"value\": "+va1.txt+", \"entity\": \""+entity.txt+"\"}"
+            lightsetting.txt="{\"page\": \"light\", \"component\": \"color_temp\", \"value\": "+va1.txt+", \"entity\": \""+home.entity.txt+"\"}"
             printh 92
             prints "nspanelevent",0
             printh 00