diff --git a/tatudashboard/enabled/_3980_tatu_panel_group.py b/tatudashboard/enabled/_3980_tatu_panel_group.py
index d8cba0b..dc3389d 100644
--- a/tatudashboard/enabled/_3980_tatu_panel_group.py
+++ b/tatudashboard/enabled/_3980_tatu_panel_group.py
@@ -15,6 +15,6 @@
 # The name of the panel group to be added to HORIZON_CONFIG. Required.
 PANEL_GROUP = 'tatu'
 # The display name of the PANEL_GROUP. Required.
-PANEL_GROUP_NAME = 'Tatu'
+PANEL_GROUP_NAME = 'SSH'
 # The name of the dashboard the PANEL_GROUP associated with. Required.
 PANEL_GROUP_DASHBOARD = 'project'
diff --git a/tatudashboard/enabled/_3985_tatu_host_cert_panel.py b/tatudashboard/enabled/_3985_tatu_host_cert_panel.py
index 1d0391c..00876c4 100644
--- a/tatudashboard/enabled/_3985_tatu_host_cert_panel.py
+++ b/tatudashboard/enabled/_3985_tatu_host_cert_panel.py
@@ -19,7 +19,7 @@ PANEL_DASHBOARD = 'project'
 # If set to True, this dashboard will not be added to the settings.
 DISABLED = False
 
-ADD_PANEL = 'tatudashboard.dashboards.tatu.host.panel.HostCert'
+ADD_PANEL = 'tatudashboard.dashboards.tatu.host_cert.panel.HostCert'
 
 ADD_ANGULAR_MODULES = ['tatudashboard']
 
diff --git a/tatudashboard/static/tatudashboard/resources/os-tatu-host/os-tatu-host.module.js b/tatudashboard/static/tatudashboard/resources/os-tatu-host/os-tatu-host.module.js
index 73ece43..68786ce 100644
--- a/tatudashboard/static/tatudashboard/resources/os-tatu-host/os-tatu-host.module.js
+++ b/tatudashboard/static/tatudashboard/resources/os-tatu-host/os-tatu-host.module.js
@@ -96,7 +96,7 @@
         // listFunctions are expected to return data in "items"
         response.data.items = response.data.hosts;
 
-        util.addTimestampIds(response.data.items, 'host_id');
+        util.addTimestampIds(response.data.items, 'id');
 
         return response;
       });
diff --git a/tatudashboard/static/tatudashboard/resources/os-tatu-pat/api.service.js b/tatudashboard/static/tatudashboard/resources/os-tatu-pat/api.service.js
index f24e681..5bd9993 100644
--- a/tatudashboard/static/tatudashboard/resources/os-tatu-pat/api.service.js
+++ b/tatudashboard/static/tatudashboard/resources/os-tatu-pat/api.service.js
@@ -36,7 +36,6 @@
    */
   function apiService(apiPassthroughUrl, httpService, toastService) {
     var service = {
-      get: get,
       list: list
     };
 
diff --git a/tatudashboard/static/tatudashboard/resources/os-tatu-pat/os-tatu-pat.module.js b/tatudashboard/static/tatudashboard/resources/os-tatu-pat/os-tatu-pat.module.js
index 8441b09..388f70c 100644
--- a/tatudashboard/static/tatudashboard/resources/os-tatu-pat/os-tatu-pat.module.js
+++ b/tatudashboard/static/tatudashboard/resources/os-tatu-pat/os-tatu-pat.module.js
@@ -87,7 +87,7 @@
         // listFunctions are expected to return data in "items"
         response.data.items = response.data.pats;
 
-        util.addTimestampIds(response.data.items, 'lport');
+        util.addTimestampIds(response.data.items, 'ip');
 
         return response;
       });
diff --git a/tatudashboard/static/tatudashboard/resources/os-tatu-user/os-tatu-user.module.js b/tatudashboard/static/tatudashboard/resources/os-tatu-user/os-tatu-user.module.js
index c423ca5..36d333f 100644
--- a/tatudashboard/static/tatudashboard/resources/os-tatu-user/os-tatu-user.module.js
+++ b/tatudashboard/static/tatudashboard/resources/os-tatu-user/os-tatu-user.module.js
@@ -96,15 +96,15 @@
     resourceType
       .tableColumns
       .append({
-        id: 'user_id',
+        id: 'serial',
         priority: 1
       })
       .append({
-        id: 'fingerprint',
+        id: 'user_name',
         priority: 2
       })
       .append({
-        id: 'auth_id',
+        id: 'principals',
         priority: 2
       })
       .append({
@@ -114,20 +114,12 @@
       .append({
         id: 'expires_at',
         priority: 2
-      })
-      .append({
-        id: 'principals',
-        priority: 2
-      })
-      .append({
-        id: 'serial',
-        priority: 2
-      })
-      .append({
+      });
+      /*.append({
         id: 'cert',
         priority: 2,
         filters: [function(input){ return $filter('limitTo')(input, 50, 0); }]
-      });
+      });*/
 
 
     function listUsers() {