diff --git a/test.uefi b/test.uefi
index 70ca5bd..baa3b98 100644
--- a/test.uefi
+++ b/test.uefi
@@ -153,7 +153,7 @@ INFO_USRHASH+=([PRESENT]="0")
 INFO_ROOT+=([PRESENT]="0")
 
 # Check if GUIDS existieren
-GUIDS_OUTPUT=$(lsblk -plo PARTUUID,PARTTYPE,PARTN,NAME | grep -i "${DRIVE}" | sed 's/[[:blank:]]\+/ /g')
+GUIDS_OUTPUT=$(lsblk -plo PARTN,PARTUUID,PARTTYPE,NAME | grep -i "${DRIVE}" | sed 's/[[:blank:]]\+/ /g')
 for guid in "${!GUIDS[@]}"; do
   CHECK=$(echo "${GUIDS_OUTPUT}" | grep -ic "${GUIDS[$guid]}")
   if [[ ${CHECK} -eq 1 ]]; then
@@ -161,32 +161,33 @@ for guid in "${!GUIDS[@]}"; do
     case $guid in
       "ROOT" )
         INFO_ROOT+=([PRESENT]="1")
-        INFO_ROOT+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
-        INFO_ROOT+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 3))
+        INFO_ROOT+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 2))
+        INFO_ROOT+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
         echo "ROOT: " "${INFO_ROOT[@]}"
         ;;
       "USR" )
         INFO_USR+=([PRESENT]="1")
-        INFO_USR+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
-        INFO_USR+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 3))
+        INFO_USR+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 2))
+        INFO_USR+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
         echo "USR: " "${INFO_USR[@]}"
         ;;
       "USRHASH" )
         INFO_USRHASH+=([PRESENT]="1")
-        INFO_USRHASH+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
-        INFO_USRHASH+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 3))
+        INFO_USRHASH+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 2))
+        INFO_USRHASH+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
         echo "USRHASH: " "${INFO_USRHASH[@]}"
         ;;
       "ESP" )
         INFO_ESP+=([PRESENT]="1")
-        INFO_ESP+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
-        INFO_ESP+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 3))
+        INFO_ESP+=([PARTUUID]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 2))
+        INFO_ESP+=([PARTNUM]=$(echo "${GUIDS_OUTPUT}" | grep -i "${GUIDS[$guid]}" | cut -d ' ' -f 1))
         echo "ESP: " "${INFO_ESP[@]}"
         ;;
     esac
   elif [[ ${CHECK} -gt 1 ]]; then
-    echo "Mehrere " "${guid}" " Partitionen existieren."
+    echo "Mehrere" "${guid}" "Partitionen existieren."
     echo "Partition auswählen:"
+    echo "${GUIDS_OUTPUT}" | sed 's/\([0-9]\)\s\(.{32}\)/\1) \2/g'
   else
     echo "${guid}" "GUID nicht gefunden."
     echo "Abbrechen"