diff --git a/powa/database.py b/powa/database.py
index e9a38cf8..da04f9e4 100644
--- a/powa/database.py
+++ b/powa/database.py
@@ -987,21 +987,27 @@ def dashboard(self):
 
         toprow = [{
                        # query
-                   }, {
-                       # plan time
-                   }, {
-                       'name': 'Execution',
-                       'colspan': 3
-                   }, {
-                       'name': 'Blocks',
-                       'colspan': 4,
-                   }, {
-                       'name': 'Temp blocks',
-                       'colspan': 2
-                   }, {
-                       'name': 'I/O Time',
-                       'colspan': 2
                    }]
+
+        if pgss18:
+            toprow.extend([{
+                       # plan time
+                   }])
+
+        toprow.extend([{
+                'name': 'Execution',
+                'colspan': 3
+            }, {
+                'name': 'Blocks',
+                'colspan': 4,
+            }, {
+                'name': 'Temp blocks',
+                'colspan': 2
+            }, {
+                'name': 'I/O Time',
+                'colspan': 2
+            }])
+
         if pgss18:
             toprow.extend([{
                        'name': 'WALs',
diff --git a/powa/server.py b/powa/server.py
index cca55ff8..eeb65277 100644
--- a/powa/server.py
+++ b/powa/server.py
@@ -1760,26 +1760,38 @@ def dashboard(self):
 
         toprow = [{
                        # database
-                   }, {
+                   }]
+
+        if pgss18:
+            toprow.extend([{
                        # plan time
-                   }, {
-                       'name': 'Execution',
-                       'colspan': 3
-                   }, {
-                       'name': 'Blocks',
-                       'colspan': 4,
-                   }, {
-                       'name': 'Temp blocks',
-                       'colspan': 2
-                   }, {
-                       'name': 'I/O',
-                   }, {
+                   }])
+
+        toprow.extend([{
+                   'name': 'Execution',
+                   'colspan': 3
+               }, {
+                   'name': 'Blocks',
+                   'colspan': 4,
+               }, {
+                   'name': 'Temp blocks',
+                   'colspan': 2
+               }, {
+                   'name': 'I/O',
+               }])
+
+        if pgss18:
+            toprow.extend([{
                        'name': 'WAL',
                        'colspan': 3
-                   }, {
+                       }])
+
+        if pgss110:
+            toprow.extend([{
                        'name': 'JIT',
                        'colspan': 2
-                   }]
+                       }])
+
         dashes = [graphs,
                   [Grid("Details for all databases",
                         toprow=toprow,