diff --git a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
index a5bc4f485..3a7d79661 100644
--- a/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
+++ b/ui/core/app/templates/scopes/scope/auth-methods/index.hbs
@@ -21,16 +21,16 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.cell>{{t 'form.label.name'}}</row.cell>
-            <row.cell>{{t 'form.label.type'}}</row.cell>
-            <row.cell>{{t 'form.label.id'}}</row.cell>
+            <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
+            <row.headerCell>{{t 'form.label.type'}}</row.headerCell>
+            <row.headerCell>{{t 'form.label.id'}}</row.headerCell>
           </header.row>
         </table.header>
 
         <table.body as |body|>
           {{#each @model as |authMethod|}}
             <body.row as |row|>
-              <row.cell>
+              <row.headerCell>
                 <LinkTo
                   @route="scopes.scope.auth-methods.auth-method"
                   @model={{authMethod}}
@@ -38,13 +38,15 @@
                   {{authMethod.name}}
                 </LinkTo>
                 <p>{{authMethod.description}}</p>
-              </row.cell>
+              </row.headerCell>
               <row.cell>
                 <Rose::Badge @style="outline">
                   {{t (concat 'auth.method-types.' authMethod.type)}}
                 </Rose::Badge>
               </row.cell>
-              <row.cell>{{authMethod.id}}</row.cell>
+              <row.cell>
+                <code>{{authMethod.id}}</code>
+              </row.cell>
             </body.row>
           {{/each}}
         </table.body>
diff --git a/ui/core/app/templates/scopes/scope/groups/index.hbs b/ui/core/app/templates/scopes/scope/groups/index.hbs
index cddaa478b..158ea31d0 100644
--- a/ui/core/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/core/app/templates/scopes/scope/groups/index.hbs
@@ -21,22 +21,25 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.cell>{{t 'form.label.name'}}</row.cell>
-            <row.cell>{{t 'form.label.description'}}</row.cell>
+            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
+            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
           {{#each @model as |group|}}
             <body.row as |row|>
-              <row.cell>
+              <row.headerCell>
                 <LinkTo
                   @route="scopes.scope.groups.group"
                   @model={{group}}
                 >
                   {{group.name}}
                 </LinkTo>
+                <p>{{group.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <code>{{group.id}}</code>
               </row.cell>
-              <row.cell>{{group.description}}</row.cell>
             </body.row>
           {{/each}}
         </table.body>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
index 8b7dc963b..a3d132659 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/host-sets/index.hbs
@@ -3,15 +3,15 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.cell>{{t "form.label.name"}}</row.cell>
-        <row.cell>{{t "form.label.type"}}</row.cell>
-        <row.cell>{{t "form.label.id"}}</row.cell>
+        <row.headerCell>{{t "form.label.name"}}</row.headerCell>
+        <row.headerCell>{{t "form.label.type"}}</row.headerCell>
+        <row.headerCell>{{t "form.label.id"}}</row.headerCell>
       </header.row>
     </table.header>
     <table.body as |body|>
       {{#each @model as |hostSet|}}
         <body.row as |row|>
-          <row.cell>
+          <row.headerCell>
             <LinkTo
               @route="scopes.scope.projects.project.host-catalogs.host-catalog.host-sets.host-set"
               @model={{hostSet}}
@@ -19,7 +19,7 @@
               {{hostSet.displayName}}
             </LinkTo>
             <p>{{hostSet.description}}</p>
-          </row.cell>
+          </row.headerCell>
           <row.cell>
             <Rose::Badge @style="outline">{{hostSet.type}}</Rose::Badge>
           </row.cell>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
index 7905988e5..3e5b48c5f 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
@@ -3,15 +3,15 @@
   <Rose::Table as |table|>
     <table.header as |header|>
       <header.row as |row|>
-        <row.cell>{{t "form.label.name"}}</row.cell>
-        <row.cell>{{t "form.label.type"}}</row.cell>
-        <row.cell>{{t "form.label.id"}}</row.cell>
+        <row.headerCell>{{t "form.label.name"}}</row.headerCell>
+        <row.headerCell>{{t "form.label.type"}}</row.headerCell>
+        <row.headerCell>{{t "form.label.id"}}</row.headerCell>
       </header.row>
     </table.header>
     <table.body as |body|>
       {{#each @model as |host|}}
         <body.row as |row|>
-          <row.cell>
+          <row.headerCell>
             <LinkTo
               @route="scopes.scope.projects.project.host-catalogs.host-catalog.hosts.host"
               @model={{host}}
@@ -19,7 +19,7 @@
               {{host.displayName}}
             </LinkTo>
             <p>{{host.description}}</p>
-          </row.cell>
+          </row.headerCell>
           <row.cell>
             <Rose::Badge @style="outline">{{host.type}}</Rose::Badge>
           </row.cell>
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
index 8cc81e3db..56c923f9c 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/index.hbs
@@ -24,18 +24,15 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.cell>{{t "form.label.id"}}</row.cell>
-            <row.cell>{{t "form.label.name"}}</row.cell>
-            <row.cell>{{t "form.label.type"}}</row.cell>
+            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
+            <row.headerCell>{{t "form.label.type"}}</row.headerCell>
+            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
           {{#each @model as |hostCatalog|}}
             <body.row as |row|>
-              <row.cell>
-                <code>{{hostCatalog.id}}</code>
-              </row.cell>
-              <row.cell>
+              <row.headerCell>
                 <LinkTo
                   @route="scopes.scope.projects.project.host-catalogs.host-catalog"
                   @model={{hostCatalog}}
@@ -43,8 +40,11 @@
                   {{hostCatalog.displayName}}
                 </LinkTo>
                 <p>{{hostCatalog.description}}</p>
-              </row.cell>
+              </row.headerCell>
               <row.cell>{{hostCatalog.type}}</row.cell>
+              <row.cell>
+                <code>{{hostCatalog.id}}</code>
+              </row.cell>
             </body.row>
           {{/each}}
         </table.body>
diff --git a/ui/core/app/templates/scopes/scope/roles/index.hbs b/ui/core/app/templates/scopes/scope/roles/index.hbs
index e0e28cf9a..7572875cf 100644
--- a/ui/core/app/templates/scopes/scope/roles/index.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/index.hbs
@@ -21,22 +21,25 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.cell>{{t 'form.label.name'}}</row.cell>
-            <row.cell>{{t 'form.label.description'}}</row.cell>
+            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
+            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
           {{#each @model as |role|}}
             <body.row as |row|>
-              <row.cell>
+              <row.headerCell>
                 <LinkTo
                   @route="scopes.scope.roles.role"
                   @model={{role}}
                 >
                   {{role.displayName}}
                 </LinkTo>
+                <p>{{role.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <code>{{role.id}}</code>
               </row.cell>
-              <row.cell>{{role.description}}</row.cell>
             </body.row>
           {{/each}}
         </table.body>
diff --git a/ui/core/app/templates/scopes/scope/users/index.hbs b/ui/core/app/templates/scopes/scope/users/index.hbs
index fb0a06a09..40c312997 100644
--- a/ui/core/app/templates/scopes/scope/users/index.hbs
+++ b/ui/core/app/templates/scopes/scope/users/index.hbs
@@ -21,8 +21,8 @@
       <Rose::Table as |table|>
         <table.header as |header|>
           <header.row as |row|>
-            <row.headerCell>{{t 'form.label.name'}}</row.headerCell>
-            <row.headerCell>{{t 'form.label.description'}}</row.headerCell>
+            <row.headerCell>{{t "form.label.name"}}</row.headerCell>
+            <row.headerCell>{{t "form.label.id"}}</row.headerCell>
           </header.row>
         </table.header>
         <table.body as |body|>
@@ -35,8 +35,11 @@
                 >
                   {{user.name}}
                 </LinkTo>
+                <p>{{user.description}}</p>
               </row.headerCell>
-              <row.cell>{{user.description}}</row.cell>
+              <row.cell>
+                <code>{{user.id}}</code>
+              </row.cell>
             </body.row>
           {{/each}}
         </table.body>
diff --git a/ui/core/tests/acceptance/host-catalogs-test.js b/ui/core/tests/acceptance/host-catalogs-test.js
index fada1730e..3b79331c9 100644
--- a/ui/core/tests/acceptance/host-catalogs-test.js
+++ b/ui/core/tests/acceptance/host-catalogs-test.js
@@ -69,7 +69,7 @@ module('Acceptance | host catalogs', function (hooks) {
     assert.expect(1);
     authenticateSession({});
     await visit(urls.hostCatalogs);
-    await click('main tbody .rose-table-cell:nth-child(2) a');
+    await click('main tbody .rose-table-header-cell:nth-child(1) a');
     await a11yAudit();
     assert.equal(currentURL(), urls.hostCatalog);
   });