diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI
index 8138ee40..0915f09a 100644
Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ
diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft
index c0ff7d78..75055ca0 100644
Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ
diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI
index a1206c6e..4ac7b54d 100644
Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ
diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft
index b57f63f3..9a1d6db4 100644
Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index 6d987bf1..24bc094b 100644
Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ
diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index f47f7648..b3bb5c99 100644
Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ
diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py
index c3dc6d94..16b7156d 100644
--- a/apps/nspanel-lovelace-ui/luibackend/controller.py
+++ b/apps/nspanel-lovelace-ui/luibackend/controller.py
@@ -374,8 +374,22 @@ class LuiController(object):
                     msg += f"- {apis.ha_api.get_entity(e).attributes.friendly_name}\r\n"
             self._pages_gen.send_message_page("opnSensorNotifyRes", "", msg, "", "")
 
-        # for fan popup / preset selection
-        if button_type == "mode-sel":
+        if button_type == "mode-preset_modes":
             entity = apis.ha_api.get_entity(entity_id)
             preset_mode = entity.attributes.preset_modes[int(value)]
             entity.call_service("set_preset_mode", preset_mode=preset_mode)
+
+        if button_type == "mode-swing_modes":
+            entity = apis.ha_api.get_entity(entity_id)
+            swing_mode = entity.attributes.swing_modes[int(value)]
+            entity.call_service("set_swing_mode", swing_mode=swing_mode)
+
+        if button_type == "mode-fan_modes":
+            entity = apis.ha_api.get_entity(entity_id)
+            fan_mode = entity.attributes.fan_modes[int(value)]
+            entity.call_service("set_fan_mode", fan_mode=fan_mode)
+
+        if button_type == "mode-input_select":
+            entity = apis.ha_api.get_entity(entity_id)
+            option = entity.attributes.options[int(value)]
+            entity.call_service("select_option", option=option)