diff --git a/wwwroot/services.ui b/wwwroot/services.ui
index 7ec33c4..2fe3666 100644
--- a/wwwroot/services.ui
+++ b/wwwroot/services.ui
@@ -94,7 +94,7 @@
                 {
                   "widgettype": "Text",
                   "options": {
-                    "text": "{{data.name}}",
+                    "text": "{{item.name}}",
                     "fontSize": "18px",
                     "fontWeight": "600",
                     "color": "#F8FAFC"
@@ -106,7 +106,7 @@
                 {
                   "widgettype": "Badge",
                   "options": {
-                    "text": "{{data.status}}",
+                    "text": "{{item.status}}",
                     "bgcolor": "{{ '#22C55E' if data.status == 'Connected' else '#EF4444' }}",
                     "color": "#FFFFFF",
                     "borderRadius": "12px",
diff --git a/wwwroot/sessions.ui b/wwwroot/sessions.ui
index f8e1fe1..ff93234 100644
--- a/wwwroot/sessions.ui
+++ b/wwwroot/sessions.ui
@@ -94,7 +94,7 @@
                 {
                   "widgettype": "Text",
                   "options": {
-                    "text": "{{data.name}}",
+                    "text": "{{item.name}}",
                     "fontSize": "16px",
                     "fontWeight": "600",
                     "color": "#F8FAFC"
@@ -106,7 +106,7 @@
                 {
                   "widgettype": "Text",
                   "options": {
-                    "text": "{{data.last_active}}",
+                    "text": "{{item.last_active}}",
                     "fontSize": "12px",
                     "color": "#94A3B8"
                   }
@@ -116,7 +116,7 @@
             {
               "widgettype": "Text",
               "options": {
-                "text": "{{data.model}}",
+                "text": "{{item.model}}",
                 "fontSize": "14px",
                 "color": "#CBD5E1",
                 "marginTop": "4px"
@@ -130,7 +130,7 @@
               "actiontype": "urlwidget",
               "target": "app.main-content",
               "options": {
-                "url": "{{entire_url('session_detail.ui?id={{data.id}}')}}"
+                "url": "{{entire_url('session_detail.ui?id={{item.id}}')}}"
               },
               "mode": "replace"
             }
diff --git a/wwwroot/settings.ui b/wwwroot/settings.ui
index 5c8b304..fb7827d 100644
--- a/wwwroot/settings.ui
+++ b/wwwroot/settings.ui
@@ -107,9 +107,9 @@
                         "target": "self",
                         "rfname": "save_general_settings",
                         "params": {
-                          "default_model": "{{form.default-model}}",
-                          "session_timeout": "{{form.session-timeout}}",
-                          "auto_save": "{{form.auto-save}}"
+                          "default_model": "{{default-model.value}}",
+                          "session_timeout": "{{session-timeout.value}}",
+                          "auto_save": "{{auto-save.checked}}"
                         }
                       }
                     ]
@@ -320,8 +320,8 @@
                       "target": "self",
                       "rfname": "save_security_settings",
                       "params": {
-                        "require_auth": "{{form.require-auth}}",
-                        "encrypt_storage": "{{form.encrypt-storage}}"
+                        "require_auth": "{{require-auth.checked}}",
+                        "encrypt_storage": "{{encrypt-storage.checked}}"
                       }
                     }
                   ]
@@ -381,7 +381,7 @@
                       "target": "self",
                       "rfname": "save_appearance_settings",
                       "params": {
-                        "theme": "{{form.theme-select}}"
+                        "theme": "{{theme-select.value}}"
                       }
                     }
                   ]