diff --git a/OryAdmin/Components/Pages/Identities/Messages/Index.razor b/OryAdmin/Components/Pages/Identities/Messages/Index.razor
index 73b47ff..a376be2 100644
--- a/OryAdmin/Components/Pages/Identities/Messages/Index.razor
+++ b/OryAdmin/Components/Pages/Identities/Messages/Index.razor
@@ -8,7 +8,6 @@
 <h1 class="title">Message Log</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Identities/Messages/View.razor b/OryAdmin/Components/Pages/Identities/Messages/View.razor
index 4f9b803..10b8640 100644
--- a/OryAdmin/Components/Pages/Identities/Messages/View.razor
+++ b/OryAdmin/Components/Pages/Identities/Messages/View.razor
@@ -8,7 +8,6 @@
 <h1 class="title">View Message</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Identities/Schemas/Index.razor b/OryAdmin/Components/Pages/Identities/Schemas/Index.razor
index b8789dd..973730f 100644
--- a/OryAdmin/Components/Pages/Identities/Schemas/Index.razor
+++ b/OryAdmin/Components/Pages/Identities/Schemas/Index.razor
@@ -7,7 +7,6 @@
 <h1 class="title">Identity Schemas</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Identities/Users/Create.razor b/OryAdmin/Components/Pages/Identities/Users/Create.razor
index e9c2256..084d244 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Create.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/Create.razor
@@ -8,7 +8,6 @@
 <h1 class="title">Create Identity</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Identities/Users/Edit.razor b/OryAdmin/Components/Pages/Identities/Users/Edit.razor
index 308af08..252e2df 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Edit.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/Edit.razor
@@ -9,7 +9,6 @@
 
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Identities/Users/Index.razor b/OryAdmin/Components/Pages/Identities/Users/Index.razor
index 87f9b8c..fd5a2fd 100644
--- a/OryAdmin/Components/Pages/Identities/Users/Index.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/Index.razor
@@ -14,7 +14,6 @@
 
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Identities/Users/View.razor b/OryAdmin/Components/Pages/Identities/Users/View.razor
index 2deefd5..5066e89 100644
--- a/OryAdmin/Components/Pages/Identities/Users/View.razor
+++ b/OryAdmin/Components/Pages/Identities/Users/View.razor
@@ -8,7 +8,6 @@
 <h1 class="title">View Identity</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor b/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor
index 363fea7..9e92341 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Edit.razor
@@ -8,7 +8,6 @@
 <h1 class="title">Edit Client</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor b/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor
index d6335ea..9c07a36 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Index.razor
@@ -13,7 +13,6 @@
 </div>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/Sessions.razor b/OryAdmin/Components/Pages/OAuth2/Clients/Sessions.razor
index 6a6ee39..61187fb 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/Sessions.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/Sessions.razor
@@ -13,7 +13,6 @@
 </div>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/OAuth2/Clients/View.razor b/OryAdmin/Components/Pages/OAuth2/Clients/View.razor
index 777b0fb..e1ea667 100644
--- a/OryAdmin/Components/Pages/OAuth2/Clients/View.razor
+++ b/OryAdmin/Components/Pages/OAuth2/Clients/View.razor
@@ -8,7 +8,6 @@
 <h1 class="title">View OAuth 2 Client</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor
index 07cb6bd..387d6b7 100644
--- a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor
+++ b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Create.razor
@@ -8,7 +8,6 @@
 <h1 class="title">Trust Grant Issuer</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor
index ee49014..309a8d2 100644
--- a/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor
+++ b/OryAdmin/Components/Pages/OAuth2/GrantIssuers/Index.razor
@@ -13,7 +13,6 @@
 </div>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Permissions/Index.razor b/OryAdmin/Components/Pages/Permissions/Index.razor
index 530a606..994e53e 100644
--- a/OryAdmin/Components/Pages/Permissions/Index.razor
+++ b/OryAdmin/Components/Pages/Permissions/Index.razor
@@ -7,7 +7,6 @@
 <h1 class="title">Permission Namespaces</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor
index 486bb13..8fcd12b 100644
--- a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor
+++ b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor
@@ -47,7 +47,7 @@
     </div>
     <div class="mt-5">
         <div class="buttons">
-            <a class="button" href="permissions/@NamespaceName/relationships">
+            <a class="button" href="permissions/@NamespaceName">
                 Cancel
             </a>
             <button type="submit" class="button is-success">
diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs
index 8eb65bf..fac7ee6 100644
--- a/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs
+++ b/OryAdmin/Components/Pages/Permissions/Relationships/Create.razor.cs
@@ -28,6 +28,6 @@ private async Task SubmitForm()
             return;
         }
 
-        nav.NavigateTo($"permissions/{NamespaceName}/relationships");
+        nav.NavigateTo($"permissions/{NamespaceName}");
     }
 }
\ No newline at end of file
diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor b/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor
index af37880..48cc9b2 100644
--- a/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor
+++ b/OryAdmin/Components/Pages/Permissions/Relationships/Index.razor
@@ -11,7 +11,6 @@
 </div>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else
diff --git a/OryAdmin/Components/Pages/Permissions/Relationships/Tree.razor b/OryAdmin/Components/Pages/Permissions/Relationships/Tree.razor
index aeacc05..01d3273 100644
--- a/OryAdmin/Components/Pages/Permissions/Relationships/Tree.razor
+++ b/OryAdmin/Components/Pages/Permissions/Relationships/Tree.razor
@@ -7,7 +7,6 @@
 <h1 class="title">Permission Tree</h1>
 @if (_isLoading)
 {
-    // is loading
     <p>Loading data...</p>
 }
 else