diff --git a/defaults.inc b/defaults.inc
index c0cdb19..00a3d9d 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -3,7 +3,7 @@
 
 action="${1:-}"
 FOLDER='/opt/idssys/ta-proxmenu'
-VERS='2026.9.22-15'
+VERS='2026.9.22-16'
 
 noupdate=' '
 
diff --git a/inc/ui.inc b/inc/ui.inc
index ba8028b..84654a7 100644
--- a/inc/ui.inc
+++ b/inc/ui.inc
@@ -38,6 +38,24 @@ TAPM_UI_RULE() {
 	TAPM_UI_TEXT "$TAPM_UI_MUTED" "${rule// /-}"
 }
 
+TAPM_UI_SHORTCUTS() {
+	local key description length used=0 gap=''
+	printf ' '
+	while (( $# >= 2 )); do
+		key="$1" description="$2"
+		shift 2
+		length=$((${#key} + 1 + ${#description}))
+		if (( used > 0 && used + 3 + length > TAPM_UI_WIDTH - 2 )); then
+			printf '\n '
+			used=0 gap=''
+		fi
+		printf '%s%s%s%s %s' "$gap" "$TAPM_UI_ACCENT" "$key" "$TAPM_UI_RESET" "$description"
+		used=$((used + ${#gap} + length))
+		gap='   '
+	done
+	printf '\n'
+}
+
 TAPM_UI_TASK() {
 	TAPM_UI_TEXT "$TAPM_UI_ACCENT" "Starting: $(TAPM_UI_PLAIN "$1")"
 	TAPM_UI_RULE
diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh
index 3f1d353..e4ca27d 100755
--- a/proxmenu-scripts.sh
+++ b/proxmenu-scripts.sh
@@ -1788,7 +1788,6 @@ MENU_HEADER() {
 		TAPM_UI_TEXT "$TAPM_UI_BOLD" "$title"
 		TAPM_UI_TEXT "$TAPM_UI_MUTED" "$version"
 	fi
-	TAPM_UI_TEXT "$TAPM_UI_MUTED" 'Proxmox Setup Scripts'
 	TAPM_UI_RULE
 	# Stack context on narrow terminals rather than squeezing both columns.
 	if (( TAPM_UI_WIDTH >= 74 && ${#host} <= 20 && ${#TAPM_HEADER_PVE_VERSION} <= 20 && ${#TAPM_HEADER_CLUSTER} <= 25 && ${#RNIP} <= 25 )); then
@@ -1838,12 +1837,12 @@ SELECT_MENU() {
 		echo
 		local quick_max=${#values_ref[@]}
 		(( quick_max > 9 )) && quick_max=9
-		TAPM_UI_TEXT "$TAPM_UI_MUTED" "↑/↓ Move   Enter Select   1-${quick_max} Quick select"
-		(( allow_space == 0 )) || TAPM_UI_TEXT "$TAPM_UI_MUTED" 'Space Toggle'
+		TAPM_UI_SHORTCUTS '↑/↓' 'Move' 'Enter' 'Select' "1-${quick_max}" 'Quick select'
+		(( allow_space == 0 )) || TAPM_UI_SHORTCUTS 'Space' 'Toggle'
 		if (( allow_back )); then
-			TAPM_UI_TEXT "$TAPM_UI_MUTED" '←/Esc/B Back   Q Quit'
+			TAPM_UI_SHORTCUTS '←/Esc/B' 'Back' 'Q' 'Quit'
 		else
-			TAPM_UI_TEXT "$TAPM_UI_MUTED" 'Q Quit'
+			TAPM_UI_SHORTCUTS 'Q' 'Quit'
 		fi
 		echo