diff --git a/Amelia.sh b/Amelia.sh
index 65b37a5..0a9972e 100644
--- a/Amelia.sh
+++ b/Amelia.sh
@@ -541,6 +541,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Local
 Enter your Locale ${bwhite}(empty for 'en_US')${blue}: "
         read -r -p "
 ==> " LOCALESET
+        echo
 
     if [[ -z "${LOCALESET}" ]]; then
         SETLOCALE="en_US.UTF-8"
@@ -588,6 +589,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Keyboard
 Enter your keyboard layout ${bwhite}(empty for 'us')${blue}: "
         read -r -p "
 ==> " SETKBD
+        echo
 
     if [[ -z "${SETKBD}" ]]; then
         SETKBD="us"
@@ -632,12 +634,14 @@ Enter a username: "
     if [[ -z "${USERNAME}" ]]; then
         sleep 0.3
         RED "
+
         [!] Please enter a username to continue "
         reload
         return 1
     elif [[ "${USERNAME}" =~ [[:upper:]] ]]; then
         sleep 0.3
         RED "
+
         [!] Uppercase is not allowed. Please try again.. "
         reload
         return 1
@@ -652,6 +656,7 @@ Enter a password for${nc} ${cyan}${USERNAME}${blue}: "
     if [[ -z "${USERPASSWD}" ]]; then
         sleep 0.3
         RED "
+
         [!] Please enter a password for ${USERNAME} to continue "
         reload
         return 1
@@ -666,6 +671,7 @@ Re-enter${nc} ${cyan}${USERNAME}'s ${blue}password: "
     if [[ "${USERPASSWD}" != "${USERPASSWD2}" ]]; then
         sleep 0.3
         RED "
+
         [!] Passwords don't match. Please try again.. "
         reload
         return 1
@@ -687,6 +693,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Root
 Enter a password for the${nc}${cyan} Root ${blue}user: "
         read -r -p "
 ==> " ROOTPASSWD
+        echo
 
     if [[ -z "${ROOTPASSWD}" ]]; then
         sleep 0.3
@@ -706,6 +713,7 @@ Re-enter${nc} ${cyan}Root ${blue}user's password: "
     if [[ "${ROOTPASSWD}" != "${ROOTPASSWD2}" ]]; then
         sleep 0.3
         RED "
+
         [!] Passwords don't match. Please try again.. "
         reload
         return 1
@@ -732,12 +740,14 @@ Enter a hostname: "
     if [[ -z "${HOSTNAME}" ]]; then
         sleep 0.3
         RED "
+
         [!] Please enter a hostname to continue "
         reload
         return 1
     elif [[ "${HOSTNAME}" =~ [[:upper:]] ]]; then
         sleep 0.3
         RED "
+
         [!] Lowercase is preferred. Please try again.. "
         reload
         return 1
@@ -834,6 +844,7 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Kerne
 Enter a number: "
         read -r -p "
 ==> " kernelnmbr
+        echo
 
     case "${kernelnmbr}" in
         1)
@@ -906,6 +917,7 @@ ${magenta}###${nc}----------------------------------${magenta}[ ${bwhite}Bootloa
 Enter a number: "
         read -r -p "
 ==> " bootloader
+        echo
 
     case "${bootloader}" in
         1)
@@ -967,6 +979,7 @@ Enter a number: "
             roottype="/Root"
             sleep 0.3
             YELLOW "
+
         ###  NOTE: Keeping User Data on a separate /Home Partition is supported
 
 
@@ -977,6 +990,7 @@ Enter a number: "
 Enter [y/n]: "
             read -r -p "
 ==> " sep_home
+            echo
 
                 case "${sep_home}" in
                     y)
@@ -986,13 +1000,12 @@ Enter [y/n]: "
         ###  A /Home Partition will be created 
                         ";;
                     n)
-                        echo
                         skip 
                         echo;;
                    "")
                         sleep 0.3
-                        echo
                         RED "
+
         [!] Please type 'y' or 'n' to continue.. "
                         reload
                         return 1 ;;
@@ -1002,6 +1015,7 @@ Enter [y/n]: "
                 esac
             sleep 0.3
             YELLOW "
+
         ###  ${fsname} has been selected " ;;
         2)
             fsname="Btrfs"
@@ -1011,6 +1025,7 @@ Enter [y/n]: "
             btrfs_bootopts="rootflags=subvol=@ "
             sleep 0.3
             YELLOW "
+
         ###  ${fsname} has been selected "
             sleep 0.3
             YELLOW "
@@ -1022,6 +1037,7 @@ Enter [y/n]: "
 Enter a name: "
             read -r -p "
 ==> " snapname
+            echo
 
             if [[ -z "${snapname}" ]]; then
                 invalid
@@ -1030,6 +1046,7 @@ Enter a name: "
        "")
             sleep 0.3
             RED "
+
         [!] Please select a Filesystem "
             reload
             return 1 ;;
@@ -1065,6 +1082,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Swap
 Enter a number: "
         read -r -p "
 ==> " swapmode
+        echo
 
     case "${swapmode}" in
         1)
@@ -1072,7 +1090,6 @@ Enter a number: "
                 sleep 0.3
                 RED "
 
-
         [!] Incompatible Kernel has been detected [!] "
                 CYAN "
         [!] Swap type will default to 'None' [!]
@@ -1099,7 +1116,6 @@ Enter a number: "
                 sleep 0.3
                 RED "
 
-
         [!] Incompatible Kernel has been detected [!] "
                 CYAN "
         [!] Swap type will default to 'None' [!]
@@ -1161,10 +1177,12 @@ set_swapsize (){
 Enter Swap size ${bwhite}(in GB)${blue}: "
         read -r -p "
 ==> " swapsize
+        echo
 
     if [[ -z "${swapsize}" ]]; then
         sleep 0.3
         RED "
+
         [!] Please enter a value to continue "
         reload
         line2
@@ -1174,6 +1192,7 @@ Enter Swap size ${bwhite}(in GB)${blue}: "
     else
         sleep 0.3
         RED "
+
         [!] Please use only digits as a value "
         reload
         line2
@@ -2388,7 +2407,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
         if [[ -n "${sgdsk_nmbr}" ]]; then
             sgdrive="$(echo "${disks}" | awk "\$1 == ${sgdsk_nmbr} {print \$2}")"
             if [[ -e "${sgdrive}" ]]; then
-                capacity="$(fdisk -l "${sgdrive}" | grep -E 'bytes'| grep -E 'Disk'| awk "{print \$5}")"
+                capacity="$(fdisk -l "${sgdrive}" | grep -E 'bytes' | grep -E 'Disk' | awk "{print \$5}")"
                 cap_gib="$((capacity/1024000000))"
                 rootsize="$((capacity*25/100/1024000000))"
                 if [[ "${run_as}" != "root" ]]; then
@@ -3109,6 +3128,7 @@ ${multi_swap}
         ---------------------------
         ### ${yellow}SANITY CHECK FAILED${red} ###
         ---------------------------"
+        sleep 3
         if [[ "${smartpart}" == "n" && -z "${preset}" ]] ; then
             reload
             until manual_part; do : ; done