diff --git a/src/views/accounts/AccountDiscover/AccountDetail/index.vue b/src/views/accounts/AccountDiscover/AccountDetail/index.vue
index f4805418c..0fc498341 100644
--- a/src/views/accounts/AccountDiscover/AccountDetail/index.vue
+++ b/src/views/accounts/AccountDiscover/AccountDetail/index.vue
@@ -12,6 +12,7 @@ import Info from './info.vue'
 import More from './more.vue'
 
 export default {
+  name: 'AccountDiscoverDetail',
   components: {
     GenericDetailPage,
     Info,
diff --git a/src/views/accounts/AccountDiscover/AccountDetail/info.vue b/src/views/accounts/AccountDiscover/AccountDetail/info.vue
index ae8c78f8d..ebec74f47 100644
--- a/src/views/accounts/AccountDiscover/AccountDetail/info.vue
+++ b/src/views/accounts/AccountDiscover/AccountDetail/info.vue
@@ -6,10 +6,13 @@
 
 <script>
 import AutoDetailCard from '@/components/Cards/DetailCard/auto.vue'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
+  name: 'AccountDiscoverInfo',
   components: {
-    AutoDetailCard
+    AutoDetailCard,
+    TwoCol
   },
   props: {
     object: {
diff --git a/src/views/accounts/AccountDiscover/AccountDetail/more.vue b/src/views/accounts/AccountDiscover/AccountDetail/more.vue
index 3e9205261..eee852be1 100644
--- a/src/views/accounts/AccountDiscover/AccountDetail/more.vue
+++ b/src/views/accounts/AccountDiscover/AccountDetail/more.vue
@@ -9,6 +9,7 @@ import AutoDetailCard from '@/components/Cards/DetailCard/auto.vue'
 import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
+  name: 'AccountDiscoverMore',
   components: {
     TwoCol,
     AutoDetailCard
diff --git a/src/views/accounts/AccountDiscover/AccountDiscoverList.vue b/src/views/accounts/AccountDiscover/AccountDiscoverList.vue
index 17f95d066..afd1ce7b2 100644
--- a/src/views/accounts/AccountDiscover/AccountDiscoverList.vue
+++ b/src/views/accounts/AccountDiscover/AccountDiscoverList.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import AssetTreeTable from '@/components/Apps/AssetTreeTable/index.vue'
+import AssetTreeTable from '@/components/Apps/AssetTreeTable'
 import DeleteDialog from '@/views/accounts/AccountDiscover/DeleteDialog.vue'
 import { gatherAccountHeaderActions, gatherAccountTableConfig } from '@/views/accounts/const'
 import AccountDiscoverDialog from '@/views/assets/Asset/AssetList/components/AccountDiscoverDialog.vue'
diff --git a/src/views/accounts/AccountDiscover/ExecutionDetail/index.vue b/src/views/accounts/AccountDiscover/ExecutionDetail/index.vue
index 1a6ff567e..4515b446b 100644
--- a/src/views/accounts/AccountDiscover/ExecutionDetail/index.vue
+++ b/src/views/accounts/AccountDiscover/ExecutionDetail/index.vue
@@ -11,6 +11,7 @@ import { GenericDetailPage } from '@/layout/components'
 import Info from './info.vue'
 
 export default {
+  name: 'ExecutionDetail',
   components: {
     GenericDetailPage,
     Info
diff --git a/src/views/accounts/AccountDiscover/ExecutionDetail/info.vue b/src/views/accounts/AccountDiscover/ExecutionDetail/info.vue
index c9f6b46ac..7f4cc68f3 100644
--- a/src/views/accounts/AccountDiscover/ExecutionDetail/info.vue
+++ b/src/views/accounts/AccountDiscover/ExecutionDetail/info.vue
@@ -6,10 +6,13 @@
 
 <script>
 import AutoDetailCard from '@/components/Cards/DetailCard/auto.vue'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
+  name: 'ExecutionDetailInfo',
   components: {
-    AutoDetailCard
+    AutoDetailCard,
+    TwoCol
   },
   props: {
     object: {
diff --git a/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue b/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue
index 8eac44d10..67191c1d8 100644
--- a/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue
+++ b/src/views/accounts/AccountDiscover/TaskDetail/Detail.vue
@@ -6,12 +6,14 @@
 
 <script>
 import AutoDetailCard from '@/components/Cards/DetailCard/auto.vue'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 import { toSafeLocalDateStr } from '@/utils/time'
 
 export default {
   name: 'Detail',
   components: {
-    AutoDetailCard
+    AutoDetailCard,
+    TwoCol
   },
   props: {
     object: {
diff --git a/src/views/accounts/AccountDiscover/TaskExecutionList.vue b/src/views/accounts/AccountDiscover/TaskExecutionList.vue
index 0c412d0dc..e40d4e7d4 100644
--- a/src/views/accounts/AccountDiscover/TaskExecutionList.vue
+++ b/src/views/accounts/AccountDiscover/TaskExecutionList.vue
@@ -49,7 +49,8 @@ export default {
                 name: 'AccountDiscoverTaskDetail',
                 params: { id: row.automation },
                 query: { type: 'pam' }
-              })
+              }),
+              drawer: true
             },
             id: ({ row }) => row.automation
           },
diff --git a/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionInfo.vue b/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionInfo.vue
index 0c2fdf00f..8a707fbbe 100644
--- a/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionInfo.vue
+++ b/src/views/accounts/AccountPush/AccountPushExecutionDetail/AccountPushExecutionInfo.vue
@@ -6,11 +6,12 @@
 
 <script>
 import AutoDetailCard from '@/components/Cards/DetailCard/auto.vue'
-
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 export default {
   name: 'AccountPushExecutionInfo',
   components: {
-    AutoDetailCard
+    AutoDetailCard,
+    TwoCol
   },
   props: {
     object: {
diff --git a/src/views/accounts/const.js b/src/views/accounts/const.js
index 7d8e8debf..78c367fc2 100644
--- a/src/views/accounts/const.js
+++ b/src/views/accounts/const.js
@@ -1,11 +1,10 @@
 import { toSafeLocalDateStr } from '@/utils/time'
-import { ActionsFormatter, DiscoverConfirmFormatter } from '@/components/Table/TableFormatters'
+import { ActionsFormatter, DetailFormatter, DiscoverConfirmFormatter } from '@/components/Table/TableFormatters'
 
 export const gatherAccountTableConfig = (vm, url) => {
   if (!url) {
     url = '/api/v1/accounts/gathered-accounts/'
   }
-  const h = vm.$createElement
   return {
     url: url,
     hasTree: true,
@@ -23,25 +22,30 @@ export const gatherAccountTableConfig = (vm, url) => {
     },
     columnsMeta: {
       asset: {
-        formatter: function(row) {
-          const to = {
-            name: 'AssetDetail',
-            params: { id: row.asset.id }
-          }
-          if (vm.$hasPerm('assets.view_asset')) {
-            return h('router-link', { props: { to }}, row.asset.name)
-          } else {
-            return h('span', row.asset.name)
-          }
+        formatter: DetailFormatter,
+        formatterArgs: {
+          can: vm.$hasPerm('assets.view_asset'),
+          getTitle: ({ row }) => row.asset.name,
+          getRoute({ row }) {
+            return {
+              name: 'AssetDetail',
+              params: { id: row.asset.id }
+            }
+          },
+          drawer: true
         }
       },
       username: {
-        formatter: function(row) {
-          const to = {
-            name: 'AccountDiscoverAccountDetail',
-            params: { id: row.id }
-          }
-          return h('router-link', { props: { to }}, row.username)
+        formatter: DetailFormatter,
+        formatterArgs: {
+          can: true,
+          getRoute({ row }) {
+            return {
+              name: 'AccountDiscoverAccountDetail',
+              params: { id: row.id }
+            }
+          },
+          drawer: true
         }
       },
       present: {
diff --git a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/Detail.vue b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/Detail.vue
index 7463e5bf7..851aed02a 100644
--- a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/Detail.vue
+++ b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/Detail.vue
@@ -6,11 +6,13 @@
 
 <script>
 import AutoDetailCard from '@/components/Cards/DetailCard/auto'
+import TwoCol from '@/layout/components/Page/TwoColPage.vue'
 
 export default {
   name: 'CommandFilterAclDetail',
   components: {
-    AutoDetailCard
+    AutoDetailCard,
+    TwoCol
   },
   props: {
     object: {