diff --git a/functions/backup.sh b/functions/backup.sh
index c0acb93f..43b44b70 100644
--- a/functions/backup.sh
+++ b/functions/backup.sh
@@ -31,193 +31,146 @@ export -f backup
 
 
 deleteBackup(){
+clear -x && echo "pulling all restore points.."
+list_backups=$(cli -c 'app kubernetes list_backups' | sort -t '_' -Vr -k2,7 | tr -d " \t\r"  | awk -F '|'  '{print $2}' | nl -s ") " | column -t)
+if [[ -z "$list_backups" ]]; then
+    echo "No restore points available"
+    exit
+fi
+
+#Select a restore point
 while true
 do
-    clear -x && echo "pulling all restore points.."
-    list_backups=$(cli -c 'app kubernetes list_backups' | sort -t '_' -Vr -k2,7 | tr -d " \t\r"  | awk -F '|'  '{print $2}' | nl -s ") " | column -t)
-    if [[ -z "$list_backups" ]]; then
-        echo "No restore points available"
+    clear -x
+    title
+    echo -e "Choose a Restore Point to Delete\nThese may be out of order if they are not HeavyScript backups"
+    echo "$list_backups"
+    echo
+    echo "0)  Exit"
+    read -rt 240 -p "Please type a number: " selection || { echo -e "\nFailed to make a selection in time" ; exit; }
+    restore_point=$(echo "$list_backups" | grep ^"$selection)" | awk '{print $2}')
+    if [[ $selection == 0 ]]; then
+        echo "Exiting.." 
         exit
+    elif [[ -z "$selection" ]]; then 
+        echo "Your selection cannot be empty"
+        sleep 3
+        continue
+    elif [[ -z "$restore_point" ]]; then
+        echo "Invalid Selection: $selection, was not an option"
+        sleep 3
+        continue
     fi
-    while true
-    do
-        clear -x
-        title
-        echo -e "Choose a Restore Point to Delete\nThese may be out of order if they are not HeavyScript backups"
-        echo "$list_backups"
-        echo
-        echo "0)  Exit"
-        read -rt 240 -p "Please type a number: " selection || { echo -e "\nFailed to make a selection in time" ; exit; }
-        restore_point=$(echo "$list_backups" | grep ^"$selection)" | awk '{print $2}')
-        if [[ $selection == 0 ]]; then
-            echo "Exiting.." 
+    break # Break out of the loop if all of the If statement checks above are untrue
+done
+
+#Confirm deletion
+while true
+do
+    clear -x
+    echo -e "WARNING:\nYou CANNOT go back after deleting your restore point" 
+    echo -e "\n\nYou have chosen:\n$restore_point\n\n"
+    read -rt 120 -p "Would you like to proceed with deletion? (y/N): " yesno  || { echo -e "\nFailed to make a selection in time" ; exit; }
+    case $yesno in
+        [Yy] | [Yy][Ee][Ss])
+            echo -e "\nDeleting $restore_point"
+            cli -c 'app kubernetes delete_backup backup_name=''"'"$restore_point"'"' &>/dev/null || { echo "Failed to delete backup.."; exit; }
+            echo "Sucessfully deleted"
+            break
+            ;;
+        [Nn] | [Nn][Oo])
+            echo "Exiting"
             exit
-        elif [[ -z "$selection" ]]; then 
-            echo "Your selection cannot be empty"
+            ;;
+        *)
+            echo "That was not an option, try again"
             sleep 3
             continue
-        elif [[ -z "$restore_point" ]]; then
-            echo "Invalid Selection: $selection, was not an option"
-            sleep 3
+            ;;
+    esac
+done
+
+#Check if there are more backups to delete
+while true
+do
+    read -rt 120 -p "Delete more backups? (y/N): " yesno || { echo -e "\nFailed to make a selection in time" ; exit; }
+    case $yesno in
+        [Yy] | [Yy][Ee][Ss])
+            break
+            ;;
+        [Nn] | [Nn][Oo])
+            exit
+            ;;
+        *)
+            echo "$yesno was not an option, try again" 
+            sleep 2
             continue
-        fi
-        break # Break out of the loop if all of the If statement checks above are untrue
-    done
-    while true
-    do
-        clear -x
-        echo -e "WARNING:\nYou CANNOT go back after deleting your restore point" 
-        echo -e "\n\nYou have chosen:\n$restore_point\n\n"
-        read -rt 120 -p "Would you like to proceed with deletion? (y/N): " yesno  || { echo -e "\nFailed to make a selection in time" ; exit; }
-        case $yesno in
-            [Yy] | [Yy][Ee][Ss])
-                echo -e "\nDeleting $restore_point"
-                cli -c 'app kubernetes delete_backup backup_name=''"'"$restore_point"'"' &>/dev/null || { echo "Failed to delete backup.."; exit; }
-                echo "Sucessfully deleted"
-                break
-                ;;
-            [Nn] | [Nn][Oo])
-                echo "Exiting"
-                exit
-                ;;
-            *)
-                echo "That was not an option, try again"
-                sleep 3
-                continue
-                ;;
-        esac
-    done
-    while true
-    do
-        read -rt 120 -p "Delete more backups? (y/N): " yesno || { echo -e "\nFailed to make a selection in time" ; exit; }
-        case $yesno in
-            [Yy] | [Yy][Ee][Ss])
-                break
-                ;;
-            [Nn] | [Nn][Oo])
-                exit
-                ;;
-            *)
-                echo "$yesno was not an option, try again" 
-                sleep 2
-                continue
-                ;;
+            ;;
 
