diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index abb001d..77561f4 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -3088,13 +3088,13 @@ action:
             data:
               cmd: home.weather.pic={{ weather_pic }}
 
-      ##### Page changed #####
+      ##### PAGE CHANGED #####
       - conditions:
           - condition: trigger
             id: current_page_changed
         sequence:
           - choose:
-              ## home ## 
+              ## PAGE HOME ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_home }}'
                 sequence:
                   ##### NSPanel Date #####
@@ -3157,7 +3157,7 @@ action:
                       component: home.outdoor_temp
                       message: "{{ outdoor_temp }}°"
 
-                  ##### Weather Icon Home Page
+                  ##### Weather Icon Home Page #####
                   - variables:
                       weather_pic: >-
                         {%- if states(weather_entity) == 'sunny' -%} {{ weather_sunny }}
@@ -3198,18 +3198,22 @@ action:
                           component: home.left_bt_text
                           message: "{{ left_button_name }}"
 
-                  ##### SET Left Hardware Button PIC on Home Page ####
-                  - variables:
-                      # Hardware Button PIC
-                      left_hardware_button_state: >-
-                        {%- if states(left_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
-                        {%- elif states(left_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
-                        {%- endif -%}
-                  - delay:
-                      milliseconds: "{{ delay_value }}"
-                  - service: "{{ command_printf }}"
-                    data:
-                      cmd: home.left_bt_pic.pic={{ left_hardware_button_state }}
+                  ##### SET Left Hardware Button PIC on Home Page ####                 
+                  - if:
+                      - condition: template
+                        value_template: '{{ left_button_entity |length > 0 and states(left_button_entity).state != "unavailable" }}'
+                    then:
+                      - variables:
+                          # Hardware Button PIC
+                          left_hardware_button_state: >-
+                            {%- if states(left_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
+                            {%- elif states(left_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
+                            {%- endif -%}
+                      - delay:
+                          milliseconds: "{{ delay_value }}"
+                      - service: "{{ command_printf }}"
+                        data:
+                          cmd: home.left_bt_pic.pic={{ left_hardware_button_state }}
 
                   #####  NSPanel Right Button Name #####
                   - if:
@@ -3224,18 +3228,23 @@ action:
                           message: "{{ right_button_name }}"
 
                   ###### SET Right Hardware Button PIC on Home Page #####
-                  - variables:
+                  
+                  - if:
+                      - condition: template
+                        value_template: '{{ right_button_entity |length > 0 and states(right_button_entity).state != "unavailable" }}'
+                    then:
+                      - variables:
                       # Hardware Button PIC
-                      right_hardware_button_state: >-
-                        {%- if states(right_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
-                        {%- elif states(right_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
-                        {%- endif -%}
-                  - delay:
-                      milliseconds: "{{ delay_value }}"
-                  - service: "{{ command_printf }}"
-                    data:
-                      cmd: home.right_bt_pic.pic={{ right_hardware_button_state }} 
-
+                          right_hardware_button_state: >-
+                            {%- if states(right_button_entity) == 'off' -%} {{ hardware_button_pic_off }}
+                            {%- elif states(right_button_entity) == 'on' -%} {{ hardware_button_pic_on }}
+                            {%- endif -%}
+                      - delay:
+                          milliseconds: "{{ delay_value }}"
+                      - service: "{{ command_printf }}"
+                        data:
+                          cmd: home.right_bt_pic.pic={{ right_hardware_button_state }}
+                  
                   ###### StatusBar - Climate Symbol ######
                   - if:
                       - condition: template
@@ -3293,7 +3302,7 @@ action:
                                   #hvac_mode: 'heat'
                                   temperature: "{{ display_target_temperature }}"
 
-              ## weather01 ## 
+              ## PAGE WEATHE01 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_weather01 }}'
                 sequence:
                   - choose:
@@ -3511,7 +3520,7 @@ action:
                         data:
                           cmd: "page {{ page_home }}"
 
-              ## weather02 ## 
+              ## PAGE WEATHE02 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_weather02 }}'
                 sequence:
                   - choose:
@@ -3753,7 +3762,7 @@ action:
                         data:
                           cmd: "page {{ page_home }}"
 
-              ## weather03 ## 
+              ## PAGE WEATHE03 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_weather03 }}'
                 sequence:
                   - choose:
@@ -3995,7 +4004,7 @@ action:
                         data:
                           cmd: "page {{ page_home }}"
 
-              ## weather04 ## 
+              ## PAGE WEATHE04 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_weather04 }}'
                 sequence:
                   - choose:
@@ -4237,7 +4246,7 @@ action:
                         data:
                           cmd: "page {{ page_home }}"
 
-              ## weather05 ## 
+              ## PAGE WEATHE05 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_weather05 }}'
                 sequence:
                   - choose:
@@ -4479,7 +4488,7 @@ action:
                         data:
                           cmd: "page {{ page_home }}"
 
-              ## climate ## 
+              ## PAGE CLIMATE ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_climate }}'
                 alias: 'climate page'
                 sequence:
@@ -4557,39 +4566,39 @@ action:
                           component: climate.hotwater_temp
                           message: "{{ states(hotwatertemp) |round(1) }}°"
 
-              ## settings ## 
+              ## PAGE SETTINGS ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_settings }}'
                 sequence:
 
-              ## boot ## 
+              ## PAGE BOOT ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_boot }}'
                 sequence:
 
-              ## screensaver ## 
+              ## PAGE SCREENSAVER ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_screensaver }}'
                 sequence:
 
-              ## lightsettings ## 
+              ## PAGE LIGHTSETTUNGS ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_lightsettings }}'
                 sequence:
 
-              ## coversettings ## 
+              ## PAGE COVERSETTINGS ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_coversettings }}'
                 sequence:
 
-              ## buttonpage01 ## 
+              ## PAGE BUTTONPAGE01 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage01 }}'
                 sequence:
 
-              ## buttonpage02 ## 
+              ## PAGE BUTTONPAGE01 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage01 }}'
                 sequence:
 
-              ## buttonpage03 ## 
+              ## PAGE BUTTONPAGE01 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage03 }}'
                 sequence:
 
-              ## buttonpage04 ## 
+              ## PAGE BUTTONPAGE01 ## 
               - conditions: '{{ trigger.event.data.new_state.state == page_buttonpage04 }}'
                 sequence: