diff --git a/src/views/accounts/AccountTemplate/Detail/Account.vue b/src/views/accounts/AccountTemplate/Detail/Account.vue
index cc656721e..bc2d5c6e2 100644
--- a/src/views/accounts/AccountTemplate/Detail/Account.vue
+++ b/src/views/accounts/AccountTemplate/Detail/Account.vue
@@ -76,21 +76,28 @@ export default {
           name: {
             formatter: DetailFormatter,
             formatterArgs: {
-              route: 'AssetAccountDetail',
-              can: vm.$hasPerm('accounts.view_account')
+              drawer: true,
+              can: vm.$hasPerm('accounts.view_account'),
+              getRoute: ({ row }) => {
+                return {
+                  name: 'AssetAccountDetail',
+                  params: { id: row.id }
+                }
+              }
             }
           },
           asset: {
             label: this.$t('Asset'),
-            formatter: function(row) {
-              const to = {
-                name: 'AssetDetail',
-                params: { id: row.asset.id }
-              }
-              if (vm.$hasPerm('assets.view_asset')) {
-                return <router-link to={to}>{row.asset.name}</router-link>
-              } else {
-                return <span>{row.asset.name}</span>
+            formatter: DetailFormatter,
+            formatterArgs: {
+              drawer: true,
+              can: vm.$hasPerm('assets.view_asset'),
+              getTitle: ({ row }) => row.asset.name,
+              getRoute: ({ row }) => {
+                return {
+                  name: 'AssetDetail',
+                  params: { id: row.asset.id }
+                }
               }
             }
           },
diff --git a/src/views/assets/Asset/AssetDetail/PermUser.vue b/src/views/assets/Asset/AssetDetail/PermUser.vue
index a46faab30..036e39495 100644
--- a/src/views/assets/Asset/AssetDetail/PermUser.vue
+++ b/src/views/assets/Asset/AssetDetail/PermUser.vue
@@ -50,9 +50,16 @@ export default {
         },
         columnsMeta: {
           name: {
-            formatter: vm.$hasPerm('users.view_user') ? DetailFormatter : '',
+            formatter: DetailFormatter,
             formatterArgs: {
-              route: 'UserDetail'
+              drawer: true,
+              can: vm.$hasPerm('users.view_user'),
+              getRoute: ({ row }) => {
+                return {
+                  name: 'UserDetail',
+                  params: { id: row.id }
+                }
+              }
             }
           },
           source: {
diff --git a/src/views/settings/Storage/CommandStorage.vue b/src/views/settings/Storage/CommandStorage.vue
index b06330dc7..d217bfb8c 100644
--- a/src/views/settings/Storage/CommandStorage.vue
+++ b/src/views/settings/Storage/CommandStorage.vue
@@ -1,5 +1,10 @@
 <template>
-  <ListTable ref="ListTable" :header-actions="commandActions" :table-config="commandTableConfig" />
+  <ListTable
+    ref="ListTable"
+    :header-actions="commandActions"
+    :table-config="commandTableConfig"
+    :create-drawer="createDrawer"
+  />
 </template>
 
 <script>
@@ -20,6 +25,7 @@ export default {
   data() {
     const vm = this
     return {
+      createDrawer: () => import('./CommandStorageCreateUpdate.vue'),
       commandActions: {
         canCreate: this.$hasPerm('terminal.add_commandstorage'),
         hasExport: false,
@@ -27,9 +33,6 @@ export default {
         hasRefresh: true,
         hasMoreActions: false,
         moreCreates: {
-          callback: (item) => {
-            this.$router.push({ name: 'CreateCommandStorage', query: { type: item.name }})
-          },
           dropdown: [
             {
               name: 'es',
@@ -73,9 +76,6 @@ export default {
               canUpdate: function({ row }) {
                 return (row.name !== 'default' && row.name !== 'null' && vm.$hasPerm('terminal.change_commandstorage'))
               },
-              onUpdate: function({ row }) {
-                this.$router.push({ name: 'CommandStorageUpdate', params: { id: row.id }, query: { type: row.type.value }})
-              },
               canDelete: function({ row }) {
                 return (row.name !== 'default' && row.name !== 'null' && vm.$hasPerm('terminal.delete_commandstorage'))
               },
@@ -123,9 +123,4 @@ export default {
     }
   }
 }
-
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/settings/Storage/ReplayStorage.vue b/src/views/settings/Storage/ReplayStorage.vue
index a8bd7c051..dac75064b 100644
--- a/src/views/settings/Storage/ReplayStorage.vue
+++ b/src/views/settings/Storage/ReplayStorage.vue
@@ -1,5 +1,10 @@
 <template>
-  <ListTable ref="ListTable" :header-actions="replayActions" :table-config="replayTableConfig" />
+  <ListTable
+    ref="ListTable"
+    :header-actions="replayActions"
+    :table-config="replayTableConfig"
+    :create-drawer="createDrawer"
+  />
 </template>
 <script>
 import { DrawerListTable as ListTable } from '@/components'
@@ -15,6 +20,7 @@ export default {
     const vm = this
     const storageOptions = this.getReplayStorageOptions()
     return {
+      createDrawer: () => import('./ReplayStorageCreateUpdate.vue'),
       replayActions: {
         canCreate: this.$hasPerm('terminal.add_replaystorage'),
         hasExport: false,
@@ -22,9 +28,6 @@ export default {
         hasRefresh: true,
         hasMoreActions: false,
         moreCreates: {
-          callback: (item) => {
-            this.$router.push({ name: 'CreateReplayStorage', query: { type: item.name.toLowerCase() }})
-          },
           dropdown: storageOptions
         }
       },
@@ -60,9 +63,6 @@ export default {
           },
           actions: {
             formatterArgs: {
-              onUpdate: function({ row }) {
-                this.$router.push({ name: 'ReplayStorageUpdate', params: { id: row.id }, query: { type: row.type.value }})
-              },
               canUpdate: function({ row }) {
                 return (
                   row.name !== 'default' && row.name !== 'null' && vm.$hasPerm('terminal.change_replaystorage')
diff --git a/src/views/settings/Storage/index.vue b/src/views/settings/Storage/index.vue
index 20140a975..0d1bf0e36 100644
--- a/src/views/settings/Storage/index.vue
+++ b/src/views/settings/Storage/index.vue
@@ -48,7 +48,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>