-        esac
+    esac
 
-    done
 done
 }
 export -f deleteBackup
 
 
 restore(){
+clear -x && echo "pulling restore points.."
+list_backups=$(cli -c 'app kubernetes list_backups' | grep -E "HeavyScript_|TrueTool_" | sort -t '_' -Vr -k2,7 | tr -d " \t\r"  | awk -F '|'  '{print $2}' | nl -s ") " | column -t)
+if [[ -z "$list_backups" ]]; then
+    echo "No HeavyScript restore points available"
+    exit
+fi
+
+#Select a restore point
 while true
 do
-    clear -x && echo "pulling restore points.."
-    list_backups=$(cli -c 'app kubernetes list_backups' | grep -E "HeavyScript_|TrueTool_" | sort -t '_' -Vr -k2,7 | tr -d " \t\r"  | awk -F '|'  '{print $2}' | nl -s ") " | column -t)
-    if [[ -z "$list_backups" ]]; then
-        echo "No HeavyScript restore points available"
+    clear -x
+    title
+    echo "Choose a Restore Point"
+    echo "$list_backups"
+    echo
+    echo "0)  Exit"
+    read -rt 240 -p "Please type a number: " selection || { echo -e "\nFailed to make a selection in time" ; exit; }
+    restore_point=$(echo "$list_backups" | grep ^"$selection)" | awk '{print $2}')
+    if [[ $selection == 0 ]]; then
+        echo "Exiting.." 
         exit
+    elif [[ -z "$selection" ]]; then 
+        echo "Your selection cannot be empty"
+        sleep 3
+        continue
+    elif [[ -z "$restore_point" ]]; then
+        echo "Invalid Selection: $selection, was not an option"
+        sleep 3
+        continue
     fi
-    while true
-    do
-        clear -x
-        title
-        echo "Choose a Restore Point"
-        echo "$list_backups"
-        echo
-        echo "0)  Exit"
-        read -rt 240 -p "Please type a number: " selection || { echo -e "\nFailed to make a selection in time" ; exit; }
-        restore_point=$(echo "$list_backups" | grep ^"$selection)" | awk '{print $2}')
-        if [[ $selection == 0 ]]; then
-            echo "Exiting.." 
-            exit
-        elif [[ -z "$selection" ]]; then 
-            echo "Your selection cannot be empty"
-            sleep 3
-            continue
-        elif [[ -z "$restore_point" ]]; then
-            echo "Invalid Selection: $selection, was not an option"
-            sleep 3
-            continue
-        fi
-        break
-    done
+    break
+done
 
 
-    # Get the date of system version and when it was updated
-    current_version=$(cli -m csv -c 'system version' | awk -F '-' '{print $3}')
-    when_updated=$(cli -m csv -c 'system bootenv query created,realname' | grep "$current_version",\
-    | awk -F ',' '{print $2}' | sed 's/[T|-]/_/g' | sed 's/:/_/g' | awk -F '_' '{print $1 $2 $3 $4 $5}')
+# Get the date of system version and when it was updated
+current_version=$(cli -m csv -c 'system version' | awk -F '-' '{print $3}')
+when_updated=$(cli -m csv -c 'system bootenv query created,realname' | grep "$current_version",\
+| awk -F ',' '{print $2}' | sed 's/[T|-]/_/g' | sed 's/:/_/g' | awk -F '_' '{print $1 $2 $3 $4 $5}')
 
 
-    # Get the date of the chosen restore point
-    restore_point_date=$(echo "$restore_point" | awk -F '_' '{print $2 $3 $4 $5 $6}' | tr -d "_")
+# Get the date of the chosen restore point
+restore_point_date=$(echo "$restore_point" | awk -F '_' '{print $2 $3 $4 $5 $6}' | tr -d "_")
 
 
-    # Compare the dates
-    if (("$restore_point_date" < "$when_updated" )); then
-        clear -x
-        echo "The restore point you have chosen is from an older version of Truenas Scale"
-        echo "This is not recommended, as it may cause issues with the system"
-        if read -rt 120 -p "Would you like to proceed? (y/N): " yesno || { echo -e "\nFailed to make a selection in time" ; exit; }; then
-            case $yesno in
-                [Yy] | [Yy][Ee][Ss])
-                    echo "Proceeding.."
-                    sleep 3
-                    ;;
-                [Nn] | [Nn][Oo])
-                    echo "Exiting"
-                    exit
-                    ;;
-                *)
-                    echo "That was not an option, try again"
-                    sleep 3
-                    continue
-                    ;;
-            esac
-        fi
-    fi
-
-
-    while true
-    do
-        clear -x
-        echo -e "WARNING:\nThis is NOT guranteed to work\nThis is ONLY supposed to be used as a LAST RESORT\nConsider rolling back your applications instead if possible"
-        echo -e "\n\nYou have chosen:\n$restore_point\n\n"
-        read -rt 120 -p "Would you like to proceed with restore? (y/N): " yesno || { echo -e "\nFailed to make a selection in time" ; exit; }
+# Compare the dates
+while (("$restore_point_date" < "$when_updated" ))
+do
+    clear -x
+    echo "The restore point you have chosen is from an older version of Truenas Scale"
+    echo "This is not recommended, as it may cause issues with the system"
+    if read -rt 120 -p "Would you like to proceed? (y/N): " yesno || { echo -e "\nFailed to make a selection in time" ; exit; }; then
         case $yesno in
             [Yy] | [Yy][Ee][Ss])
