diff --git a/modules/Cpu.qml b/modules/Cpu.qml
index a34c45e..58d41e7 100644
--- a/modules/Cpu.qml
+++ b/modules/Cpu.qml
@@ -113,14 +113,44 @@ M.BarSection {
             }
 
             Text {
+                id: _headerFreq
                 anchors.right: parent.right
                 anchors.rightMargin: 12
                 anchors.verticalCenter: parent.verticalCenter
-                text: root.usage + "%  " + root.freqGhz.toFixed(2) + " GHz"
+                text: root.freqGhz.toFixed(2) + " GHz"
                 color: root.accentColor
                 font.pixelSize: M.Theme.fontSize
                 font.family: M.Theme.fontFamily
                 font.bold: true
+                width: _headerFreqSizer.implicitWidth
+                horizontalAlignment: Text.AlignRight
+
+                Text {
+                    id: _headerFreqSizer
+                    visible: false
+                    text: "9.99 GHz"
+                    font: parent.font
+                }
+            }
+
+            Text {
+                anchors.right: _headerFreq.left
+                anchors.rightMargin: 6
+                anchors.verticalCenter: parent.verticalCenter
+                text: root.usage + "%"
+                color: root.accentColor
+                font.pixelSize: M.Theme.fontSize
+                font.family: M.Theme.fontFamily
+                font.bold: true
+                width: _headerUsageSizer.implicitWidth
+                horizontalAlignment: Text.AlignRight
+
+                Text {
+                    id: _headerUsageSizer
+                    visible: false
+                    text: "100%"
+                    font: parent.font
+                }
             }
         }
 
@@ -274,6 +304,33 @@ M.BarSection {
             color: M.Theme.base03
         }
 
+        Item {
+            width: hoverPanel.contentWidth
+            height: 18
+
+            Text {
+                anchors.left: parent.left
+                anchors.leftMargin: 12
+                anchors.verticalCenter: parent.verticalCenter
+                text: "PROCESS"
+                color: M.Theme.base03
+                font.pixelSize: M.Theme.fontSize - 3
+                font.family: M.Theme.fontFamily
+                font.letterSpacing: 1
+            }
+
+            Text {
+                anchors.right: parent.right
+                anchors.rightMargin: 12
+                anchors.verticalCenter: parent.verticalCenter
+                text: "CPU"
+                color: M.Theme.base03
+                font.pixelSize: M.Theme.fontSize - 3
+                font.family: M.Theme.fontFamily
+                font.letterSpacing: 1
+            }
+        }
+
         // Top processes by CPU
         Repeater {
             model: root._procs.processes
diff --git a/modules/Memory.qml b/modules/Memory.qml
index 736df3a..0713095 100644
--- a/modules/Memory.qml
+++ b/modules/Memory.qml
@@ -228,6 +228,33 @@ M.BarSection {
             color: M.Theme.base03
         }
 
+        Item {
+            width: hoverPanel.contentWidth
+            height: 18
+
+            Text {
+                anchors.left: parent.left
+                anchors.leftMargin: 12
+                anchors.verticalCenter: parent.verticalCenter
+                text: "PROCESS"
+                color: M.Theme.base03
+                font.pixelSize: M.Theme.fontSize - 3
+                font.family: M.Theme.fontFamily
+                font.letterSpacing: 1
+            }
+
+            Text {
+                anchors.right: parent.right
+                anchors.rightMargin: 12
+                anchors.verticalCenter: parent.verticalCenter
+                text: "MEM"
+                color: M.Theme.base03
+                font.pixelSize: M.Theme.fontSize - 3
+                font.family: M.Theme.fontFamily
+                font.letterSpacing: 1
+            }
+        }
+
         // Top processes by memory
         Repeater {
             model: root._procs.processes