diff --git a/usr/lib/archboot/installer/storage.sh b/usr/lib/archboot/installer/storage.sh
index 87d5c000d..784d6f2e3 100644
--- a/usr/lib/archboot/installer/storage.sh
+++ b/usr/lib/archboot/installer/storage.sh
@@ -17,21 +17,16 @@ _create_raid_menu() {
             "2" "Create Partitionable Software Raid" \
             "3" "Reset Software Raid" \
             "4" "Raid Help" \
-            "5" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
+            "<" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
         _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
-            "1")
-                _RAID_PARTITION=""
-                _createmd ;;
-            "2")
-                _RAID_PARTITION=1
-                _createmd ;;
-            "3")
-                _stopmd ;;
-            "4")
-                _helpmd ;;
-              *)
-                _MDDONE=1 ;;
+            "1") _RAID_PARTITION=""
+                 _createmd ;;
+            "2") _RAID_PARTITION=1
+                 _createmd ;;
+            "3") _stopmd ;;
+            "4") _helpmd ;;
+              *) _MDDONE=1 ;;
         esac
     done
     _NEXTITEM=1
@@ -54,21 +49,15 @@ _create_lvm_menu() {
             "3" "Create Logical Volume" \
             "4" "Reset Logical Volume" \
             "5" "LVM Help" \
-            "6" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
+            "<" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
         _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
-            "1")
-                _createpv ;;
-            "2")
-                _createvg ;;
-            "3")
-                _createlv ;;
-            "4")
-                _stoplvm ;;
-            "5")
-                _helplvm ;;
-              *)
-                _LVMDONE=1 ;;
+            "1") _createpv ;;
+            "2") _createvg ;;
+            "3") _createlv ;;
+            "4") _stoplvm ;;
+            "5") _helplvm ;;
+              *) _LVMDONE=1 ;;
         esac
     done
     _NEXTITEM="2"
@@ -89,17 +78,13 @@ _create_luks_menu() {
             "1" "Create Luks" \
             "2" "Reset Luks Encryption" \
             "3" "Luks Help" \
-            "4" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
+            "<" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
         _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
-            "1")
-                _createluks ;;
-            "2")
-                _stopluks ;;
-            "3")
-                _helpluks ;;
-              *)
-                _LUKSDONE=1 ;;
+            "1") _createluks ;;
+            "2") _stopluks ;;
+            "3") _helpluks ;;
+              *) _LUKSDONE=1 ;;
         esac
     done
     _NEXTITEM="3"
@@ -120,17 +105,13 @@ _create_special() {
             "1" "Manage Software Raid" \
             "2" "Manage Logical Volume Manager" \
             "3" "Manage LUKS Encryption" \
-            "4" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
+            "<" "Return To Previous Menu" 2>"${_ANSWER}" || _CANCEL=1
         _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
-            "1")
-                _create_raid_menu ;;
-            "2")
-                _create_lvm_menu ;;
-            "3")
-                _create_luks_menu ;;
-            *)
-                _SPECIALDONE=1 ;;
+            "1") _create_raid_menu ;;
+            "2") _create_lvm_menu ;;
+            "3") _create_luks_menu ;;
+              *) _SPECIALDONE=1 ;;
         esac
     done
     if [[ -n "${_CANCEL}" ]]; then