-                pool=$(cli -c 'app kubernetes config' | grep -E "pool\s\|" | awk -F '|' '{print $3}' | tr -d " \t\n\r")
-
-                # Set mountpoints to legacy prior to restore, ensures correct properties for the are set
-                echo -e "\nSetting correct ZFS properties for application volumes.."
-                for pvc in $(zfs list -t filesystem -r "$pool"/ix-applications/releases -o name -H | grep "volumes/pvc")
-                do
-                    if zfs set mountpoint=legacy "$pvc"; then
-                        echo "Success for - \"$pvc\""
-                    else
-                        echo "Error: Setting properties for \"$pvc\", failed.."
-                    fi
-                done
-
-                # Ensure readonly is turned off
-                if ! zfs set readonly=off "$pool"/ix-applications;then
-                    echo -e "Error: Failed to set ZFS ReadOnly to \"off\""
-                    echo -e "After the restore, attempt to run the following command manually:"
-                    echo "zfs set readonly=off $pool/ix-applications"
-                fi
-
-                echo "Finished setting properties.."
-
-                # Beginning snapshot restore
-                echo -e "\nStarting restore, this will take a LONG time."
-                if ! cli -c 'app kubernetes restore_backup backup_name=''"'"$restore_point"'"'; then
-                    echo "Restore failed, exiting.."
-                    exit 1
-                fi
-                exit
+                echo "Proceeding.."
+                sleep 3
+                break
                 ;;
             [Nn] | [Nn][Oo])
                 echo "Exiting"
@@ -229,7 +182,60 @@ do
                 continue
                 ;;
         esac
-    done
+    fi
 done
+
+
+#Confirm restore
+while true
+do
+    clear -x
+    echo -e "WARNING:\nThis is NOT guranteed to work\nThis is ONLY supposed to be used as a LAST RESORT\nConsider rolling back your applications instead if possible"
+    echo -e "\n\nYou have chosen:\n$restore_point\n\n"
+    read -rt 120 -p "Would you like to proceed with restore? (y/N): " yesno || { echo -e "\nFailed to make a selection in time" ; exit; }
+    case $yesno in
+        [Yy] | [Yy][Ee][Ss])
+            pool=$(cli -c 'app kubernetes config' | grep -E "pool\s\|" | awk -F '|' '{print $3}' | tr -d " \t\n\r")
+
+            # Set mountpoints to legacy prior to restore, ensures correct properties for the are set
+            echo -e "\nSetting correct ZFS properties for application volumes.."
+            for pvc in $(zfs list -t filesystem -r "$pool"/ix-applications/releases -o name -H | grep "volumes/pvc")
+            do
+                if zfs set mountpoint=legacy "$pvc"; then
+                    echo "Success for - \"$pvc\""
+                else
+                    echo "Error: Setting properties for \"$pvc\", failed.."
+                fi
+            done
+
+            # Ensure readonly is turned off
+            if ! zfs set readonly=off "$pool"/ix-applications;then
+                echo -e "Error: Failed to set ZFS ReadOnly to \"off\""
+                echo -e "After the restore, attempt to run the following command manually:"
+                echo "zfs set readonly=off $pool/ix-applications"
+            fi
+
+            echo "Finished setting properties.."
+
+            # Beginning snapshot restore
+            echo -e "\nStarting restore, this will take a LONG time."
+            if ! cli -c 'app kubernetes restore_backup backup_name=''"'"$restore_point"'"'; then
+                echo "Restore failed, exiting.."
+                exit 1
+            fi
+            exit
+            ;;
+        [Nn] | [Nn][Oo])
+            echo "Exiting"
+            exit
+            ;;
+        *)
+            echo "That was not an option, try again"
+            sleep 3
+            continue
+            ;;
+    esac
+done
+
 }
 export -f restore
\ No newline at end of file