diff --git a/app/views/admin/contact_histories/index.haml b/app/views/admin/contact_histories/index.haml
index 16ec43e50..51b3e791b 100644
--- a/app/views/admin/contact_histories/index.haml
+++ b/app/views/admin/contact_histories/index.haml
@@ -9,14 +9,13 @@
         %thead
           %tr
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'name', t('shared.name'))
+              = t('shared.name')
             %th{class: 'col-xs-1'}
-              = sort_link(@q, 'code', t('shared.code'))
+              = t('shared.contact_id')
             %th{class: 'col-xs-1'}
-              whodunnit
-              = #sort_link(@q, 'ident', t('shared.identity_code'))
+              = sort_link(@q, 'whodunnit', t('shared.whodunnit'))
             %th{class: 'col-xs-2'}
-              deleted_at
+              = sort_link(@q, 'created_at', t('shared.created_at'))
         %tbody
           - @contacts.each do |version|
             - contact = version.reify
@@ -25,7 +24,7 @@
               %td= contact.name #link_to(x, admin_contact_path(x))
               %td= contact.code #link_to(x, admin_contact_path(x))
               %td= version.whodunnit if version
-              %td= version.created_at if version
+              %td= l(version.created_at, format: :short) if version
 .row
   .col-md-12
     = paginate @contacts
diff --git a/app/views/admin/contact_versions/index.haml b/app/views/admin/contact_versions/index.haml
index 48bc01d67..9fcf59617 100644
--- a/app/views/admin/contact_versions/index.haml
+++ b/app/views/admin/contact_versions/index.haml
@@ -33,7 +33,7 @@
               %td= x.code #link_to(x, admin_contact_path(x))
               %td= x.versions.last.whodunnit if x.versions.last
               %td= x.versions.last.event if x.versions.last
-              %td= x.versions.last.created_at if x.versions.last
+              %td= l(x.versions.last.created_at, format: :short) if x.versions.last
               %td= link_to(t('shared.history'), admin_contact_version_path(x), class: 'btn btn-primary btn-xs')
 .row
   .col-md-12
diff --git a/app/views/admin/domain_histories/index.haml b/app/views/admin/domain_histories/index.haml
index 27fd179fd..f65f174b0 100644
--- a/app/views/admin/domain_histories/index.haml
+++ b/app/views/admin/domain_histories/index.haml
@@ -9,12 +9,13 @@
         %thead
           %tr
             %th{class: 'col-xs-2'}
-              = sort_link(@q, 'name', t('shared.name'))
-            %th{class: 'col-xs-1'}
-              whodunnit
-              = #sort_link(@q, 'ident', t('shared.identity_code'))
+              = t('shared.name')
             %th{class: 'col-xs-2'}
-              deleted_at
+              = t('shared.status')
+            %th{class: 'col-xs-1'}
+              = sort_link(@q, 'whodunnit', t('shared.whodunnit'))
+            %th{class: 'col-xs-2'}
+              = sort_link(@q, 'created_at', t('shared.created_at'))
         %tbody
           - @domains.each do |version|
             - domain = version.reify
@@ -23,7 +24,7 @@
               %td= domain.name #link_to(x, admin_contact_path(x))
               %td= domain.status #link_to(x, admin_contact_path(x))
               %td= version.whodunnit if version
-              %td= version.created_at if version
+              %td= l(version.created_at, format: :short) if version
 .row
   .col-md-12
     = paginate @domains
diff --git a/app/views/admin/domain_versions/index.haml b/app/views/admin/domain_versions/index.haml
index 2efb0ad78..b50becbd0 100644
--- a/app/views/admin/domain_versions/index.haml
+++ b/app/views/admin/domain_versions/index.haml
@@ -31,7 +31,7 @@
               %td= domain.owner_contact.name if domain.owner_contact
               %td= domain.versions.last.whodunnit if domain.versions.last
               %td= domain.versions.last.event if domain.versions.last
-              %td= domain.versions.last.created_at if domain.versions.last
+              %td= l(domain.versions.last.created_at, format: :short) if domain.versions.last
               %td= link_to(t('shared.history'), admin_domain_version_path(domain), class: 'btn btn-primary btn-xs')
 
 .row