diff --git a/quickshell/Modals/ProcessListModal.qml b/quickshell/Modals/ProcessListModal.qml
index 05c63fa5..a313fbd6 100644
--- a/quickshell/Modals/ProcessListModal.qml
+++ b/quickshell/Modals/ProcessListModal.qml
@@ -512,7 +512,7 @@ FloatingWindow {
                         }
 
                         StyledText {
-                            text: DgopService.shortUptime || "--"
+                            text: DgopService.shortUptime ? DgopService.shortUptime.slice(2) : "--"
                             font.pixelSize: Theme.fontSizeSmall
                             font.weight: Font.Bold
                             color: Theme.surfaceText
diff --git a/quickshell/Modules/ProcessList/ProcessContextMenu.qml b/quickshell/Modules/ProcessList/ProcessContextMenu.qml
index 7b975be9..997e3a17 100644
--- a/quickshell/Modules/ProcessList/ProcessContextMenu.qml
+++ b/quickshell/Modules/ProcessList/ProcessContextMenu.qml
@@ -281,6 +281,8 @@ Popup {
                         Row {
                             anchors.left: parent.left
                             anchors.leftMargin: Theme.spacingS
+                            anchors.right: parent.right
+                            anchors.rightMargin: Theme.spacingS
                             anchors.verticalCenter: parent.verticalCenter
                             spacing: Theme.spacingS
 
@@ -311,6 +313,8 @@ Popup {
                                     return Theme.surfaceText;
                                 }
                                 anchors.verticalCenter: parent.verticalCenter
+                                elide: Text.ElideRight
+                                width: parent.width - 16 - Theme.spacingS
                             }
                         }
 
diff --git a/quickshell/Modules/ProcessList/SystemView.qml b/quickshell/Modules/ProcessList/SystemView.qml
index 262c8205..ffa1d99a 100644
--- a/quickshell/Modules/ProcessList/SystemView.qml
+++ b/quickshell/Modules/ProcessList/SystemView.qml
@@ -78,7 +78,7 @@ Item {
                     }
                     InfoRow {
                         label: I18n.tr("Uptime")
-                        value: DgopService.uptime || "--"
+                        value: DgopService.uptime ? DgopService.uptime.slice(3) : "--"
                     }
                     InfoRow {
                         label: I18n.tr("Load Average", "system info label")
diff --git a/quickshell/Modules/Settings/CompositorLayoutTab.qml b/quickshell/Modules/Settings/CompositorLayoutTab.qml
index 87e11cd5..ed27c8ae 100644
--- a/quickshell/Modules/Settings/CompositorLayoutTab.qml
+++ b/quickshell/Modules/Settings/CompositorLayoutTab.qml
@@ -14,8 +14,7 @@ Item {
         Column {
             id: layoutColumn
 
-            topPadding: Theme.spacingXL
-            bottomPadding: Theme.spacingXL
+            topPadding: 4
             width: Math.min(550, parent.width - Theme.spacingL * 2)
             anchors.horizontalCenter: parent.horizontalCenter
             spacing: Theme.spacingXL
diff --git a/quickshell/Modules/Settings/TimeWeatherTab.qml b/quickshell/Modules/Settings/TimeWeatherTab.qml
index b78272de..975f35e7 100644
--- a/quickshell/Modules/Settings/TimeWeatherTab.qml
+++ b/quickshell/Modules/Settings/TimeWeatherTab.qml
@@ -155,7 +155,7 @@ Item {
                     tags: ["date", "format", "topbar"]
                     settingKey: "clockDateFormat"
                     text: I18n.tr("Top Bar Format")
-                    description: "Preview: " + (SettingsData.clockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat) : new Date().toLocaleDateString(I18n.locale(), "ddd d"))
+                    description: I18n.tr("Preview: %1").arg(SettingsData.clockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat) : new Date().toLocaleDateString(I18n.locale(), "ddd d"))
                     options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
                     currentValue: {
                         if (!SettingsData.clockDateFormat || SettingsData.clockDateFormat.length === 0)
@@ -242,7 +242,7 @@ Item {
                     tags: ["date", "format", "lock", "screen"]
                     settingKey: "lockDateFormat"
                     text: I18n.tr("Lock Screen Format")
-                    description: "Preview: " + (SettingsData.lockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.lockDateFormat) : new Date().toLocaleDateString(I18n.locale(), Locale.LongFormat))
+                    description: I18n.tr("Preview: %1").arg(SettingsData.lockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.lockDateFormat) : new Date().toLocaleDateString(I18n.locale(), Locale.LongFormat))
                     options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
                     currentValue: {
                         if (!SettingsData.lockDateFormat || SettingsData.lockDateFormat.length === 0)
diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json
index 7aef492c..32d51e19 100644
--- a/quickshell/translations/settings_search_index.json
+++ b/quickshell/translations/settings_search_index.json
@@ -529,7 +529,8 @@
       "security",
       "time",
       "weather"
-    ]
+    ],
+    "description": "Preview: %1"
   },
   {
     "section": "padHours12Hour",
@@ -646,7 +647,8 @@
       "top",
       "topbar",
       "weather"
-    ]
+    ],
+    "description": "Preview: %1"
   },
   {
     "section": "useFahrenheit",