diff --git a/wwwroot/add_service.ui b/wwwroot/add_service.ui
index b61a0d0..fffa4f1 100644
--- a/wwwroot/add_service.ui
+++ b/wwwroot/add_service.ui
@@ -69,7 +69,7 @@
               "wid": "self",
               "event": "click",
               "actiontype": "script",
-              "script": "const formData = bricks.app.get_widget('add-service-form').get_data(); if (formData.name && formData.url) { fetch('/hermes-web-cli/services', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(formData) }).then(response => response.json()).then(data => { bricks.app.load_widget('{{entire_url(\"services.ui\")}}', 'main-content', 'replace'); }); }"
+              "script": "const formData = bricks.app.get_widget('add-service-form').get_data(); if (formData.name && formData.url) { fetch('/hermes-web-cli/services', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(formData) }).then(response => response.json()).then(data => { bricks.app.load_widget('{{entire_url(\"services.ui\")}}', 'app.main-content', 'replace'); }); }"
             }
           ]
         },
@@ -88,7 +88,7 @@
               "wid": "self",
               "event": "click",
               "actiontype": "urlwidget",
-              "target": "main-content",
+              "target": "app.main-content",
               "options": {
                 "url": "{{entire_url('services.ui')}}"
               },
diff --git a/wwwroot/edit_service.ui b/wwwroot/edit_service.ui
index b80dfad..faddc44 100644
--- a/wwwroot/edit_service.ui
+++ b/wwwroot/edit_service.ui
@@ -70,7 +70,7 @@
               "wid": "self",
               "event": "click",
               "actiontype": "script",
-              "script": "const formData = bricks.app.get_widget('edit-service-form').get_data(); const serviceId = '{{query.service_id}}'; if (formData.name && formData.url) { fetch(`/hermes-web-cli/hermes_services/?id=${serviceId}`, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(formData) }).then(() => { bricks.app.load_widget('{{entire_url(\"services.ui\")}}', 'main-content', 'replace'); }); }"
+              "script": "const formData = bricks.app.get_widget('edit-service-form').get_data(); const serviceId = '{{query.service_id}}'; if (formData.name && formData.url) { fetch(`/hermes-web-cli/hermes_services/?id=${serviceId}`, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(formData) }).then(() => { bricks.app.load_widget('{{entire_url(\"services.ui\")}}', 'app.main-content', 'replace'); }); }"
             }
           ]
         },
@@ -89,7 +89,7 @@
               "wid": "self",
               "event": "click",
               "actiontype": "urlwidget",
-              "target": "main-content",
+              "target": "app.main-content",
               "options": {
                 "url": "{{entire_url('services.ui')}}"
               },
diff --git a/wwwroot/new_session.ui b/wwwroot/new_session.ui
index 7452d30..fb5e3a1 100644
--- a/wwwroot/new_session.ui
+++ b/wwwroot/new_session.ui
@@ -44,7 +44,7 @@
           "wid": "self",
           "event": "submited",
           "actiontype": "script",
-          "script": "const data = event.params; if (data && data.session_id) { bricks.app.load_widget('{{entire_url(\"session_detail.ui\")}}?session_id=' + data.session_id, 'main-content', 'replace'); }"
+          "script": "const data = event.params; if (data && data.session_id) { bricks.app.load_widget('{{entire_url(\"session_detail.ui\")}}?session_id=' + data.session_id, 'app.main-content', 'replace'); }"
         }
       ]
     }
diff --git a/wwwroot/services.ui b/wwwroot/services.ui
index e30487e..469ea1f 100644
--- a/wwwroot/services.ui
+++ b/wwwroot/services.ui
@@ -33,7 +33,7 @@
           "wid": "self",
           "event": "click",
           "actiontype": "urlwidget",
-          "target": "main-content",
+          "target": "app.main-content",
           "options": {
             "url": "{{entire_url('add_service.ui')}}"
           },
@@ -111,7 +111,7 @@
           "wid": "self",
           "event": "edit_service",
           "actiontype": "script",
-          "script": "const selectedRow = event.params; if (selectedRow) { const url = `{{entire_url('edit_service.ui')}}?service_id=${selectedRow.id}`; bricks.app.load_widget(url, 'main-content', 'replace'); }"
+          "script": "const selectedRow = event.params; if (selectedRow) { const url = `{{entire_url('edit_service.ui')}}?service_id=${selectedRow.id}`; bricks.app.load_widget(url, 'app.main-content', 'replace'); }"
         },
         {
           "wid": "self",
diff --git a/wwwroot/session_chat.ui b/wwwroot/session_chat.ui
index 82a454c..14a5fde 100644
--- a/wwwroot/session_chat.ui
+++ b/wwwroot/session_chat.ui
@@ -42,7 +42,7 @@
               "wid": "self",
               "event": "click",
               "actiontype": "urlwidget",
-              "target": "main-content",
+              "target": "app.main-content",
               "options": {
                 "url": "{{entire_url('sessions.ui')}}"
               },
diff --git a/wwwroot/session_detail.ui b/wwwroot/session_detail.ui
index e7126bd..7329207 100644
--- a/wwwroot/session_detail.ui
+++ b/wwwroot/session_detail.ui
@@ -102,7 +102,7 @@
               "wid": "self",
               "event": "click",
               "actiontype": "urlwidget",
-              "target": "main-content",
+              "target": "app.main-content",
               "options": {
                 "url": "{{entire_url('sessions.ui')}}"
               },
diff --git a/wwwroot/sessions.ui b/wwwroot/sessions.ui
index 142c634..e6595ef 100644
--- a/wwwroot/sessions.ui
+++ b/wwwroot/sessions.ui
@@ -75,7 +75,7 @@
           "wid": "self",
           "event": "open_session",
           "actiontype": "script",
-          "script": "const selectedRow = event.params; if (selectedRow) { const url = `{{entire_url('session_detail.ui')}}?session_id=${selectedRow.session_id}`; bricks.app.load_widget(url, 'main-content', 'replace'); }"
+          "script": "const selectedRow = event.params; if (selectedRow) { const url = `{{entire_url('session_detail.ui')}}?session_id=${selectedRow.session_id}`; bricks.app.load_widget(url, 'app.main-content', 'replace'); }"
         },
         {
           "wid": "self",