diff --git a/client/src/pages/edit/[subsystem]/[entity]/[id].vue b/client/src/pages/[subsystem]/[entity]/edit/[id].vue
similarity index 100%
rename from client/src/pages/edit/[subsystem]/[entity]/[id].vue
rename to client/src/pages/[subsystem]/[entity]/edit/[id].vue
diff --git a/client/src/pages/edit/[subsystem]/[entity]/index.vue b/client/src/pages/[subsystem]/[entity]/edit/index.vue
similarity index 100%
rename from client/src/pages/edit/[subsystem]/[entity]/index.vue
rename to client/src/pages/[subsystem]/[entity]/edit/index.vue
diff --git a/client/src/pages/firewall/DestinationNATRules.vue b/client/src/pages/firewall/DestinationNATRules.vue
index a5eeb0f..2215a8d 100644
--- a/client/src/pages/firewall/DestinationNATRules.vue
+++ b/client/src/pages/firewall/DestinationNATRules.vue
@@ -55,8 +55,8 @@ onMounted(async() => {
   <div>
       <TableView title="DNAT Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/edit/firewall/destinationnatrules">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/edit/firewall/destinationnatrules/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/firewall/destinationnatrules/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/destinationnatrules/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/firewall/ForwardRules.vue b/client/src/pages/firewall/ForwardRules.vue
index 4fa8ced..161ae5a 100644
--- a/client/src/pages/firewall/ForwardRules.vue
+++ b/client/src/pages/firewall/ForwardRules.vue
@@ -56,8 +56,8 @@ onMounted(async() => {
   <div>
       <TableView title="Forward Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/edit/firewall/forwardrules">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/edit/firewall/forwardrules/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/firewall/forwardrules/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/forwardrules/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/firewall/SourceNATRules.vue b/client/src/pages/firewall/SourceNATRules.vue
index 3907c32..daec494 100644
--- a/client/src/pages/firewall/SourceNATRules.vue
+++ b/client/src/pages/firewall/SourceNATRules.vue
@@ -55,8 +55,8 @@ onMounted(async() => {
   <div>
       <TableView title="SNAT Rules" :columns="columns" :loading="loading" @draggedRow="draggedRow" v-model:selection="selection" v-model:data="rules" :table-props="{sort:true, sortSelf: true, draggable: true}">
       <button @click="load">Refresh</button>
-      <router-link class="button" to="/edit/firewall/sourcenatrules">Create</router-link>
-      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/edit/firewall/sourcenatrules/' + selection[0]">Edit</router-link>
+      <router-link class="button" to="/firewall/sourcenatrules/edit">Create</router-link>
+      <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/firewall/sourcenatrules/edit/' + selection[0]">Edit</router-link>
       <button @click="deleteRule" :disabled="selection.length != 1">Delete</button>
     </TableView>
   </div>
diff --git a/client/src/pages/network/Interfaces.vue b/client/src/pages/network/Interfaces.vue
index d4753a8..290b2aa 100644
--- a/client/src/pages/network/Interfaces.vue
+++ b/client/src/pages/network/Interfaces.vue
@@ -59,8 +59,8 @@ onMounted(async() => {
 <template>
   <TableView title="Interfaces" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="displayData" :table-props="{sort:true, sortSelf: true}">
     <button @click="load">Refresh</button>
-    <router-link class="button" to="/edit/network/interfaces">Create</router-link>
-    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/edit/network/interfaces/' + selection[0]">Edit</router-link>
+    <router-link class="button" to="/network/interfaces/edit">Create</router-link>
+    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/network/interfaces/edit/' + selection[0]">Edit</router-link>
     <button @click="deleteInterface" :disabled="selection.length != 1">Delete</button>
   </TableView>
 </template>
\ No newline at end of file
diff --git a/client/src/pages/object/Addresses.vue b/client/src/pages/object/Addresses.vue
index 2ebaed1..a6eff5c 100644
--- a/client/src/pages/object/Addresses.vue
+++ b/client/src/pages/object/Addresses.vue
@@ -78,8 +78,8 @@ onMounted(async() => {
 <template>
     <TableView title="Addresses" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="displayData" :table-props="{sort:true, sortSelf: true}">
     <button @click="load">Refresh</button>
-    <router-link class="button" to="/edit/object/addresses">Create</router-link>
-    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/edit/object/addresses/' + selection[0]">Edit</router-link>
+    <router-link class="button" to="/object/addresses/edit">Create</router-link>
+    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/object/addresses/edit/' + selection[0]">Edit</router-link>
     <button @click="deleteAddress" :disabled="selection.length != 1">Delete</button>
   </TableView>
 </template>
\ No newline at end of file
diff --git a/client/src/pages/object/Services.vue b/client/src/pages/object/Services.vue
index dc7aa74..54e45cd 100644
--- a/client/src/pages/object/Services.vue
+++ b/client/src/pages/object/Services.vue
@@ -83,8 +83,8 @@ onMounted(async() => {
 <template>
   <TableView title="Services" :columns="columns" :loading="loading" v-model:selection="selection" v-model:data="displayData" :table-props="{sort:true, sortSelf: true}">
     <button @click="load">Refresh</button>
-    <router-link class="button" to="/edit/object/services">Create</router-link>
-    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/edit/object/services/' + selection[0]">Edit</router-link>
+    <router-link class="button" to="/object/services/edit">Create</router-link>
+    <router-link class="button" :class="{ disabled: selection.length != 1 }" :to="'/object/services/edit/' + selection[0]">Edit</router-link>
     <button @click="deleteService" :disabled="selection.length != 1">Delete</button>
   </TableView>
 </template>
\ No newline at end of file