diff --git a/web/pgadmin/dashboard/templates/dashboard/js/dashboard.js b/web/pgadmin/dashboard/templates/dashboard/js/dashboard.js
index a50807b73..d12e17520 100644
--- a/web/pgadmin/dashboard/templates/dashboard/js/dashboard.js
+++ b/web/pgadmin/dashboard/templates/dashboard/js/dashboard.js
@@ -395,7 +395,7 @@ function(r, $, pgAdmin, _, Backbone) {
 
             var server_activity_columns = [{
                 name: "pid",
-                label: "{{ _('Process ID') }}",
+                label: "{{ _('PID') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -410,12 +410,12 @@ function(r, $, pgAdmin, _, Backbone) {
                 cell: "string"
             }, {
                 name: "application_name",
-                label: "{{ _('Application name') }}",
+                label: "{{ _('Application') }}",
                 editable: false,
                 cell: "string"
             }, {
                 name: "client_addr",
-                label: "{{ _('Client address') }}",
+                label: "{{ _('Client') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -441,13 +441,13 @@ function(r, $, pgAdmin, _, Backbone) {
             } else {
                 server_activity_columns = server_activity_columns.concat(
                 [{
-                    name: "wait_event_type",
-                    label: "{{ _('Wait Event Type') }}",
+                    name: "wait_event",
+                    label: "{{ _('Wait Event') }}",
                     editable: false,
                     cell: "string"
                 },{
-                    name: "wait_event",
-                    label: "{{ _('Wait Event') }}",
+                    name: "blocking_pids",
+                    label: "{{ _('Blocking PIDs') }}",
                     editable: false,
                     cell: "string"
                 }]);
@@ -455,7 +455,7 @@ function(r, $, pgAdmin, _, Backbone) {
 
             var server_locks_columns = [{
                 name: "pid",
-                label: "{{ _('Process ID') }}",
+                label: "{{ _('PID') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -485,7 +485,7 @@ function(r, $, pgAdmin, _, Backbone) {
                 cell: "string"
             }, {
                 name: "virtualxid",
-                label: "{{ _('Virtual XID (target)') }}",
+                label: "{{ _('vXID (target)') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -505,7 +505,7 @@ function(r, $, pgAdmin, _, Backbone) {
                 cell: "string"
             },{
                 name: "virtualtransaction",
-                label: "{{ _('Virtual XID (owner)') }}",
+                label: "{{ _('vXID (owner)') }}",
                 editable: false,
                 cell: "string"
             },{
@@ -518,11 +518,6 @@ function(r, $, pgAdmin, _, Backbone) {
                 label: "{{ _('Granted?') }}",
                 editable: false,
                 cell: "string"
-            },{
-                name: "fastpath",
-                label: "{{ _('Fast path?') }}",
-                editable: false,
-                cell: "string"
             }];
 
             var server_prepared_columns = [{
@@ -677,7 +672,7 @@ function(r, $, pgAdmin, _, Backbone) {
 
             var database_activity_columns = [{
                 name: "pid",
-                label: "{{ _('Process ID') }}",
+                label: "{{ _('PID') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -687,12 +682,12 @@ function(r, $, pgAdmin, _, Backbone) {
                 cell: "string"
             }, {
                 name: "application_name",
-                label: "{{ _('Application name') }}",
+                label: "{{ _('Application') }}",
                 editable: false,
                 cell: "string"
             }, {
                 name: "client_addr",
-                label: "{{ _('Client address') }}",
+                label: "{{ _('Client') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -718,13 +713,13 @@ function(r, $, pgAdmin, _, Backbone) {
             } else {
                 database_activity_columns = database_activity_columns.concat(
                 [{
-                    name: "wait_event_type",
-                    label: "{{ _('Wait Event Type') }}",
+                    name: "wait_event",
+                    label: "{{ _('Wait Event') }}",
                     editable: false,
                     cell: "string"
                 },{
-                    name: "wait_event",
-                    label: "{{ _('Wait Event') }}",
+                    name: "blocking_pids",
+                    label: "{{ _('Blocking PIDs') }}",
                     editable: false,
                     cell: "string"
                 }]);
@@ -732,7 +727,7 @@ function(r, $, pgAdmin, _, Backbone) {
 
             var database_locks_columns = [{
                 name: "pid",
-                label: "{{ _('Process ID') }}",
+                label: "{{ _('PID') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -757,7 +752,7 @@ function(r, $, pgAdmin, _, Backbone) {
                 cell: "string"
             }, {
                 name: "virtualxid",
-                label: "{{ _('Virtual XID (target)') }}",
+                label: "{{ _('vXID (target)') }}",
                 editable: false,
                 cell: "string"
             }, {
@@ -777,7 +772,7 @@ function(r, $, pgAdmin, _, Backbone) {
                 cell: "string"
             },{
                 name: "virtualtransaction",
-                label: "{{ _('Virtual XID (owner)') }}",
+                label: "{{ _('vXID (owner)') }}",
                 editable: false,
                 cell: "string"
             },{
@@ -790,11 +785,6 @@ function(r, $, pgAdmin, _, Backbone) {
                 label: "{{ _('Granted?') }}",
                 editable: false,
                 cell: "string"
-            },{
-                name: "fastpath",
-                label: "{{ _('Fast path?') }}",
-                editable: false,
-                cell: "string"
             }];
 
             var database_prepared_columns = [{
diff --git a/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/activity.sql b/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/activity.sql
index 8e03e29b4..f6ddb5164 100644
--- a/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/activity.sql
+++ b/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/activity.sql
@@ -4,7 +4,7 @@ SELECT
     usename,
     application_name,
     client_addr,
-    backend_start,
+    to_char(backend_start, 'YYYY-MM-DD HH24:MM:SS TZ') AS backend_start,
     state,
     CASE WHEN waiting THEN '{{ _('yes') }}' ELSE '{{ _('no') }}' END AS waiting
 FROM
diff --git a/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/prepared.sql b/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/prepared.sql
index 9801e5b32..4a1e6456b 100644
--- a/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/prepared.sql
+++ b/web/pgadmin/dashboard/templates/dashboard/sql/9.1_plus/prepared.sql
@@ -3,7 +3,7 @@ SELECT
     database,
     owner,
     transaction,
-    prepared
+    to_char(prepared, 'YYYY-MM-DD HH24:MM:SS TZ') AS prepared
 FROM
     pg_prepared_xacts
 {% if did %}WHERE
diff --git a/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/activity.sql b/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/activity.sql
index 1aec651b3..47b9443ca 100644
--- a/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/activity.sql
+++ b/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/activity.sql
@@ -4,10 +4,10 @@ SELECT
     usename,
     application_name,
     client_addr,
-    backend_start,
+    to_char(backend_start, 'YYYY-MM-DD HH24:MM:SS TZ') AS backend_start,
     state,
-    wait_event_type,
-    wait_event
+    wait_event_type || ': ' || wait_event AS wait_event,
+    pg_blocking_pids(pid) AS blocking_pids
 FROM
     pg_stat_activity
 {% if did %}WHERE
diff --git a/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/prepared.sql b/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/prepared.sql
index 9801e5b32..4a1e6456b 100644
--- a/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/prepared.sql
+++ b/web/pgadmin/dashboard/templates/dashboard/sql/9.6_plus/prepared.sql
@@ -3,7 +3,7 @@ SELECT
     database,
     owner,
     transaction,
-    prepared
+    to_char(prepared, 'YYYY-MM-DD HH24:MM:SS TZ') AS prepared
 FROM
     pg_prepared_xacts
 {% if did %}WHERE