diff --git a/client/src/pages/firewall/DestinationNATRules.vue b/client/src/pages/firewall/DestinationNATRules.vue
index f9f59ce..41f6121 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>
-      <button @click="load">Create</button>
-      <button @click="load" :disabled="selection.length != 1">Edit</button>
+      <router-link class="button" to="/edit/firewall/destinationnatrules">Create</router-link>
+      <router-link class="button" :disabled="selection.length != 1" :to="'/edit/firewall/destinationnatrules/' + 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 7fc6103..d526b8d 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>
-      <button @click="load">Create</button>
-      <button @click="load" :disabled="selection.length != 1">Edit</button>
+      <router-link class="button" to="/edit/firewall/forwardrules">Create</router-link>
+      <router-link class="button" :disabled="selection.length != 1" :to="'/edit/firewall/forwardrules/' + 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 c96e121..f03f50b 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>
-      <button @click="load">Create</button>
-      <button @click="load" :disabled="selection.length != 1">Edit</button>
+      <router-link class="button" to="/edit/firewall/sourcenatrules">Create</router-link>
+      <router-link class="button" :disabled="selection.length != 1" :to="'/edit/firewall/sourcenatrules/' + 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 fd3de2c..d4dd302 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>
-    <button @click="load">Create</button>
-    <button @click="load" :disabled="selection.length != 1">Edit</button>
+    <router-link class="button" to="/edit/network/interfaces">Create</router-link>
+    <router-link class="button" :disabled="selection.length != 1" :to="'/edit/network/interfaces/' + 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 6e4ef44..9a265ba 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>
-    <button @click="load">Create</button>
-    <button @click="load" :disabled="selection.length != 1">Edit</button>
+    <router-link class="button" to="/edit/object/addresses">Create</router-link>
+    <router-link class="button" :disabled="selection.length != 1" :to="'/edit/object/addresses/' + 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 1304673..5a4a0ef 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>
-    <button @click="load">Create</button>
-    <button @click="load" :disabled="selection.length != 1">Edit</button>
+    <router-link class="button" to="/edit/object/services">Create</router-link>
+    <router-link class="button" :disabled="selection.length != 1" :to="'/edit/object/services/' + selection[0]">Edit</router-link>
     <button @click="deleteService" :disabled="selection.length != 1">Delete</button>
   </TableView>
 </template>
\ No newline at end of file