diff --git a/app/templates/admin/keys/index.hbs b/app/templates/admin/keys/index.hbs
index 42a5fea..36fb0a5 100644
--- a/app/templates/admin/keys/index.hbs
+++ b/app/templates/admin/keys/index.hbs
@@ -8,11 +8,12 @@
 </LinkTo>
 
 <SimpleTable @data={{@model.results}} class='w-full' as |Column data|>
-  <Column @prop='name'>
+  <Column @name="Name or uid">
     <LinkTo @route='admin.keys.key' @model={{data.uid}}>
-      {{data.name}}
+      {{nu-co data.name data.uid}}
     </LinkTo>
   </Column>
   <Column @prop='actions' />
   <Column @prop='indexes' />
+  <Column @prop='expiresAt' />
 </SimpleTable>
diff --git a/app/templates/admin/keys/key.hbs b/app/templates/admin/keys/key.hbs
index 900d53b..27cabae 100644
--- a/app/templates/admin/keys/key.hbs
+++ b/app/templates/admin/keys/key.hbs
@@ -1,4 +1,4 @@
-<Headers::H1 @title={{@model.name}} />
+<Headers::H1 @title={{nu-co @model.name @model.uid}} />
 
 <Tabs>
   <Tab @route="admin.keys.key.index" @text="View" @model={{@model}} />